From 5eb8a4abe5a70bc72a1c7c8e3803875964b6b48d Mon Sep 17 00:00:00 2001
From: xidedix
Date: Tue, 8 May 2018 16:19:40 +0200
Subject: [PATCH 1/7] refactor: buttons view
---
src/views/Buttons/Buttons/Buttons.js | 877 +++++++++++----------------
1 file changed, 355 insertions(+), 522 deletions(-)
diff --git a/src/views/Buttons/Buttons/Buttons.js b/src/views/Buttons/Buttons/Buttons.js
index 9fc90d4..5b45a81 100644
--- a/src/views/Buttons/Buttons/Buttons.js
+++ b/src/views/Buttons/Buttons/Buttons.js
@@ -10,100 +10,100 @@ class Buttons extends Component {
Standard Buttons
-
-
- Normal
+
+
+ Normal
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
Active State
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
Disabled
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
@@ -114,97 +114,97 @@ class Buttons extends Component {
- Use .btn-outline-*
class for outline buttons.
+ Use outline
prop
-
+
Normal
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
- Active State
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+ Active State
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Disabled
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
@@ -218,94 +218,94 @@ class Buttons extends Component {
.btn-ghost-*
class for ghost buttons.
-
+
Normal
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
Active State
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
-
+
Disabled
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
+
@@ -319,99 +319,99 @@ class Buttons extends Component {
.btn-square
class for square buttons.
-
+
Normal
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
Active State
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
Disabled
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
@@ -426,99 +426,99 @@ class Buttons extends Component {
.btn-pill
class for pill buttons.
-
+
Normal
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
Active State
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
Disabled
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
@@ -528,66 +528,65 @@ class Buttons extends Component {
Sizes
- Fancy larger or smaller buttons? Add .btn-lg
or .btn-sm
for additional sizes.
-
-
- Small add
- .btn-sm
+ Fancy larger or smaller buttons? Add size="lg"
or size="sm"
for additional sizes.
+
+
+ Small
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
Normal
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
- Large add .btn-lg
.
+
+
+ Large
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
@@ -598,128 +597,42 @@ class Buttons extends Component {
-
-
-
-
+
+
Outline Button
-
+
-
-
+
+
Ghost Button
-
+
-
-
+
+
Square Button
-
+
-
-
+
+
Pill Button
-
+
-
-
- Options
-
-
- Primary
- Secondary
- Success
- Warning{' '}
- Danger{' '}
- Link{' '}
-
-
-
-
- With Icons
-
-
- {'\u00A0'} Primary
- {'\u00A0 Secondary'}
- Success
- Warning{' '}
- Danger{' '}
- Link{' '}
-
-
-
-
- Size Large
-
-
- Add this class .btn-lg
- Primary
- Secondary
- Success
- Info
- Warning
- Danger
- Link
-
-
-
-
- Size Small
-
-
- Add class .btn-sm
- Primary
- Secondary
- Success
- Info
- Warning
- Danger
- Link
-
-
-
-
- Disabled state
-
-
- Add disabled="disabled"
- Primary
- Secondary
- Success
- Info
- Warning
- Danger
- Link
-
-
-
-
- Active state
-
-
- Add class .active
- Primary
- Secondary
- Success
- Info
- Warning
- Danger
- Link
-
-
Block Level Buttons
- Add class .btn-block
+ Add prop block
Block level button
Block level button
Block level button
@@ -731,99 +644,19 @@ class Buttons extends Component {
-
-
- Options
-
-
- Primary
- Secondary
- Success
- Warning
- Danger
-
-
-
-
- With Icons
-
-
- Primary
- Secondary
- Success
- Warning
- Danger
-
-
-
-
- Size Large
-
-
- Add class .btn-lg
- Primary
- Secondary
- Success
- Info
- Warning
- Danger
-
-
-
-
- Size Small
-
-
- Add class .btn-sm
- Primary
- Secondary
- Success
- Info
- Warning
- Danger
-
-
-
-
- Disabled state
-
-
- Add disabled="disabled"
- Primary
- Secondary
- Success
- Info
- Warning
- Danger
-
-
-
-
- Active state
-
-
- Add class .active
- Primary
- Secondary
- Success
- Info
- Warning
- Danger
-
-
Block Level Buttons
- {/*Add this class .btn-block
*/}
- Add class .btn-block
+ Add prop block
Block level button
Block level button
Block level button
Block level button
Block level button
Block level button
+ Block level button
From 59d43f7ef2518ca2417f2b872d44b480fca2ff63 Mon Sep 17 00:00:00 2001
From: xidedix
Date: Tue, 8 May 2018 16:20:41 +0200
Subject: [PATCH 2/7] refactor(modals view): button margins
---
src/views/Notifications/Modals/Modals.js | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/views/Notifications/Modals/Modals.js b/src/views/Notifications/Modals/Modals.js
index c8e7bc5..99c1005 100644
--- a/src/views/Notifications/Modals/Modals.js
+++ b/src/views/Notifications/Modals/Modals.js
@@ -84,7 +84,7 @@ class Modals extends Component {
Bootstrap Modals
- Launch demo modal
+ Launch demo modal
Modal title
@@ -100,7 +100,7 @@ class Modals extends Component {
- Launch large modal
+ Launch large modal
Modal title
@@ -117,7 +117,7 @@ class Modals extends Component {
- Launch small modal
+ Launch small modal
Modal title
@@ -136,7 +136,7 @@ class Modals extends Component {
- Primary modal
+ Primary modal
Modal title
@@ -153,7 +153,7 @@ class Modals extends Component {
- Success modal
+ Success modal
Modal title
@@ -170,7 +170,7 @@ class Modals extends Component {
- Warning modal
+ Warning modal
Modal title
@@ -187,7 +187,7 @@ class Modals extends Component {
- Danger modal
+ Danger modal
Modal title
@@ -204,7 +204,7 @@ class Modals extends Component {
- Info modal
+ Info modal
Modal title
From 0c88adc9c827451c262853ab528ce2e558b7586a Mon Sep 17 00:00:00 2001
From: xidedix
Date: Tue, 8 May 2018 16:21:49 +0200
Subject: [PATCH 3/7] refactor(widgets): add missing line charts to Widget03
---
src/views/Widgets/Widgets.js | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/views/Widgets/Widgets.js b/src/views/Widgets/Widgets.js
index 2bddcbe..e94374c 100644
--- a/src/views/Widgets/Widgets.js
+++ b/src/views/Widgets/Widgets.js
@@ -156,7 +156,11 @@ class Widgets extends Component {
- ({ variant: 'twitter', followers: '973k', tweets: '1.792' })} />
+ ({ variant: 'twitter', followers: '973k', tweets: '1.792' })} >
+
+
+
+
({ variant: 'linkedin', contacts: '500+', feeds: '292' })} >
@@ -166,7 +170,11 @@ class Widgets extends Component {
- ({ variant: 'google-plus', followers: '894', circles: '92' })} />
+ ({ variant: 'google-plus', followers: '894', circles: '92' })} >
+
+
+
+
From 245263a1add5e47f172ef322f8904ea6866fd63b Mon Sep 17 00:00:00 2001
From: xidedix
Date: Tue, 8 May 2018 16:22:46 +0200
Subject: [PATCH 4/7] fix(styles): ie temp fix align-items-center
---
src/scss/_ie-fix.scss | 2 +-
src/scss/style.css | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/scss/_ie-fix.scss b/src/scss/_ie-fix.scss
index 24dd340..ce6bc77 100644
--- 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
index 9170eca..b4ed1dd 100644
--- 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; }
From f75010f0b40cd6b1380f24260ea5cd3b5b14ef58 Mon Sep 17 00:00:00 2001
From: xidedix
Date: Tue, 8 May 2018 16:43:19 +0200
Subject: [PATCH 5/7] chore: dependencies update, version bump
---
package.json | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/package.json b/package.json
index c99cf9c..748ea60 100644
--- 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",
"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",
From 22774fdb15898c19a8ba3214492b859799280881 Mon Sep 17 00:00:00 2001
From: xidedix
Date: Tue, 8 May 2018 16:48:12 +0200
Subject: [PATCH 6/7] refactor(switches): cleanup
---
src/views/Base/Switches/Switches.js | 40 ++---------------------------
1 file changed, 2 insertions(+), 38 deletions(-)
diff --git a/src/views/Base/Switches/Switches.js b/src/views/Base/Switches/Switches.js
index 026a367..f76ccd4 100644
--- a/src/views/Base/Switches/Switches.js
+++ b/src/views/Base/Switches/Switches.js
@@ -84,25 +84,7 @@ class Switches extends Component {
- 3d Switch outline label
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 3d Switch outline={'alt'} label
+ 3d Switch outline="alt" label
@@ -120,25 +102,7 @@ class Switches extends Component {
- 3d Switch outline label
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 3d Switch outline={'alt'} label
+ 3d Switch outline="alt" label
From 697e49b54e62ba72e07760d2959b9b2051004a86 Mon Sep 17 00:00:00 2001
From: xidedix
Date: Tue, 8 May 2018 18:33:33 +0200
Subject: [PATCH 7/7] chore: update @coreui/react dependency
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 748ea60..6215830 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
"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",