Skip to content

Commit 5fef51f

Browse files
committed
React v16, Reactstrap v5
1 parent 6571acf commit 5fef51f

File tree

95 files changed

+564
-654
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+564
-654
lines changed

CHANGELOG.md

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,44 @@
1-
## Changelog [react](./REACT.md) version
1+
## [react](./REACT.md) version `changelog`
22

3-
##### 2017.08.24
3+
###### `v1.0.1`
4+
- moved to react: `^16.0.0`
5+
- moved to reactstrap: `^5.0.0-alpha.3`
6+
- moved to react-text-mask-hoc: `^0.10.4`
7+
- moved from deprecated CardBlock to `CardBody` reactstrap component
8+
- moved to `NavDropdown` in `Header` component
9+
- fix for app-header navbar-nav dropdown-menu-right
10+
- fix typo in Tables component PaginationItem
11+
12+
###### `v1.0.0`
13+
- Sidebar component:
14+
- item with optional class (_nav.js)
15+
- nav link with optional variant (_nav.js)
16+
- external urls allowed (_nav.js)
17+
- optional SidebarFooter, SidebarHeader, SidebarForm components
18+
- SidebarMinimizer component
19+
- .brand-minimized
20+
- .sidebar-minimized,
21+
- Header component - sidebarMinimize
22+
- react-transition-group downgrade to v1 : (modals and alerts reactstrap:v4.8 issue)
23+
24+
###### `2017.08.24`
425
- webpack.config env.prod
526
- Dashboard .dropdown-menu-right temp.scss hotfix (full)
627
- callout.scss .chart-wrapper hotfix (full)
728

8-
##### 2017.08.11
29+
###### `2017.08.11`
930
- Bootstrap 4 beta
1031
- Dashboard component (full):
1132
- line chart for social box
1233
- sparkline chart for callout
1334

14-
##### 2017.08.01
35+
###### `2017.08.01`
1536
- Sidebar component:
1637
- title item with optional wrapper and class (_nav.js)
1738
- nav link item with optional badge
1839
- code refactoring
1940

