diff --git a/CHANGELOG.md b/CHANGELOG.md index ef398d4..5110db2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ ## [react](./REACT.md) version `changelog` +##### `v1.0.10` +- refactor: `` +- refactor: `` +- refactor: `` +- refactor: remove `` +- update: reactstrap to `5.0.0-beta` +- update: dependencies + ###### `v1.0.9` - refactor: Sidebar structure change diff --git a/React_Full_Project/package.json b/React_Full_Project/package.json index 49a2697..4f2255e 100644 --- a/React_Full_Project/package.json +++ b/React_Full_Project/package.json @@ -1,10 +1,10 @@ { "name": "@coreui/react", - "version": "1.0.9", + "version": "1.0.10", "description": "Open Source Bootstrap Admin Template", "author": "Łukasz Holeczek", "homepage": "http://coreui.io", - "copyright": "Copyright 2017 creativeLabs Łukasz Holeczek", + "copyright": "Copyright 2018 creativeLabs Łukasz Holeczek", "license": "MIT", "private": true, "devDependencies": { @@ -14,7 +14,7 @@ "babel-preset-env": "1.6.1", "babel-preset-react": "6.24.1", "copy-webpack-plugin": "4.3.1", - "css-hot-loader": "1.3.5", + "css-hot-loader": "1.3.6", "css-loader": "0.28.9", "extract-text-webpack-plugin": "3.0.2", "file-loader": "1.1.6", @@ -24,11 +24,11 @@ "rimraf": "2.6.2", "sass-loader": "6.0.6", "source-list-map": "2.0.0", - "style-loader": "0.19.1", - "uglify-js": "3.3.7", + "style-loader": "0.20.1", + "uglify-js": "3.3.9", "url-loader": "0.6.2", "webpack": "3.10.0", - "webpack-dev-server": "2.9.7" + "webpack-dev-server": "2.11.1" }, "dependencies": { "bootstrap": "4.0.0", @@ -41,7 +41,7 @@ "react-dom": "16.2.0", "react-router-dom": "4.2.2", "react-transition-group": "2.2.1", - "reactstrap": "5.0.0-alpha.4", + "reactstrap": "5.0.0-beta", "simple-line-icons": "2.4.1" }, "scripts": { diff --git a/React_Full_Project/scss/core/_card.scss b/React_Full_Project/scss/core/_card.scss index 20e57a8..733b963 100644 --- a/React_Full_Project/scss/core/_card.scss +++ b/React_Full_Project/scss/core/_card.scss @@ -20,7 +20,7 @@ .card-header { .icon-bg { - display: inline-body; + display: inline-block; padding: $card-spacer-y $card-spacer-x !important; margin-top: -$card-spacer-y; margin-right: $card-spacer-x; @@ -135,12 +135,12 @@ } [class^="icon-"], [class*=" icon-"] { - display: inline-body; + display: inline-block; vertical-align: middle; } i { - display: inline-body; + display: inline-block; transition: .4s; } @@ -153,7 +153,7 @@ width: 230px; margin: 6px; - .input-group-addon { + .input-group-prepend, .input-group-append { background: #fff; } diff --git a/React_Full_Project/scss/core/_input-group.scss b/React_Full_Project/scss/core/_input-group.scss index 23b2512..c8ce115 100644 --- a/React_Full_Project/scss/core/_input-group.scss +++ b/React_Full_Project/scss/core/_input-group.scss @@ -1,6 +1,5 @@ -.input-group-addon, -.input-group-btn { - min-width: 40px; +.input-group-prepend, +.input-group-append { white-space: nowrap; vertical-align: middle; // Match the inputs } diff --git a/React_Full_Project/scss/style.scss b/React_Full_Project/scss/style.scss index 468386c..b51308d 100644 --- a/React_Full_Project/scss/style.scss +++ b/React_Full_Project/scss/style.scss @@ -1,6 +1,6 @@ /*! * CoreUI - Open Source Bootstrap Admin Template - * @version v1.0.9 + * @version v1.0.10 * @link http://coreui.io * Copyright (c) 2018 creativeLabs Łukasz Holeczek * @license MIT diff --git a/React_Full_Project/src/views/Base/Forms/Forms.js b/React_Full_Project/src/views/Base/Forms/Forms.js index 1591b12..8a9bcd7 100644 --- a/React_Full_Project/src/views/Base/Forms/Forms.js +++ b/React_Full_Project/src/views/Base/Forms/Forms.js @@ -19,7 +19,7 @@ import { Input, InputGroup, InputGroupAddon, - InputGroupButton + InputGroupText } from 'reactstrap'; class Forms extends Component { @@ -612,11 +612,11 @@ class Forms extends Component { -
- + + - -
+
+
@@ -625,26 +625,26 @@ class Forms extends Component { -
- + + - -
+ +
-
- + + - -
+ + -
- .00 -
+ + .00 +
@@ -666,9 +666,9 @@ class Forms extends Component { -
+ -
+
@@ -677,22 +677,22 @@ class Forms extends Component { -
+ -
+
-
+ -
+ -
+ -
+
@@ -714,7 +714,7 @@ class Forms extends Component { -
+ { this.setState({ first: !this.state.first }); }}> @@ -728,7 +728,7 @@ class Forms extends Component { Separated link -
+
@@ -737,7 +737,7 @@ class Forms extends Component { -
+ { this.setState({ second: !this.state.second }); }}> @@ -751,14 +751,14 @@ class Forms extends Component { Separated link -
+
-
+ { this.setState({ third: !this.state.third }); }}> {/**/} @@ -771,9 +771,9 @@ class Forms extends Component { Separated link -
+ -
+ { this.setState({ fourth: !this.state.fourth }); }}> @@ -787,7 +787,7 @@ class Forms extends Component { Separated link -
+
@@ -930,35 +930,35 @@ class Forms extends Component {
-
- Username -
+ + Username + -
- -
+ + +
-
- Email -
+ + Email + -
- -
+ + +
-
- Password -
+ + Password + -
- -
+ + +
@@ -978,25 +978,25 @@ class Forms extends Component { -
- -
+ + +
-
- -
+ + +
-
- -
+ + +
@@ -1015,25 +1015,25 @@ class Forms extends Component { -
- -
+ + +
-
- -
+ + +
-
- -
+ + +
@@ -1063,9 +1063,9 @@ class Forms extends Component {
-
- @ -
+ + @ +

Here's some help text

@@ -1076,9 +1076,9 @@ class Forms extends Component {
-
- .00 -
+ + .00 +
Here's more help text
@@ -1087,13 +1087,13 @@ class Forms extends Component {
-
- $ -
+ + $ + -
- .00 -
+ + .00 +
@@ -1102,9 +1102,9 @@ class Forms extends Component {
-
+ -
+
@@ -1113,10 +1113,10 @@ class Forms extends Component {
-
+ -
+
diff --git a/React_Full_Project/src/views/Buttons/ButtonGroups/ButtonGroups.js b/React_Full_Project/src/views/Buttons/ButtonGroups/ButtonGroups.js index 5ed1ff2..66f2cb9 100644 --- a/React_Full_Project/src/views/Buttons/ButtonGroups/ButtonGroups.js +++ b/React_Full_Project/src/views/Buttons/ButtonGroups/ButtonGroups.js @@ -1,5 +1,5 @@ import React, {Component} from 'react'; -import {Row, Col, Card, CardHeader, CardBody, ButtonDropdown, DropdownToggle, DropdownMenu, DropdownItem, Button, ButtonGroup, ButtonToolbar, Input, InputGroup, InputGroupAddon } from 'reactstrap'; +import {Row, Col, Card, CardHeader, CardBody, ButtonDropdown, DropdownToggle, DropdownMenu, DropdownItem, Button, ButtonGroup, ButtonToolbar, Input, InputGroup, InputGroupAddon, InputGroupText } from 'reactstrap'; class ButtonGroups extends Component { @@ -77,7 +77,7 @@ class ButtonGroups extends Component { -
@
+ @
@@ -89,7 +89,7 @@ class ButtonGroups extends Component { -
@
+ @
diff --git a/React_Full_Project/src/views/Pages/Login/Login.js b/React_Full_Project/src/views/Pages/Login/Login.js index 35078b8..58368ad 100644 --- a/React_Full_Project/src/views/Pages/Login/Login.js +++ b/React_Full_Project/src/views/Pages/Login/Login.js @@ -1,5 +1,5 @@ import React, {Component} from 'react'; -import {Container, Row, Col, CardGroup, Card, CardBody, Button, Input, InputGroup, InputGroupAddon} from 'reactstrap'; +import {Container, Row, Col, CardGroup, Card, CardBody, Button, Input, InputGroup, InputGroupAddon, InputGroupText} from 'reactstrap'; class Login extends Component { @@ -15,19 +15,19 @@ class Login extends Component {

Login

Sign In to your account

-
- + + - -
+ +
-
- + + - -
+ +
diff --git a/React_Full_Project/src/views/Pages/Page404/Page404.js b/React_Full_Project/src/views/Pages/Page404/Page404.js index 8f8ee3f..f2c0f97 100644 --- a/React_Full_Project/src/views/Pages/Page404/Page404.js +++ b/React_Full_Project/src/views/Pages/Page404/Page404.js @@ -1,5 +1,5 @@ import React, {Component} from 'react'; -import {Container, Row, Col, Button, Input, InputGroupAddon, InputGroup, InputGroupButton} from 'reactstrap'; +import {Container, Row, Col, Button, Input, InputGroupAddon, InputGroup, InputGroupText} from 'reactstrap'; class Page404 extends Component { render() { @@ -14,15 +14,15 @@ class Page404 extends Component {

The page you are looking for was not found.

-
- + + - -
+ + -
+ -
+
diff --git a/React_Full_Project/src/views/Pages/Page500/Page500.js b/React_Full_Project/src/views/Pages/Page500/Page500.js index a215298..149cefe 100644 --- a/React_Full_Project/src/views/Pages/Page500/Page500.js +++ b/React_Full_Project/src/views/Pages/Page500/Page500.js @@ -1,5 +1,5 @@ import React, {Component} from 'react'; -import {Container, Row, Col, Button, Input, InputGroup, InputGroupAddon, InputGroupButton} from 'reactstrap'; +import {Container, Row, Col, Button, Input, InputGroup, InputGroupAddon, InputGroupText} from 'reactstrap'; class Page500 extends Component { render() { @@ -14,15 +14,15 @@ class Page500 extends Component {

The page you are looking for is temporarily unavailable.

-
- + + - -
+ + -
+ -
+
diff --git a/React_Full_Project/src/views/Pages/Register/Register.js b/React_Full_Project/src/views/Pages/Register/Register.js index 87c1f84..7509bfa 100644 --- a/React_Full_Project/src/views/Pages/Register/Register.js +++ b/React_Full_Project/src/views/Pages/Register/Register.js @@ -1,5 +1,5 @@ import React, {Component} from 'react'; -import {Container, Row, Col, Card, CardBody, CardFooter, Button, Input, InputGroup, InputGroupAddon} from 'reactstrap'; +import {Container, Row, Col, Card, CardBody, CardFooter, Button, Input, InputGroup, InputGroupAddon, InputGroupText} from 'reactstrap'; class Register extends Component { render() { @@ -13,33 +13,33 @@ class Register extends Component {

Register

Create your account

-
- + + - -
+ +
-
- @ -
+ + @ +
-
- + + - -
+ +
-
- + + - -
+ +
diff --git a/React_Starter/package.json b/React_Starter/package.json index 49a2697..4f2255e 100644 --- a/React_Starter/package.json +++ b/React_Starter/package.json @@ -1,10 +1,10 @@ { "name": "@coreui/react", - "version": "1.0.9", + "version": "1.0.10", "description": "Open Source Bootstrap Admin Template", "author": "Łukasz Holeczek", "homepage": "http://coreui.io", - "copyright": "Copyright 2017 creativeLabs Łukasz Holeczek", + "copyright": "Copyright 2018 creativeLabs Łukasz Holeczek", "license": "MIT", "private": true, "devDependencies": { @@ -14,7 +14,7 @@ "babel-preset-env": "1.6.1", "babel-preset-react": "6.24.1", "copy-webpack-plugin": "4.3.1", - "css-hot-loader": "1.3.5", + "css-hot-loader": "1.3.6", "css-loader": "0.28.9", "extract-text-webpack-plugin": "3.0.2", "file-loader": "1.1.6", @@ -24,11 +24,11 @@ "rimraf": "2.6.2", "sass-loader": "6.0.6", "source-list-map": "2.0.0", - "style-loader": "0.19.1", - "uglify-js": "3.3.7", + "style-loader": "0.20.1", + "uglify-js": "3.3.9", "url-loader": "0.6.2", "webpack": "3.10.0", - "webpack-dev-server": "2.9.7" + "webpack-dev-server": "2.11.1" }, "dependencies": { "bootstrap": "4.0.0", @@ -41,7 +41,7 @@ "react-dom": "16.2.0", "react-router-dom": "4.2.2", "react-transition-group": "2.2.1", - "reactstrap": "5.0.0-alpha.4", + "reactstrap": "5.0.0-beta", "simple-line-icons": "2.4.1" }, "scripts": { diff --git a/React_Starter/scss/core/_card.scss b/React_Starter/scss/core/_card.scss index 20e57a8..733b963 100644 --- a/React_Starter/scss/core/_card.scss +++ b/React_Starter/scss/core/_card.scss @@ -20,7 +20,7 @@ .card-header { .icon-bg { - display: inline-body; + display: inline-block; padding: $card-spacer-y $card-spacer-x !important; margin-top: -$card-spacer-y; margin-right: $card-spacer-x; @@ -135,12 +135,12 @@ } [class^="icon-"], [class*=" icon-"] { - display: inline-body; + display: inline-block; vertical-align: middle; } i { - display: inline-body; + display: inline-block; transition: .4s; } @@ -153,7 +153,7 @@ width: 230px; margin: 6px; - .input-group-addon { + .input-group-prepend, .input-group-append { background: #fff; } diff --git a/React_Starter/scss/core/_input-group.scss b/React_Starter/scss/core/_input-group.scss index 23b2512..c8ce115 100644 --- a/React_Starter/scss/core/_input-group.scss +++ b/React_Starter/scss/core/_input-group.scss @@ -1,6 +1,5 @@ -.input-group-addon, -.input-group-btn { - min-width: 40px; +.input-group-prepend, +.input-group-append { white-space: nowrap; vertical-align: middle; // Match the inputs } diff --git a/React_Starter/scss/style.scss b/React_Starter/scss/style.scss index 468386c..b51308d 100644 --- a/React_Starter/scss/style.scss +++ b/React_Starter/scss/style.scss @@ -1,6 +1,6 @@ /*! * CoreUI - Open Source Bootstrap Admin Template - * @version v1.0.9 + * @version v1.0.10 * @link http://coreui.io * Copyright (c) 2018 creativeLabs Łukasz Holeczek * @license MIT