From 26be74402751df254f7e24aef391e968ae096a8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Holeczek?= Date: Fri, 13 Jul 2018 17:37:49 +0200 Subject: [PATCH] update: coreui to 2.0.4 --- package.json | 4 +- src/scss/style.css | 189 ++++++++++--------------------- src/scss/vendors/_variables.scss | 3 - 3 files changed, 60 insertions(+), 136 deletions(-) diff --git a/package.json b/package.json index 9eca326..a9d366f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@coreui/coreui-free-react-admin-template", - "version": "2.0.5", + "version": "2.0.6", "description": "CoreUI React Open Source Bootstrap 4 Admin Template", "author": "Łukasz Holeczek", "homepage": "https://coreui.io", @@ -12,7 +12,7 @@ "url": "git@github.com:coreui/coreui-free-react-admin-template.git" }, "dependencies": { - "@coreui/coreui": "^2.0.2", + "@coreui/coreui": "^2.0.4", "@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.2.0", "@coreui/icons": "0.2.0", "@coreui/react": "^2.0.4", diff --git a/src/scss/style.css b/src/scss/style.css index ddd7561..a83d031 100644 --- a/src/scss/style.css +++ b/src/scss/style.css @@ -1,13 +1,13 @@ @charset "UTF-8"; /*! * CoreUI - Open Source Dashboard UI Kit - * @version v2.0.2 + * @version v2.0.4 * @link https://coreui.io * Copyright (c) 2018 creativeLabs Łukasz Holeczek * Licensed under MIT (https://coreui.io/license) */ /*! - * Bootstrap v4.1.1 (https://getbootstrap.com/) + * Bootstrap v4.1.2 (https://getbootstrap.com/) * Copyright 2011-2018 The Bootstrap Authors * Copyright 2011-2018 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) @@ -26,16 +26,6 @@ --white: #fff; --gray: #73818f; --gray-dark: #2f353a; - --light-blue: #63c2de; - --gray-100: #f0f3f5; - --gray-200: #e4e7ea; - --gray-300: #c8ced3; - --gray-400: #acb4bc; - --gray-500: #8f9ba6; - --gray-600: #73818f; - --gray-700: #5c6873; - --gray-800: #2f353a; - --gray-900: #23282c; --primary: #20a8d8; --secondary: #c8ced3; --success: #4dbd74; @@ -193,7 +183,8 @@ img { border-style: none; } svg:not(:root) { - overflow: hidden; } + overflow: hidden; + vertical-align: middle; } table { border-collapse: collapse; } @@ -1324,7 +1315,7 @@ select.form-control:focus::-ms-value { .col-form-label-sm { padding-top: calc(0.25rem + 1px); padding-bottom: calc(0.25rem + 1px); - font-size: 0.76563rem; + font-size: 0.76562rem; line-height: 1.5; } .form-control-plaintext { @@ -1356,7 +1347,7 @@ select.form-control:focus::-ms-value { .input-group-sm > .input-group-prepend > .btn, .input-group-sm > .input-group-append > .btn { padding: 0.25rem 0.5rem; - font-size: 0.76563rem; + font-size: 0.76562rem; line-height: 1.5; border-radius: 0.2rem; } @@ -1382,7 +1373,7 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for .input-group-lg > .input-group-append > select.input-group-text:not([size]):not([multiple]), .input-group-lg > .input-group-prepend > select.btn:not([size]):not([multiple]), .input-group-lg > .input-group-append > select.btn:not([size]):not([multiple]) { - height: calc(2.64063rem + 2px); } + height: calc(2.64062rem + 2px); } .form-group { margin-bottom: 1rem; } @@ -2060,7 +2051,7 @@ fieldset:disabled a.btn { .btn-sm, .btn-group-sm > .btn { padding: 0.25rem 0.5rem; - font-size: 0.76563rem; + font-size: 0.76562rem; line-height: 1.5; border-radius: 0.2rem; } @@ -2260,7 +2251,7 @@ input[type="button"].btn-block { display: block; padding: 0 1.5rem; margin-bottom: 0; - font-size: 0.76563rem; + font-size: 0.76562rem; color: #73818f; white-space: nowrap; } @@ -2380,10 +2371,6 @@ input[type="button"].btn-block { flex: 1 1 auto; width: 1%; margin-bottom: 0; } - .input-group > .form-control:focus, - .input-group > .custom-select:focus, - .input-group > .custom-file:focus { - z-index: 3; } .input-group > .form-control + .form-control, .input-group > .form-control + .custom-select, .input-group > .form-control + .custom-file, @@ -2394,6 +2381,10 @@ input[type="button"].btn-block { .input-group > .custom-file + .custom-select, .input-group > .custom-file + .custom-file { margin-left: -1px; } + .input-group > .form-control:focus, + .input-group > .custom-select:focus, + .input-group > .custom-file .custom-file-input:focus ~ .custom-file-label { + z-index: 3; } .input-group > .form-control:not(:last-child), .input-group > .custom-select:not(:last-child) { border-top-right-radius: 0; @@ -2574,7 +2565,7 @@ input[type="button"].btn-block { .custom-select:focus { border-color: #8ad4ee; outline: 0; - box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.075), 0 0 5px rgba(138, 212, 238, 0.5); } + box-shadow: 0 0 0 0.2rem rgba(138, 212, 238, 0.5); } .custom-select:focus::-ms-value { color: #5c6873; background-color: #fff; } @@ -2595,7 +2586,7 @@ input[type="button"].btn-block { font-size: 75%; } .custom-select-lg { - height: calc(2.64063rem + 2px); + height: calc(2.64062rem + 2px); padding-top: 0.375rem; padding-bottom: 0.375rem; font-size: 125%; } @@ -2619,6 +2610,8 @@ input[type="button"].btn-block { box-shadow: 0 0 0 0.2rem rgba(32, 168, 216, 0.25); } .custom-file-input:focus ~ .custom-file-label::after { border-color: #8ad4ee; } + .custom-file-input:disabled ~ .custom-file-label { + background-color: #e4e7ea; } .custom-file-input:lang(en) ~ .custom-file-label::after { content: "Browse"; } @@ -2667,7 +2660,11 @@ input[type="button"].btn-block { background-color: #20a8d8; border: 0; border-radius: 1rem; + transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; appearance: none; } + @media screen and (prefers-reduced-motion: reduce) { + .custom-range::-webkit-slider-thumb { + transition: none; } } .custom-range::-webkit-slider-thumb:focus { outline: none; box-shadow: 0 0 0 1px #e4e5e6, 0 0 0 0.2rem rgba(32, 168, 216, 0.25); } @@ -2687,7 +2684,11 @@ input[type="button"].btn-block { background-color: #20a8d8; border: 0; border-radius: 1rem; + transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; appearance: none; } + @media screen and (prefers-reduced-motion: reduce) { + .custom-range::-moz-range-thumb { + transition: none; } } .custom-range::-moz-range-thumb:focus { outline: none; box-shadow: 0 0 0 1px #e4e5e6, 0 0 0 0.2rem rgba(32, 168, 216, 0.25); } @@ -2707,7 +2708,11 @@ input[type="button"].btn-block { background-color: #20a8d8; border: 0; border-radius: 1rem; + transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; appearance: none; } + @media screen and (prefers-reduced-motion: reduce) { + .custom-range::-ms-thumb { + transition: none; } } .custom-range::-ms-thumb:focus { outline: none; box-shadow: 0 0 0 1px #e4e5e6, 0 0 0 0.2rem rgba(32, 168, 216, 0.25); } @@ -2729,6 +2734,16 @@ input[type="button"].btn-block { background-color: #c8ced3; border-radius: 1rem; } +.custom-control-label::before, +.custom-file-label, +.custom-select { + transition: background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out; } + @media screen and (prefers-reduced-motion: reduce) { + .custom-control-label::before, + .custom-file-label, + .custom-select { + transition: none; } } + .nav { display: flex; flex-wrap: wrap; @@ -3328,7 +3343,7 @@ input[type="button"].btn-block { .pagination-sm .page-link { padding: 0.25rem 0.5rem; - font-size: 0.76563rem; + font-size: 0.76562rem; line-height: 1.5; } .pagination-sm .page-item:first-child .page-link { @@ -3725,12 +3740,12 @@ input[type="button"].btn-block { color: #000; text-shadow: 0 1px 0 #fff; opacity: .5; } - .close:hover, .close:focus { - color: #000; - text-decoration: none; - opacity: .75; } .close:not(:disabled):not(.disabled) { cursor: pointer; } + .close:not(:disabled):not(.disabled):hover, .close:not(:disabled):not(.disabled):focus { + color: #000; + text-decoration: none; + opacity: .75; } button.close { padding: 0; @@ -3870,7 +3885,7 @@ button.close { word-spacing: normal; white-space: normal; line-break: auto; - font-size: 0.76563rem; + font-size: 0.76562rem; word-wrap: break-word; opacity: 0; } .tooltip.show { @@ -3955,7 +3970,7 @@ button.close { word-spacing: normal; white-space: normal; line-break: auto; - font-size: 0.76563rem; + font-size: 0.76562rem; word-wrap: break-word; background-color: #fff; background-clip: padding-box; @@ -4086,17 +4101,19 @@ button.close { display: none; align-items: center; width: 100%; - transition: transform 0.6s ease; backface-visibility: hidden; perspective: 1000px; } - @media screen and (prefers-reduced-motion: reduce) { - .carousel-item { - transition: none; } } .carousel-item.active, .carousel-item-next, .carousel-item-prev { - display: block; } + display: block; + transition: transform 0.6s ease; } + @media screen and (prefers-reduced-motion: reduce) { + .carousel-item.active, + .carousel-item-next, + .carousel-item-prev { + transition: none; } } .carousel-item-next, .carousel-item-prev { @@ -6609,9 +6626,9 @@ a.text-dark:hover, a.text-dark:focus { .btn-brand i + span { margin-left: 1.5rem; } .btn-brand.btn-lg i, .btn-group-lg > .btn-brand.btn i { - width: 2.64063rem; + width: 2.64062rem; margin: -0.5rem -1rem; - line-height: 2.64063rem; + line-height: 2.64062rem; border-radius: 0.3rem; } .btn-brand.btn-lg i + span, .btn-group-lg > .btn-brand.btn i + span { margin-left: 2rem; } @@ -7663,12 +7680,12 @@ canvas { .chartjs-tooltip .tooltip-header { margin-bottom: 0.5rem; } .chartjs-tooltip .tooltip-header-item { - font-size: 0.76563rem; + font-size: 0.76562rem; font-weight: 700; } .chartjs-tooltip .tooltip-body-item { display: flex; align-items: center; - font-size: 0.76563rem; + font-size: 0.76562rem; white-space: nowrap; } .chartjs-tooltip .tooltip-body-item-color { display: inline-block; @@ -8003,7 +8020,7 @@ canvas { font-size: 1.09375rem; } .progress-group-text { - font-size: 0.76563rem; + font-size: 0.76562rem; color: #73818f; } .progress-group-header { @@ -9618,86 +9635,6 @@ 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; } - -a.bg-gray-100:hover, a.bg-gray-100:focus, -button.bg-gray-100:hover, -button.bg-gray-100:focus { - background-color: #d1dbe1 !important; } - -.bg-gray-200 { - background-color: #e4e7ea !important; } - -a.bg-gray-200:hover, a.bg-gray-200:focus, -button.bg-gray-200:hover, -button.bg-gray-200:focus { - background-color: #c7ced4 !important; } - -.bg-gray-300 { - background-color: #c8ced3 !important; } - -a.bg-gray-300:hover, a.bg-gray-300:focus, -button.bg-gray-300:hover, -button.bg-gray-300:focus { - background-color: #acb5bc !important; } - -.bg-gray-400 { - background-color: #acb4bc !important; } - -a.bg-gray-400:hover, a.bg-gray-400:focus, -button.bg-gray-400:hover, -button.bg-gray-400:focus { - background-color: #909ba5 !important; } - -.bg-gray-500 { - background-color: #8f9ba6 !important; } - -a.bg-gray-500:hover, a.bg-gray-500:focus, -button.bg-gray-500:hover, -button.bg-gray-500:focus { - background-color: #73828f !important; } - -.bg-gray-600 { - background-color: #73818f !important; } - -a.bg-gray-600:hover, a.bg-gray-600:focus, -button.bg-gray-600:hover, -button.bg-gray-600:focus { - background-color: #5c6873 !important; } - -.bg-gray-700 { - background-color: #5c6873 !important; } - -a.bg-gray-700:hover, a.bg-gray-700:focus, -button.bg-gray-700:hover, -button.bg-gray-700:focus { - background-color: #454e57 !important; } - -.bg-gray-800 { - background-color: #2f353a !important; } - -a.bg-gray-800:hover, a.bg-gray-800:focus, -button.bg-gray-800:hover, -button.bg-gray-800:focus { - background-color: #181b1e !important; } - -.bg-gray-900 { - background-color: #23282c !important; } - -a.bg-gray-900:hover, a.bg-gray-900:focus, -button.bg-gray-900:hover, -button.bg-gray-900:focus { - background-color: #0c0e10 !important; } - .bg-gray-100 { background-color: #f0f3f5 !important; } @@ -9912,16 +9849,6 @@ body { white: #fff; gray: #73818f; gray-dark: #2f353a; - light-blue: #63c2de; - gray-100: #f0f3f5; - gray-200: #e4e7ea; - gray-300: #c8ced3; - gray-400: #acb4bc; - gray-500: #8f9ba6; - gray-600: #73818f; - gray-700: #5c6873; - gray-800: #2f353a; - gray-900: #23282c; primary: #20a8d8; secondary: #c8ced3; success: #4dbd74; diff --git a/src/scss/vendors/_variables.scss b/src/scss/vendors/_variables.scss index d488571..14c6d7f 100644 --- a/src/scss/vendors/_variables.scss +++ b/src/scss/vendors/_variables.scss @@ -1,7 +1,4 @@ // Override Boostrap variables @import "../variables"; -@import "node_modules/@coreui/coreui/scss/bootstrap-variables"; @import "node_modules/bootstrap/scss/mixins"; -@import "node_modules/bootstrap/scss/functions"; -@import "node_modules/bootstrap/scss/variables"; @import "node_modules/@coreui/coreui/scss/variables";