From e6a32aea1a0c7e5def76e92a4c172992578db141 Mon Sep 17 00:00:00 2001 From: xidedix Date: Mon, 1 Oct 2018 20:12:41 +0200 Subject: [PATCH] chore: dependencies update --- CHANGELOG.md | 12 +++ package.json | 22 ++-- src/scss/style.css | 254 ++++++++++++++++++++------------------------- 3 files changed, 135 insertions(+), 153 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f8a4847..7b0ad52 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ ## [CoreUI](https://coreui.io/) for [react](./REACT.md) changelog +##### `v2.0.10` +- chore: update `@coreui/coreui` to `^2.0.14` +- chore: update `@coreui/react` to `^2.0.6` +- chore: update `enzyme` to `^3.6.0` +- chore: update `enzyme-adapter-react-16` to `^1.5.0` +- chore: update `flag-icon-css` to `^3.2.0` +- chore: update `react` to `^16.5.2` +- chore: update `react-dom` to `^16.5.2` +- chore: update `react-router-config` to `^4.4.0-beta.1` +- chore: update `react-test-renderer` to `^16.5.2` +- chore: update `babel-jest` to `^23.6.0` + ##### `v2.0.9` - chore: update `@coreui/icons` to `0.3.0` - refactor(CoreUIIcons): move to `@coreui/icons v0.3.0` diff --git a/package.json b/package.json index 556f277..002df87 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@coreui/coreui-free-react-admin-template", - "version": "2.0.9", + "version": "2.0.10", "description": "CoreUI React Open Source Bootstrap 4 Admin Template", "author": "Łukasz Holeczek", "homepage": "https://coreui.io", @@ -12,31 +12,31 @@ "url": "git@github.com:coreui/coreui-free-react-admin-template.git" }, "dependencies": { - "@coreui/coreui": "^2.0.4", + "@coreui/coreui": "^2.0.14", "@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.2.0", "@coreui/icons": "0.3.0", - "@coreui/react": "^2.0.5", + "@coreui/react": "^2.0.6", "bootstrap": "^4.1.3", "chart.js": "^2.7.2", "classnames": "^2.2.6", "core-js": "^2.5.7", - "enzyme": "^3.5.0", - "enzyme-adapter-react-16": "^1.3.1", - "flag-icon-css": "^3.0.0", + "enzyme": "^3.6.0", + "enzyme-adapter-react-16": "^1.5.0", + "flag-icon-css": "^3.2.0", "font-awesome": "^4.7.0", "prop-types": "^15.6.2", - "react": "^16.4.2", + "react": "^16.5.2", "react-chartjs-2": "^2.7.2", - "react-dom": "^16.4.2", + "react-dom": "^16.5.2", "react-loadable": "^5.5.0", - "react-router-config": "^1.0.0-beta.4", + "react-router-config": "^4.4.0-beta.1", "react-router-dom": "^4.3.1", - "react-test-renderer": "^16.4.2", + "react-test-renderer": "^16.5.2", "reactstrap": "^6.4.0", "simple-line-icons": "^2.4.1" }, "devDependencies": { - "babel-jest": "^23.4.2", + "babel-jest": "^23.6.0", "node-sass-chokidar": "^1.3.0", "npm-run-all": "^4.1.3", "react-scripts": "^1.1.5" diff --git a/src/scss/style.css b/src/scss/style.css index e98c1e5..5c3cb25 100644 --- a/src/scss/style.css +++ b/src/scss/style.css @@ -1,7 +1,7 @@ @charset "UTF-8"; /*! * CoreUI - Open Source Dashboard UI Kit - * @version v2.0.4 + * @version v2.0.14 * @link https://coreui.io * Copyright (c) 2018 creativeLabs Łukasz Holeczek * Licensed under MIT (https://coreui.io/license) @@ -26,6 +26,7 @@ --white: #fff; --gray: #73818f; --gray-dark: #2f353a; + --light-blue: #63c2de; --primary: #20a8d8; --secondary: #c8ced3; --success: #4dbd74; @@ -8307,6 +8308,14 @@ canvas { .sidebar-minimized .sidebar .sidebar-form, .sidebar-minimized .sidebar .sidebar-header { display: none; } + .sidebar-minimized .sidebar .sidebar-minimizer { + position: fixed; + bottom: 0; + width: 50px; + height: 50px; + background-color: #24282c; } + .sidebar-minimized .sidebar .sidebar-nav { + padding-bottom: 50px; } .sidebar-minimized .sidebar .sidebar-minimizer::before { width: 100%; transform: rotate(-180deg); } @@ -8373,6 +8382,9 @@ canvas { float: left; margin-top: 2px; } +*[dir="rtl"] .sidebar-minimized .sidebar .nav { + list-style-type: disc; } + *[dir="rtl"] .sidebar-minimized .sidebar .nav-link { padding-right: 0; } *[dir="rtl"] .sidebar-minimized .sidebar .nav-link .nav-icon { @@ -8387,6 +8399,9 @@ canvas { right: 50px; left: 0; } +*[dir="rtl"] .sidebar-toggler { + margin-right: 0 !important; } + .switch { display: inline-block; width: 40px; @@ -8766,12 +8781,14 @@ html:not([dir="rtl"]) .sidebar { margin-left: -200px; } html:not([dir="rtl"]) .aside-menu { + right: 0; margin-right: -250px; } html[dir="rtl"] .sidebar { margin-right: -200px; } html[dir="rtl"] .aside-menu { + left: 0; margin-left: -250px; } @media (min-width: 992px) { @@ -8845,62 +8862,70 @@ html[dir="rtl"] .aside-menu { html:not([dir="rtl"]) .sidebar-show .sidebar { margin-left: 0; } -@media (min-width: 576px) { - html:not([dir="rtl"]) .sidebar-show.sidebar-fixed .main, - html:not([dir="rtl"]) .sidebar-show.sidebar-fixed .app-footer { - margin-left: 200px; } - html:not([dir="rtl"]) .sidebar-show.sidebar-fixed.sidebar-compact .main, - html:not([dir="rtl"]) .sidebar-show.sidebar-fixed.sidebar-compact .app-footer { - margin-left: 150px; } - html:not([dir="rtl"]) .sidebar-show.sidebar-fixed.sidebar-minimized .main, - html:not([dir="rtl"]) .sidebar-show.sidebar-fixed.sidebar-minimized .app-footer { - margin-left: 50px; } - html:not([dir="rtl"]) .sidebar-show.breadcrumb-fixed .breadcrumb { - left: 200px; } - html:not([dir="rtl"]) .sidebar-show.breadcrumb-fixed.sidebar-compact .breadcrumb { - left: 150px; } - html:not([dir="rtl"]) .sidebar-show.breadcrumb-fixed.sidebar-minimized .breadcrumb { - left: 50px; } } +html:not([dir="rtl"]) .sidebar-show.sidebar-fixed .main, +html:not([dir="rtl"]) .sidebar-show.sidebar-fixed .app-footer { + margin-left: 200px; } + +html:not([dir="rtl"]) .sidebar-show.sidebar-fixed.sidebar-compact .main, +html:not([dir="rtl"]) .sidebar-show.sidebar-fixed.sidebar-compact .app-footer { + margin-left: 150px; } + +html:not([dir="rtl"]) .sidebar-show.sidebar-fixed.sidebar-minimized .main, +html:not([dir="rtl"]) .sidebar-show.sidebar-fixed.sidebar-minimized .app-footer { + margin-left: 50px; } + +html:not([dir="rtl"]) .sidebar-show.breadcrumb-fixed .breadcrumb { + left: 200px; } + +html:not([dir="rtl"]) .sidebar-show.breadcrumb-fixed.sidebar-compact .breadcrumb { + left: 150px; } + +html:not([dir="rtl"]) .sidebar-show.breadcrumb-fixed.sidebar-minimized .breadcrumb { + left: 50px; } html:not([dir="rtl"]) .aside-menu-show .aside-menu { margin-right: 0; } -@media (min-width: 576px) { - html:not([dir="rtl"]) .aside-menu-show.aside-menu-fixed .main, - html:not([dir="rtl"]) .aside-menu-show.aside-menu-fixed .app-footer { - margin-right: 250px; } - html:not([dir="rtl"]) .aside-menu-show.breadcrumb-fixed .breadcrumb { - right: 250px; } } +html:not([dir="rtl"]) .aside-menu-show.aside-menu-fixed .main, +html:not([dir="rtl"]) .aside-menu-show.aside-menu-fixed .app-footer { + margin-right: 250px; } + +html:not([dir="rtl"]) .aside-menu-show.breadcrumb-fixed .breadcrumb { + right: 250px; } html[dir="rtl"] .sidebar-show .sidebar { margin-right: 0; } -@media (min-width: 576px) { - html[dir="rtl"] .sidebar-show.sidebar-fixed .main, - html[dir="rtl"] .sidebar-show.sidebar-fixed .app-footer { - margin-right: 200px; } - html[dir="rtl"] .sidebar-show.sidebar-fixed.sidebar-compact .main, - html[dir="rtl"] .sidebar-show.sidebar-fixed.sidebar-compact .app-footer { - margin-right: 150px; } - html[dir="rtl"] .sidebar-show.sidebar-fixed.sidebar-minimized .main, - html[dir="rtl"] .sidebar-show.sidebar-fixed.sidebar-minimized .app-footer { - margin-right: 50px; } - html[dir="rtl"] .sidebar-show.breadcrumb-fixed .breadcrumb { - right: 200px; } - html[dir="rtl"] .sidebar-show.breadcrumb-fixed.sidebar-compact .breadcrumb { - right: 150px; } - html[dir="rtl"] .sidebar-show.breadcrumb-fixed.sidebar-minimized .breadcrumb { - right: 50px; } } +html[dir="rtl"] .sidebar-show.sidebar-fixed .main, +html[dir="rtl"] .sidebar-show.sidebar-fixed .app-footer { + margin-right: 200px; } + +html[dir="rtl"] .sidebar-show.sidebar-fixed.sidebar-compact .main, +html[dir="rtl"] .sidebar-show.sidebar-fixed.sidebar-compact .app-footer { + margin-right: 150px; } + +html[dir="rtl"] .sidebar-show.sidebar-fixed.sidebar-minimized .main, +html[dir="rtl"] .sidebar-show.sidebar-fixed.sidebar-minimized .app-footer { + margin-right: 50px; } + +html[dir="rtl"] .sidebar-show.breadcrumb-fixed .breadcrumb { + right: 200px; } + +html[dir="rtl"] .sidebar-show.breadcrumb-fixed.sidebar-compact .breadcrumb { + right: 150px; } + +html[dir="rtl"] .sidebar-show.breadcrumb-fixed.sidebar-minimized .breadcrumb { + right: 50px; } html[dir="rtl"] .aside-menu-show .aside-menu { margin-left: 0; } -@media (min-width: 576px) { - html[dir="rtl"] .aside-menu-show.aside-menu-fixed .main, - html[dir="rtl"] .aside-menu-show.aside-menu-fixed .app-footer { - margin-left: 250px; } - html[dir="rtl"] .aside-menu-show.breadcrumb-fixed .breadcrumb { - left: 250px; } } +html[dir="rtl"] .aside-menu-show.aside-menu-fixed .main, +html[dir="rtl"] .aside-menu-show.aside-menu-fixed .app-footer { + margin-left: 250px; } + +html[dir="rtl"] .aside-menu-show.breadcrumb-fixed .breadcrumb { + left: 250px; } @keyframes opacity { 0% { @@ -8926,9 +8951,7 @@ html[dir="rtl"] .aside-menu-show .aside-menu { @media (min-width: 576px) { html:not([dir="rtl"]) .sidebar-sm-show .sidebar { - margin-left: 0; } } - -@media (min-width: 576px) and (min-width: 576px) { + margin-left: 0; } html:not([dir="rtl"]) .sidebar-sm-show.sidebar-fixed .main, html:not([dir="rtl"]) .sidebar-sm-show.sidebar-fixed .app-footer { margin-left: 200px; } @@ -8943,24 +8966,16 @@ html[dir="rtl"] .aside-menu-show .aside-menu { html:not([dir="rtl"]) .sidebar-sm-show.breadcrumb-fixed.sidebar-compact .breadcrumb { left: 150px; } html:not([dir="rtl"]) .sidebar-sm-show.breadcrumb-fixed.sidebar-minimized .breadcrumb { - left: 50px; } } - -@media (min-width: 576px) { + left: 50px; } html:not([dir="rtl"]) .aside-menu-sm-show .aside-menu { - margin-right: 0; } } - -@media (min-width: 576px) and (min-width: 576px) { + margin-right: 0; } html:not([dir="rtl"]) .aside-menu-sm-show.aside-menu-fixed .main, html:not([dir="rtl"]) .aside-menu-sm-show.aside-menu-fixed .app-footer { margin-right: 250px; } html:not([dir="rtl"]) .aside-menu-sm-show.breadcrumb-fixed .breadcrumb { - right: 250px; } } - -@media (min-width: 576px) { + right: 250px; } html[dir="rtl"] .sidebar-sm-show .sidebar { - margin-right: 0; } } - -@media (min-width: 576px) and (min-width: 576px) { + margin-right: 0; } html[dir="rtl"] .sidebar-sm-show.sidebar-fixed .main, html[dir="rtl"] .sidebar-sm-show.sidebar-fixed .app-footer { margin-right: 200px; } @@ -8975,20 +8990,14 @@ html[dir="rtl"] .aside-menu-show .aside-menu { html[dir="rtl"] .sidebar-sm-show.breadcrumb-fixed.sidebar-compact .breadcrumb { right: 150px; } html[dir="rtl"] .sidebar-sm-show.breadcrumb-fixed.sidebar-minimized .breadcrumb { - right: 50px; } } - -@media (min-width: 576px) { + right: 50px; } html[dir="rtl"] .aside-menu-sm-show .aside-menu { - margin-left: 0; } } - -@media (min-width: 576px) and (min-width: 576px) { + margin-left: 0; } html[dir="rtl"] .aside-menu-sm-show.aside-menu-fixed .main, html[dir="rtl"] .aside-menu-sm-show.aside-menu-fixed .app-footer { margin-left: 250px; } html[dir="rtl"] .aside-menu-sm-show.breadcrumb-fixed .breadcrumb { - left: 250px; } } - -@media (min-width: 576px) { + left: 250px; } @keyframes opacity { 0% { opacity: 0; } @@ -9013,9 +9022,7 @@ html[dir="rtl"] .aside-menu-show .aside-menu { @media (min-width: 768px) { html:not([dir="rtl"]) .sidebar-md-show .sidebar { - margin-left: 0; } } - -@media (min-width: 768px) and (min-width: 576px) { + margin-left: 0; } html:not([dir="rtl"]) .sidebar-md-show.sidebar-fixed .main, html:not([dir="rtl"]) .sidebar-md-show.sidebar-fixed .app-footer { margin-left: 200px; } @@ -9030,24 +9037,16 @@ html[dir="rtl"] .aside-menu-show .aside-menu { html:not([dir="rtl"]) .sidebar-md-show.breadcrumb-fixed.sidebar-compact .breadcrumb { left: 150px; } html:not([dir="rtl"]) .sidebar-md-show.breadcrumb-fixed.sidebar-minimized .breadcrumb { - left: 50px; } } - -@media (min-width: 768px) { + left: 50px; } html:not([dir="rtl"]) .aside-menu-md-show .aside-menu { - margin-right: 0; } } - -@media (min-width: 768px) and (min-width: 576px) { + margin-right: 0; } html:not([dir="rtl"]) .aside-menu-md-show.aside-menu-fixed .main, html:not([dir="rtl"]) .aside-menu-md-show.aside-menu-fixed .app-footer { margin-right: 250px; } html:not([dir="rtl"]) .aside-menu-md-show.breadcrumb-fixed .breadcrumb { - right: 250px; } } - -@media (min-width: 768px) { + right: 250px; } html[dir="rtl"] .sidebar-md-show .sidebar { - margin-right: 0; } } - -@media (min-width: 768px) and (min-width: 576px) { + margin-right: 0; } html[dir="rtl"] .sidebar-md-show.sidebar-fixed .main, html[dir="rtl"] .sidebar-md-show.sidebar-fixed .app-footer { margin-right: 200px; } @@ -9062,20 +9061,14 @@ html[dir="rtl"] .aside-menu-show .aside-menu { html[dir="rtl"] .sidebar-md-show.breadcrumb-fixed.sidebar-compact .breadcrumb { right: 150px; } html[dir="rtl"] .sidebar-md-show.breadcrumb-fixed.sidebar-minimized .breadcrumb { - right: 50px; } } - -@media (min-width: 768px) { + right: 50px; } html[dir="rtl"] .aside-menu-md-show .aside-menu { - margin-left: 0; } } - -@media (min-width: 768px) and (min-width: 576px) { + margin-left: 0; } html[dir="rtl"] .aside-menu-md-show.aside-menu-fixed .main, html[dir="rtl"] .aside-menu-md-show.aside-menu-fixed .app-footer { margin-left: 250px; } html[dir="rtl"] .aside-menu-md-show.breadcrumb-fixed .breadcrumb { - left: 250px; } } - -@media (min-width: 768px) { + left: 250px; } @keyframes opacity { 0% { opacity: 0; } @@ -9100,9 +9093,7 @@ html[dir="rtl"] .aside-menu-show .aside-menu { @media (min-width: 992px) { html:not([dir="rtl"]) .sidebar-lg-show .sidebar { - margin-left: 0; } } - -@media (min-width: 992px) and (min-width: 576px) { + margin-left: 0; } html:not([dir="rtl"]) .sidebar-lg-show.sidebar-fixed .main, html:not([dir="rtl"]) .sidebar-lg-show.sidebar-fixed .app-footer { margin-left: 200px; } @@ -9117,24 +9108,16 @@ html[dir="rtl"] .aside-menu-show .aside-menu { html:not([dir="rtl"]) .sidebar-lg-show.breadcrumb-fixed.sidebar-compact .breadcrumb { left: 150px; } html:not([dir="rtl"]) .sidebar-lg-show.breadcrumb-fixed.sidebar-minimized .breadcrumb { - left: 50px; } } - -@media (min-width: 992px) { + left: 50px; } html:not([dir="rtl"]) .aside-menu-lg-show .aside-menu { - margin-right: 0; } } - -@media (min-width: 992px) and (min-width: 576px) { + margin-right: 0; } html:not([dir="rtl"]) .aside-menu-lg-show.aside-menu-fixed .main, html:not([dir="rtl"]) .aside-menu-lg-show.aside-menu-fixed .app-footer { margin-right: 250px; } html:not([dir="rtl"]) .aside-menu-lg-show.breadcrumb-fixed .breadcrumb { - right: 250px; } } - -@media (min-width: 992px) { + right: 250px; } html[dir="rtl"] .sidebar-lg-show .sidebar { - margin-right: 0; } } - -@media (min-width: 992px) and (min-width: 576px) { + margin-right: 0; } html[dir="rtl"] .sidebar-lg-show.sidebar-fixed .main, html[dir="rtl"] .sidebar-lg-show.sidebar-fixed .app-footer { margin-right: 200px; } @@ -9149,20 +9132,14 @@ html[dir="rtl"] .aside-menu-show .aside-menu { html[dir="rtl"] .sidebar-lg-show.breadcrumb-fixed.sidebar-compact .breadcrumb { right: 150px; } html[dir="rtl"] .sidebar-lg-show.breadcrumb-fixed.sidebar-minimized .breadcrumb { - right: 50px; } } - -@media (min-width: 992px) { + right: 50px; } html[dir="rtl"] .aside-menu-lg-show .aside-menu { - margin-left: 0; } } - -@media (min-width: 992px) and (min-width: 576px) { + margin-left: 0; } html[dir="rtl"] .aside-menu-lg-show.aside-menu-fixed .main, html[dir="rtl"] .aside-menu-lg-show.aside-menu-fixed .app-footer { margin-left: 250px; } html[dir="rtl"] .aside-menu-lg-show.breadcrumb-fixed .breadcrumb { - left: 250px; } } - -@media (min-width: 992px) { + left: 250px; } @keyframes opacity { 0% { opacity: 0; } @@ -9187,9 +9164,7 @@ html[dir="rtl"] .aside-menu-show .aside-menu { @media (min-width: 1200px) { html:not([dir="rtl"]) .sidebar-xl-show .sidebar { - margin-left: 0; } } - -@media (min-width: 1200px) and (min-width: 576px) { + margin-left: 0; } html:not([dir="rtl"]) .sidebar-xl-show.sidebar-fixed .main, html:not([dir="rtl"]) .sidebar-xl-show.sidebar-fixed .app-footer { margin-left: 200px; } @@ -9204,24 +9179,16 @@ html[dir="rtl"] .aside-menu-show .aside-menu { html:not([dir="rtl"]) .sidebar-xl-show.breadcrumb-fixed.sidebar-compact .breadcrumb { left: 150px; } html:not([dir="rtl"]) .sidebar-xl-show.breadcrumb-fixed.sidebar-minimized .breadcrumb { - left: 50px; } } - -@media (min-width: 1200px) { + left: 50px; } html:not([dir="rtl"]) .aside-menu-xl-show .aside-menu { - margin-right: 0; } } - -@media (min-width: 1200px) and (min-width: 576px) { + margin-right: 0; } html:not([dir="rtl"]) .aside-menu-xl-show.aside-menu-fixed .main, html:not([dir="rtl"]) .aside-menu-xl-show.aside-menu-fixed .app-footer { margin-right: 250px; } html:not([dir="rtl"]) .aside-menu-xl-show.breadcrumb-fixed .breadcrumb { - right: 250px; } } - -@media (min-width: 1200px) { + right: 250px; } html[dir="rtl"] .sidebar-xl-show .sidebar { - margin-right: 0; } } - -@media (min-width: 1200px) and (min-width: 576px) { + margin-right: 0; } html[dir="rtl"] .sidebar-xl-show.sidebar-fixed .main, html[dir="rtl"] .sidebar-xl-show.sidebar-fixed .app-footer { margin-right: 200px; } @@ -9236,20 +9203,14 @@ html[dir="rtl"] .aside-menu-show .aside-menu { html[dir="rtl"] .sidebar-xl-show.breadcrumb-fixed.sidebar-compact .breadcrumb { right: 150px; } html[dir="rtl"] .sidebar-xl-show.breadcrumb-fixed.sidebar-minimized .breadcrumb { - right: 50px; } } - -@media (min-width: 1200px) { + right: 50px; } html[dir="rtl"] .aside-menu-xl-show .aside-menu { - margin-left: 0; } } - -@media (min-width: 1200px) and (min-width: 576px) { + margin-left: 0; } html[dir="rtl"] .aside-menu-xl-show.aside-menu-fixed .main, html[dir="rtl"] .aside-menu-xl-show.aside-menu-fixed .app-footer { margin-left: 250px; } html[dir="rtl"] .aside-menu-xl-show.breadcrumb-fixed .breadcrumb { - left: 250px; } } - -@media (min-width: 1200px) { + left: 250px; } @keyframes opacity { 0% { opacity: 0; } @@ -9307,6 +9268,7 @@ html[dir="rtl"] .aside-menu-show .aside-menu { color: #fff; } .app-header .navbar-brand { position: absolute; + top: 0; left: 50%; margin-left: -77.5px; } .app-body { @@ -9320,7 +9282,6 @@ html[dir="rtl"] .aside-menu-show .aside-menu { display: none; } .aside-menu { position: fixed; - right: 0; height: 100%; } } hr.transparent { @@ -9638,6 +9599,14 @@ button.bg-gray-dark:hover, button.bg-gray-dark:focus { background-color: #181b1e !important; } +.bg-light-blue { + background-color: #63c2de !important; } + +a.bg-light-blue:hover, a.bg-light-blue:focus, +button.bg-light-blue:hover, +button.bg-light-blue:focus { + background-color: #39b2d5 !important; } + .bg-gray-100 { background-color: #f0f3f5 !important; } @@ -9852,6 +9821,7 @@ body { white: #fff; gray: #73818f; gray-dark: #2f353a; + light-blue: #63c2de; primary: #20a8d8; secondary: #c8ced3; success: #4dbd74;