Skip to content

v1.0.8 #44

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.

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 1 commit into from
Jan 17, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
## [react](./REACT.md) version `changelog`

###### `v1.0.8`
- refactor: Dashboard radio buttons, new `onRadioBtnClick()` method
- update: react to `16.2.0`
- update: Bootstrap `4.0.0-beta.3`
- update: dependencies
- feature: some Bootstrap4 components added
- fix: rollback to webpack-dev-server `2.9.7`
- temp tweaks(b4 beta3): `InputGroupAddon` and `InputGroupButton`
- refactor(checkboxes, radios): temp tweaks
- feat: mobile sidebar link click closes the sidebar
- fix: .nav-tabs .nav-link `cursor: pointer`

###### `v1.0.6`

- update: react to `^16.1.1`
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2017 creativeLabs Łukasz Holeczek.
Copyright (c) 2018 creativeLabs Łukasz Holeczek.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
37 changes: 19 additions & 18 deletions React_Full_Project/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@coreui/react",
"version": "1.0.6",
"version": "1.0.8",
"description": "Open Source Bootstrap Admin Template",
"author": "Łukasz Holeczek",
"homepage": "http://coreui.io",
Expand All @@ -13,44 +13,45 @@
"babel-plugin-transform-object-rest-spread": "6.26.0",
"babel-preset-env": "1.6.1",
"babel-preset-react": "6.24.1",
"copy-webpack-plugin": "4.2.1",
"css-hot-loader": "1.3.3",
"css-loader": "0.28.7",
"copy-webpack-plugin": "4.3.1",
"css-hot-loader": "1.3.5",
"css-loader": "0.28.8",
"extract-text-webpack-plugin": "3.0.2",
"file-loader": "1.1.5",
"html-loader": "0.5.1",
"file-loader": "1.1.6",
"html-loader": "0.5.4",
"html-webpack-plugin": "2.30.1",
"node-sass": "4.7.1",
"node-sass": "4.7.2",
"rimraf": "2.6.2",
"sass-loader": "6.0.6",
"source-list-map": "2.0.0",
"style-loader": "0.19.0",
"uglify-js": "3.1.10",
"style-loader": "0.19.1",
"uglify-js": "3.3.7",
"url-loader": "0.6.2",
"webpack": "3.8.1",
"webpack-dev-server": "2.9.4"
"webpack": "3.10.0",
"webpack-dev-server": "2.9.7"
},
"dependencies": {
"bootstrap": "4.0.0-beta.2",
"bootstrap": "4.0.0-beta.3",
"chart.js": "2.7.1",
"flag-icon-css": "2.9.0",
"font-awesome": "4.7.0",
"history": "4.7.2",
"react": "16.1.1",
"react-chartjs-2": "2.6.4",
"react-dom": "16.1.1",
"react": "16.2.0",
"react-chartjs-2": "2.7.0",
"react-dom": "16.2.0",
"react-router-dom": "4.2.2",
"react-transition-group": "2.2.1",
"reactstrap": "5.0.0-alpha.4",
"simple-line-icons": "2.4.1"
},
"scripts": {
"dev": "webpack -d --progress --watch --profile --json > compilation-stats.json --env.dev",
"start": "webpack-dev-server --progress --colors --inline --env.dev",
"start": "webpack-dev-server --progress --color --inline --env.dev",
"build": "webpack -p --progress --env.prod",
"clean": "rimraf ./build"
},
"engines": {
"node": ">= 6.4.0",
"npm": ">= 5.0.0"
"node": ">= 6.12.3",
"npm": ">= 5.6.0"
}
}
Binary file removed React_Full_Project/public/img/flags/ASEAN.png
Binary file not shown.
Binary file removed React_Full_Project/public/img/flags/Afghanistan.png
Binary file not shown.
Binary file removed React_Full_Project/public/img/flags/African Union.png
Binary file not shown.
Binary file removed React_Full_Project/public/img/flags/Albania.png
Binary file not shown.
Binary file removed React_Full_Project/public/img/flags/Algeria.png
Binary file not shown.
Binary file not shown.
Binary file removed React_Full_Project/public/img/flags/Andorra.png
Binary file not shown.
Binary file removed React_Full_Project/public/img/flags/Angola.png
Binary file not shown.
Binary file removed React_Full_Project/public/img/flags/Anguilla.png
Binary file not shown.
Binary file removed React_Full_Project/public/img/flags/Antarctica.png
Binary file not shown.
Binary file not shown.
Binary file removed React_Full_Project/public/img/flags/Arab League.png
Binary file not shown.
Binary file removed React_Full_Project/public/img/flags/Argentina.png
Binary file not shown.
Binary file removed React_Full_Project/public/img/flags/Armenia.png
Binary file not shown.
Binary file removed React_Full_Project/public/img/flags/Aruba.png
Binary file not shown.
Binary file removed React_Full_Project/public/img/flags/Australia.png
Binary file not shown.
Binary file removed React_Full_Project/public/img/flags/Austria.png
Binary file not shown.
Binary file removed React_Full_Project/public/img/flags/Azerbaijan.png
Binary file not shown.
Binary file removed React_Full_Project/public/img/flags/Bahamas.png
Binary file not shown.
Binary file removed React_Full_Project/public/img/flags/Bahrain.png
Binary file not shown.
Binary file removed React_Full_Project/public/img/flags/Bangladesh.png
Binary file not shown.
Binary file removed React_Full_Project/public/img/flags/Barbados.png
Binary file not shown.
Binary file removed React_Full_Project/public/img/flags/Belarus.png
Binary file not shown.
Binary file removed React_Full_Project/public/img/flags/Belgium.png
Binary file not shown.
Binary file removed React_Full_Project/public/img/flags/Belize.png
Binary file not shown.
Binary file removed React_Full_Project/public/img/flags/Benin.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Bermuda.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Bhutan.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Bolivia.png
Diff not rendered.
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Botswana.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Brazil.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Brunei.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Bulgaria.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Burkina Faso.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Burundi.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/CARICOM.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/CIS.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Cambodja.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Cameroon.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Canada.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Cape Verde.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Chad.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Chile.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/China.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Colombia.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Commonwealth.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Comoros.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Cook Islands.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Costa Rica.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Cote d'Ivoire.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Croatia.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Cuba.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Cyprus.png
Diff not rendered.
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Denmark.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Djibouti.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Dominica.png
Diff not rendered.
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Ecuador.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Egypt.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/El Salvador.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/England.png
Diff not rendered.
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Eritrea.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Estonia.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Ethiopia.png
Diff not rendered.
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Faroes.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Fiji.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Finland.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/France.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Gabon.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Gambia.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Georgia.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Germany.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Ghana.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Gibraltar.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Greece.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Greenland.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Grenada.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Guadeloupe.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Guam.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Guatemala.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Guernsey.png
Diff not rendered.
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Guinea.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Guyana.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Haiti.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Honduras.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Hong Kong.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Hungary.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Iceland.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/India.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Indonezia.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Iran.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Iraq.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Ireland.png
Diff not rendered.
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Isle of Man.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Israel.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Italy.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Jamaica.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Japan.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Jersey.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Jordan.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Kazakhstan.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Kenya.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Kiribati.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Kosovo.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Kuwait.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Kyrgyzstan.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Laos.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Latvia.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Lebanon.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Lesotho.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Liberia.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Libya.png
Diff not rendered.
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Lithuania.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Luxembourg.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Macao.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Macedonia.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Madagascar.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Malawi.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Malaysia.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Maldives.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Mali.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Malta.png
Diff not rendered.
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Martinique.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Mauritania.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Mauritius.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Mexico.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Micronesia.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Moldova.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Monaco.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Mongolia.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Montenegro.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Montserrat.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Morocco.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Mozambique.png
Diff not rendered.
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/NATO.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Namibia.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Nauru.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Nepal.png
Diff not rendered.
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Netherlands.png
Diff not rendered.
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/New Zealand.png
Diff not rendered.
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Niger.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Nigeria.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/North Korea.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Norway.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/OPEC.png
Diff not rendered.
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Oman.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Pakistan.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Palau.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Palestine.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Panama.png
Diff not rendered.
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Paraguay.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Peru.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Philippines.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Poland.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Portugal.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Puerto Rico.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Qatar.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Red Cross.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Reunion.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Romania.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Russia.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Rwanda.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Saint Lucia.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Samoa.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/San Marino.png
Diff not rendered.
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Saudi Arabia.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Scotland.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Senegal.png
Diff not rendered.
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Seychelles.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Sierra Leone.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Singapore.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Slovakia.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Slovenia.png
Diff not rendered.
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Somalia.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Somaliland.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/South Africa.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/South Korea.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Spain.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Sri Lanka.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Sudan.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Suriname.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Swaziland.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Sweden.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Switzerland.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Syria.png
Diff not rendered.
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Taiwan.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Tajikistan.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Tanzania.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Thailand.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Timor-Leste.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Togo.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Tonga.png
Diff not rendered.
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Tunisia.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Turkey.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Turkmenistan.png
Diff not rendered.
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Tuvalu.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/USA.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Uganda.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Ukraine.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Uruguay.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Uzbekistan.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Vanutau.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Vatican City.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Venezuela.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Viet Nam.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Wales.png
Diff not rendered.
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Yemen.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Zambia.png
Diff not rendered.
Binary file removed React_Full_Project/public/img/flags/Zimbabwe.png
Diff not rendered.
23 changes: 22 additions & 1 deletion React_Full_Project/scss/_bootstrap-variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,28 @@ $theme-colors: (
warning: $yellow,
danger: $red,
light: $gray-100,
dark: $gray-800
dark: $gray-800,

blue: $blue,
indigo: $indigo,
purple: $purple,
pink: $pink,
red: $red,
orange: $orange,
yellow: $yellow,
green: $green,
teal: $teal,
cyan: $cyan,

gray-100: $gray-100,
gray-200: $gray-200,
gray-300: $gray-300,
gray-400: $gray-400,
gray-500: $gray-500,
gray-600: $gray-600,
gray-700: $gray-700,
gray-800: $gray-800,
gray-900: $gray-900
);

