Skip to content

v2.0.0-rc.0 #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
May 8, 2018
Merged

v2.0.0-rc.0 #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5eb8a4a
refactor: buttons view
xidedix May 8, 2018
59d43f7
refactor(modals view): button margins
xidedix May 8, 2018
0c88adc
refactor(widgets): add missing line charts to Widget03
xidedix May 8, 2018
245263a
fix(styles): ie temp fix align-items-center
xidedix May 8, 2018
f75010f
chore: dependencies update, version bump
xidedix May 8, 2018
22774fd
refactor(switches): cleanup
xidedix May 8, 2018
697e49b
chore: update @coreui/react dependency
xidedix May 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/scss/_ie-fix.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
html body .align-items-center {
html body .app.flex-row.align-items-center {
height: 100vh;
}
2 changes: 1 addition & 1 deletion src/scss/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
40 changes: 2 additions & 38 deletions src/views/Base/Switches/Switches.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'} />
Expand All @@ -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 />
Expand Down
Loading