Merge pull request #75 from coreui/dev-v2-rc-0

v2.0.0-rc.0
coreui · May 8, 2018 · a37c832 · a37c832
2 parents 3869f17 + 697e49b
commit a37c832
Show file tree

Hide file tree

Showing 7 changed files with 370 additions and 564 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@coreui/coreui-free-react-admin-template",
-  "version": "2.0.0-beta.3",
+  "version": "2.0.0-rc.0",
   "description": "CoreUI React Open Source Bootstrap 4 Admin Template",
   "author": "Łukasz Holeczek",
   "homepage": "https://coreui.io",
@@ -12,12 +12,13 @@
     "url": "git@github.com:coreui/coreui-free-react-admin-template.git"
   },
   "dependencies": {
+    "@coreui/coreui": "^2.0.0-rc.2",
     "@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.2.0",
-    "@coreui/react": "^2.0.0-beta.3",
+    "@coreui/react": "^2.0.0-rc.0",
     "bootstrap": "^4.1.1",
     "chart.js": "^2.7.2",
     "classnames": "^2.2.5",
-    "core-js": "^2.5.5",
+    "core-js": "^2.5.6",
     "enzyme": "^3.3.0",
     "enzyme-adapter-react-16": "^1.1.1",
     "flag-icon-css": "^3.0.0",

diff --git a/src/scss/_ie-fix.scss b/src/scss/_ie-fix.scss
@@ -1,3 +1,3 @@
-html body .align-items-center {
+html body .app.flex-row.align-items-center {
   height: 100vh;
 }
diff --git a/src/scss/style.css b/src/scss/style.css
@@ -9939,5 +9939,5 @@ body {
 .app-header .navbar-nav .dropdown-menu-right {
   right: auto; }
 
-html body .align-items-center {
+html body .app.flex-row.align-items-center {
   height: 100vh; }
diff --git a/src/views/Base/Switches/Switches.js b/src/views/Base/Switches/Switches.js
@@ -84,25 +84,7 @@ class Switches extends Component {
           <Col xs="12" md="6">
             <Card>
               <CardHeader>
-                3d Switch <small><code>outline label</code></small>
-              </CardHeader>
-              <CardBody>
-                <AppSwitch className={'mx-1'} variant={'3d'} outline color={'primary'} defaultChecked label dataOn={'\u2713'} dataOff={'\u2715'} />
-                <AppSwitch className={'mx-1'} variant={'3d'} outline color={'secondary'} defaultChecked label dataOn={'\u2713'} dataOff={'\u2715'}/>
-                <AppSwitch className={'mx-1'} variant={'3d'} outline color={'success'} defaultChecked label dataOn={'\u2713'} dataOff={'\u2715'}/>
-                <AppSwitch className={'mx-1'} variant={'3d'} outline color={'warning'} defaultChecked label dataOn={'\u2713'} dataOff={'\u2715'}/>
-                <AppSwitch className={'mx-1'} variant={'3d'} outline color={'info'} defaultChecked label dataOn={'\u2713'} dataOff={'\u2715'}/>
-                <AppSwitch className={'mx-1'} variant={'3d'} outline color={'danger'} defaultChecked label dataOn={'\u2713'} dataOff={'\u2715'}/>
-                <AppSwitch className={'mx-1'} variant={'3d'} outline color={'light'} defaultChecked label dataOn={'\u2713'} dataOff={'\u2715'}/>
-                <AppSwitch className={'mx-1'} variant={'3d'} outline color={'dark'} defaultChecked label dataOn={'\u2713'} dataOff={'\u2715'}/>
-                <AppSwitch className={'mx-1'} variant={'3d'} outline color={'primary'} label dataOn={'\u2713'} dataOff={'\u2715'}/>
-              </CardBody>
-            </Card>
-          </Col>
-          <Col xs="12" md="6">
-            <Card>
-              <CardHeader>
-                3d Switch <small><code>outline={'alt'} label</code></small>
+                3d Switch <small><code>outline="alt" label</code></small>
               </CardHeader>
               <CardBody>
                 <AppSwitch className={'mx-1'} variant={'3d'} outline={'alt'} color={'primary'} defaultChecked label dataOn={'\u2713'} dataOff={'\u2715'} />
@@ -120,25 +102,7 @@ class Switches extends Component {
           <Col xs="12" md="6">
             <Card>
               <CardHeader>
-                3d Switch <small><code>outline label</code></small>
-              </CardHeader>
-              <CardBody>
-                <AppSwitch className={'mx-1'} variant={'3d'} outline color={'primary'} defaultChecked label />
-                <AppSwitch className={'mx-1'} variant={'3d'} outline color={'secondary'} defaultChecked label />
-                <AppSwitch className={'mx-1'} variant={'3d'} outline color={'success'} defaultChecked label />
-                <AppSwitch className={'mx-1'} variant={'3d'} outline color={'warning'} defaultChecked label />
-                <AppSwitch className={'mx-1'} variant={'3d'} outline color={'info'} defaultChecked label />
-                <AppSwitch className={'mx-1'} variant={'3d'} outline color={'danger'} defaultChecked label />
-                <AppSwitch className={'mx-1'} variant={'3d'} outline color={'light'} defaultChecked label />
-                <AppSwitch className={'mx-1'} variant={'3d'} outline color={'dark'} defaultChecked label />
-                <AppSwitch className={'mx-1'} variant={'3d'} outline color={'primary'} label />
-              </CardBody>
-            </Card>
-          </Col>
-          <Col xs="12" md="6">
-            <Card>
-              <CardHeader>
-                3d Switch <small><code>outline={'alt'} label</code></small>
+                3d Switch <small><code>outline="alt" label</code></small>
               </CardHeader>
               <CardBody>
                 <AppSwitch className={'mx-1'} variant={'3d'} outline={'alt'} color={'primary'} defaultChecked label />