// Options
Expand Down
9 changes: 0 additions & 9 deletions React_Full_Project/scss/core/_buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,6 @@ button {
cursor: pointer;
}

.btn {
.badge {
position: absolute;
top: 2px;
right: 6px;
font-size: 9px;
}
}

.btn-transparent {
color: #fff;
background-color: transparent;
Expand Down
3 changes: 3 additions & 0 deletions React_Full_Project/scss/core/_layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,9 @@ app-root {
}
}
}
.sidebar-minimizer {
display: none;
}
}

.sidebar-minimized {
Expand Down
3 changes: 3 additions & 0 deletions React_Full_Project/scss/core/_nav.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
.nav-tabs {
.nav-link {
color: $gray-600;
&:hover {
cursor: pointer;
}
&.active {
color: $gray-800;
background: #fff;
Expand Down
2 changes: 1 addition & 1 deletion React_Full_Project/scss/core/_sidebar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@
border-radius: $border-radius;
}
> .nav-dropdown-items {
max-height: 1000px;
max-height: 1500px;
}

.nav-link {
Expand Down
4 changes: 2 additions & 2 deletions React_Full_Project/scss/style.scss
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*!
* CoreUI - Open Source Bootstrap Admin Template
* @version v1.0.6
* @version v1.0.8
* @link http://coreui.io
* Copyright (c) 2017 creativeLabs Łukasz Holeczek
* Copyright (c) 2018 creativeLabs Łukasz Holeczek
* @license MIT
*/

Expand Down
2 changes: 1 addition & 1 deletion React_Full_Project/src/components/Footer/Footer.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ class Footer extends Component {
render() {
return (
<footer className="app-footer">
<span><a href="http://coreui.io">CoreUI</a> &copy; 2017 creativeLabs.</span>
<span><a href="http://coreui.io">CoreUI</a> &copy; 2018 creativeLabs.</span>
<span className="ml-auto">Powered by <a href="http://coreui.io">CoreUI</a></span>
</footer>
)
Expand Down
23 changes: 18 additions & 5 deletions React_Full_Project/src/components/Sidebar/Sidebar.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,15 @@ import SidebarMinimizer from './../SidebarMinimizer';

class Sidebar extends Component {

constructor(props) {
super(props);

this.handleClick = this.handleClick.bind(this);
this.activeRoute = this.activeRoute.bind(this);
this.hideMobile = this.hideMobile.bind(this);
}


handleClick(e) {
e.preventDefault();
e.target.parentElement.classList.toggle('open');
Expand All @@ -21,6 +30,12 @@ class Sidebar extends Component {

}

hideMobile() {
if (document.body.classList.contains('sidebar-mobile-show')) {
document.body.classList.toggle('sidebar-mobile-show')
}
}

// todo Sidebar nav secondLevel
// secondLevelActive(routeName) {
// return this.props.location.pathname.indexOf(routeName) > -1 ? "nav nav-second-level collapse in" : "nav nav-second-level collapse";
Expand All @@ -30,8 +45,6 @@ class Sidebar extends Component {
render() {

const props = this.props;
const activeRoute = this.activeRoute;
const handleClick = this.handleClick;

// badge addon to NavItem
const badge = (badge) => {
Expand Down Expand Up @@ -78,7 +91,7 @@ class Sidebar extends Component {
<i className={classes.icon}></i>{item.name}{badge(item.badge)}
</RsNavLink>
:
<NavLink to={url} className={classes.link} activeClassName="active">
<NavLink to={url} className={classes.link} activeClassName="active" onClick={this.hideMobile}>
<i className={classes.icon}></i>{item.name}{badge(item.badge)}
</NavLink>
}
Expand All @@ -89,8 +102,8 @@ class Sidebar extends Component {
// nav dropdown
const navDropdown = (item, key) => {
return (
<li key={key} className={activeRoute(item.url, props)}>
<a className="nav-link nav-dropdown-toggle" href="#" onClick={handleClick.bind(this)}><i className={item.icon}></i>{item.name}</a>
<li key={key} className={this.activeRoute(item.url, props)}>
<a className="nav-link nav-dropdown-toggle" href="#" onClick={this.handleClick}><i className={item.icon}></i>{item.name}</a>
<ul className="nav-dropdown-items">
{navList(item.children)}
</ul>
Expand Down
Loading