20-
##### 2017.07.31
41+
###### `2017.07.31`
2142
- moved to [reactstrap](https://reactstrap.github.io/)
2243
- moved to [webpack](https://webpack.js.org/) (dropping gulp)
2344
- data driven Sidebar component (_nav.js)
24-

React_Full_Project/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
# dependencies
44
node_modules
5+
package-lock.json
56

67
# testing
78
coverage

React_Full_Project/CHANGELOG.md

Lines changed: 0 additions & 35 deletions
This file was deleted.

React_Full_Project/REACT.md

Lines changed: 0 additions & 36 deletions
This file was deleted.

React_Full_Project/package.json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@coreui/react",
3-
"version": "1.0.0",
3+
"version": "1.0.1",
44
"description": "",
55
"author": "Łukasz Holeczek <[email protected]>",
66
"url": "http://coreui.io",
@@ -14,35 +14,35 @@
1414
"babel-plugin-transform-object-rest-spread": "^6.26.0",
1515
"babel-preset-env": "^1.6.0",
1616
"babel-preset-react": "^6.24.1",
17-
"copy-webpack-plugin": "^4.0.1",
18-
"css-hot-loader": "^1.3.1",
17+
"copy-webpack-plugin": "^4.1.1",
18+
"css-hot-loader": "^1.3.2",
1919
"css-loader": "^0.28.7",
20-
"extract-text-webpack-plugin": "^3.0.0",
21-
"file-loader": "^0.11.2",
20+
"extract-text-webpack-plugin": "^3.0.1",
21+
"file-loader": "^1.1.5",
2222
"html-loader": "^0.5.1",
2323
"html-webpack-plugin": "^2.30.1",
2424
"node-sass": "^4.5.3",
2525
"rimraf": "^2.6.2",
2626
"sass-loader": "^6.0.6",
2727
"source-list-map": "^2.0.0",
28-
"style-loader": "^0.18.2",
29-
"uglify-js": "^3.1.1",
30-
"url-loader": "^0.5.9",
28+
"style-loader": "^0.19.0",
29+
"uglify-js": "^3.1.3",
30+
"url-loader": "^0.6.2",
3131
"webpack": "^3.6.0",
32-
"webpack-dev-server": "^2.8.2"
32+
"webpack-dev-server": "^2.9.1"
3333
},
3434
"dependencies": {
3535
"bootstrap": "^4.0.0-beta",
3636
"chart.js": "2.7.0",
3737
"font-awesome": "^4.7.0",
3838
"history": "4.7.2",
3939
"is-url-external": "^1.0.3",
40-
"react": "^15.6.1",
41-
"react-chartjs-2": "2.6.2",
42-
"react-dom": "^15.6.1",
43-
"react-router-dom": "4.2.2",
44-
"react-transition-group": "^1.2.0",
45-
"reactstrap": "^4.8.0",
40+
"react": "^16.0.0",
41+
"react-chartjs-2": "2.6.4",
42+
"react-dom": "^16.0.0",
43+
"react-router-dom": "^4.2.2",
44+
"react-transition-group": "^2.2.1",
45+
"reactstrap": "^5.0.0-alpha.3",
4646
"simple-line-icons": "^2.4.1"
4747
},
4848
"scripts": {
Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
// Temp fix for reactstrap
2-
.show {
3-
> .dropdown-menu-right {
4-
right: 0;
5-
left: auto; // Reset the default from `.dropdown-menu`
2+
.app-header {
3+
.navbar-nav {
4+
.dropdown-menu-right {
5+
right: auto;
6+
}
67
}
7-
}
8+
}
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
.app-footer {
2-
min-height: $footer-height;
2+
display: flex;
33
padding: 0 $spacer;
4-
line-height: $footer-height;
54
color: $footer-color;
65
background: $footer-bg;
6+
flex-wrap: wrap;
7+
align-items: center;
78
@include borders($footer-borders);
89
}

React_Full_Project/scss/core/_layout.scss

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
app-dashboard,
1212
app-root {
1313
display: flex;
14-
flex-direction: column;
1514
min-height: 100vh;
15+
flex-direction: column;
1616
}
1717

1818
.app-header {
@@ -26,12 +26,12 @@ app-root {
2626
.app-body {
2727
display: flex;
2828
flex-direction: row;
29-
flex-grow: 1;
3029
overflow-x: hidden;
30+
flex-grow: 1;
3131

3232
.main {
33-
flex: 1;
3433
min-width: 0;
34+
flex: 1;
3535
}
3636

3737
.sidebar {
@@ -328,7 +328,8 @@ app-root {
328328
margin-top: $navbar-height;
329329
}
330330

331-
.sidebar {
331+
.sidebar,
332+
.sidebar-fixed .sidebar {
332333
position: fixed;
333334
z-index: $zindex-sticky - 1;
334335
width: $mobile-sidebar-width;

React_Full_Project/scss/core/_navbar.scss

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.app-header.navbar {
22
position: relative;
3-
flex-direction: row;
43
height: $navbar-height;
4+
flex-direction: row;
55
padding: 0;
66
margin: 0;
77
background-color: $navbar-bg;
@@ -102,13 +102,16 @@
102102
background-color: rgba(0,0,0,.075);
103103
}
104104

105-
.brand-minimized {
106-
.app-header.navbar {
107-
.navbar-brand {
108-
width: $navbar-brand-minimized-width;
109-
background-color: $navbar-brand-minimized-bg;
110-
background-image: $navbar-brand-minimized-logo;
111-
background-size: $navbar-brand-minimized-logo-size;
105+
@include media-breakpoint-up(lg) {
106+
.brand-minimized {
107+
.app-header.navbar {
108+
.navbar-brand {
109+
width: $navbar-brand-minimized-width;
110+
background-color: $navbar-brand-minimized-bg;
111+
background-image: $navbar-brand-minimized-logo;
112+
background-size: $navbar-brand-minimized-logo-size;
113+
@include borders($navbar-brand-minimized-border);
114+
}
112115
}
113116
}
114117
}

React_Full_Project/scss/core/_sidebar.scss

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@
7878

7979
.nav {
8080
@include sidebar-width($sidebar-borders, $sidebar-width);
81-
flex-direction: column;
8281
min-height: 100%;
82+
flex-direction: column;
8383
}
8484

8585
.nav-title {
@@ -254,13 +254,15 @@
254254
flex: 0 0 $sidebar-footer-height;
255255
padding: $sidebar-footer-padding-y $sidebar-footer-padding-x;
256256
background: $sidebar-footer-bg;
257+
@include borders($sidebar-footer-borders);
257258
}
258259

259260
.sidebar-minimizer {
260261
position: relative;
261262
flex: 0 0 $sidebar-minimizer-height;
262263
background-color: $sidebar-minimizer-bg;
263264
border: 0;
265+
@include borders($sidebar-minimizer-borders);
264266

265267
&::before {
266268
position: absolute;

0 commit comments

Comments
 (0)