8000 Merge pull request #45 from mrholek/v1.0.9 · thecodearcher/CoreUI-React@be9e2ab · GitHub
[go: up one dir, main page]
Skip to content

Commit be9e2ab

Browse files
xidedixxidedix
authored
Merge pull request coreui#45 from mrholek/v1.0.9
v1.0.9 with Bootstrap 4.0.0
2 parents e009616 + cef091d commit be9e2ab

File tree

250 files changed

+49
-12
lines changed

Some content is hidden

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

250 files changed

+49
-12
lines changed

‎CHANGELOG.md

Lines changed: 3 additions & 0 deletions

‎React_Full_Project/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@coreui/react",
3-
"version": "1.0.8",
3+
"version": "1.0.9",
44
"description": "Open Source Bootstrap Admin Template",
55
"author": "Łukasz Holeczek",
66
"homepage": "http://coreui.io",
@@ -15,10 +15,10 @@
1515
"babel-preset-react": "6.24.1",
1616
"copy-webpack-plugin": "4.3.1",
1717
"css-hot-loader": "1.3.5",
18-
"css-loader": "0.28.8",
18+
"css-loader": "0.28.9",
1919
"extract-text-webpack-plugin": "3.0.2",
2020
"file-loader": "1.1.6",
21-
"html-loader": "0.5.4",
21+
"html-loader": "0.5.5",
2222
"html-webpack-plugin": "2.30.1",
2323
"node-sass": "4.7.2",
2424
"rimraf": "2.6.2",
@@ -31,7 +31,7 @@
3131
"webpack-dev-server": "2.9.7"
3232
},
3333
"dependencies": {
34-
"bootstrap": "4.0.0-beta.3",
34+
"bootstrap": "4.0.0",
3535
"chart.js": "2.7.1",
3636
"flag-icon-css": "2.9.0",
3737
"font-awesome": "4.7.0",
@@ -51,7 +51,7 @@
5151
"clean": "rimraf ./build"
5252
},
5353
"engines": {
54-
"node": ">= 6.12.3",
54+
"node": ">= 8.9.4",
5555
"npm": ">= 5.6.0"
5656
}
5757
}

‎React_Full_Project/scss/style.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
22
* CoreUI - Open Source Bootstrap Admin Template
3-
* @version v1.0.8
3+
* @version v1.0.9
44
* @link http://coreui.io
55
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
66
* @license MIT

‎React_Full_Project/src/components/Sidebar/Sidebar.js

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,22 @@ class Sidebar extends Component {
6969
return (<li key={key} className={ classes }></li>);
7070
};
7171

72+
// nav label with nav link
73+
const navLabel = (item, key) => {
74+
const classes = {
75+
item: classNames( 'hidden-cn', item.class ),
76+
link: classNames( 'nav-label', item.class ? item.class : ''),
77+
icon: classNames(
78+
!item.icon ? 'fa fa-circle' : item.icon ,
79+
item.label.variant ? `text-${item.label.variant}` : '',
80+
item.label.class ? item.label.class : ''
81+
)
82+
};
83+
return (
84+
navLink(item, key, classes)
85+
);
86+
};
87+
7288
// nav item with nav link
7389
const navItem = (item, key) => {
7490
const classes = {
@@ -114,6 +130,7 @@ class Sidebar extends Component {
114130
const navType = (item, idx) =>
115131
item.title ? title(item, idx) :
116132
item.divider ? divider(item, idx) :
133+
item.label ? navLabel(item, idx) :
117134
item.children ? navDropdown(item, idx)
118135
: navItem(item, idx) ;
119136

‎React_Starter/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@coreui/react",
3-
"version": "1.0.8",
3+
"version": "1.0.9",
44
"description": "Open Source Bootstrap Admin Template",
55
"author": "Łukasz Holeczek",
66
"homepage": "http://coreui.io",
@@ -15,10 +15,10 @@
1515
"babel-preset-react": "6.24.1",
1616
"copy-webpack-plugin": "4.3.1",
1717
"css-hot-loader": "1.3.5",
18-
"css-loader": "0.28.8",
18+
"css-loader": "0.28.9",
1919
"extract-text-webpack-plugin": "3.0.2",
2020
"file-loader": "1.1.6",
21-
"html-loader": "0.5.4",
21+
"html-loader": "0.5.5",
2222
"html-webpack-plugin": "2.30.1",
2323
"node-sass": "4.7.2",
2424
"rimraf": "2.6.2",
@@ -31,7 +31,7 @@
3131
"webpack-dev-server": "2.9.7"
3232
},
3333
"dependencies": {
34-
"bootstrap": "4.0.0-beta.3",
34+
"bootstrap": "4.0.0",
3535
"chart.js": "2.7.1",
3636
"flag-icon-css": "2.9.0",
3737
"font-awesome": "4.7.0",
@@ -51,7 +51,7 @@
5151
"clean": "rimraf ./build"
5252
},
5353
"engines": {
54-
"node": ">= 6.12.3",
54+
"node": ">= 8.9.4",
5555
"npm": ">= 5.6.0"
5656
}
5757
}

‎React_Starter/public/img/flags/ASEAN.png

-1.89 KB
Binary file not shown.

‎React_Starter/public/img/flags/Afghanistan.png

-2.1 KB
Binary file not shown.

‎React_Starter/public/img/flags/African Union.png

-959 Bytes
Binary file not shown.

‎React_Starter/public/img/flags/Albania.png

-1.71 KB
Binary file not shown.

‎React_Starter/public/img/flags/Algeria.png

-1.41 KB
Binary file not shown.

0 commit comments

Comments
 (0)
0