github
/
AdminLTE
mirror of https://github.com/ColorlibHQ/AdminLTE
1
0
Fork 0
Code Issues Releases Wiki Activity

fix new eslint errors since v7.10.0 (#3064)

pull/3057/head
REJack 2020-09-28 08:25:39 +02:00 committed by GitHub
parent e00dce43d9
commit 88b30801f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/scss/_cards.scss
View File

@ -91,7 +91,7 @@
&.card-tabs { &.card-tabs {
&:not(.card-outline) { &:not(.card-outline) {
& > .card-header { > .card-header {
border-bottom: 0; border-bottom: 0;
.nav-item { .nav-item {

4
build/scss/_dropdown.scss
View File

@ -57,14 +57,14 @@
.dropdown-submenu { .dropdown-submenu {
position: relative; position: relative;
& > a::after { > a::after {
@include caret-right (); @include caret-right ();
float: right; float: right;
margin-left: .5rem; margin-left: .5rem;
margin-top: .5rem; margin-top: .5rem;
} }
& > .dropdown-menu { > .dropdown-menu {
left: 100%; left: 100%;
margin-left: 0; margin-left: 0;
margin-top: 0; margin-top: 0;

14
build/scss/_layout.scss
View File

@ -15,7 +15,7 @@ body,
.wrapper { .wrapper {
position: relative; position: relative;
& .content-wrapper { .content-wrapper {
min-height: calc(100vh - #{$main-header-height} - #{$main-footer-height}); min-height: calc(100vh - #{$main-header-height} - #{$main-footer-height});
} }
@ -28,7 +28,7 @@ body,
max-width: $boxed-layout-max-width; max-width: $boxed-layout-max-width;
} }
& .main-sidebar { .main-sidebar {
left: inherit; left: inherit;
} }
} }
@ -407,14 +407,14 @@ body,
} }
} }
& .main-sidebar { .main-sidebar {
bottom: inherit; bottom: inherit;
height: inherit; height: inherit;
} }
& .content-wrapper, .content-wrapper,
& .main-header, .main-header,
& .main-footer { .main-footer {
margin-left: 0; margin-left: 0;
} }
} }
@ -632,7 +632,7 @@ body:not(.sidebar-mini-md) {
.breadcrumb-item { .breadcrumb-item {
&.active, &.active,
& + .breadcrumb-item::before { + .breadcrumb-item::before {
color: $gray-500; color: $gray-500;
} }
} }

6
build/scss/_main-header.scss
View File

@ -75,7 +75,7 @@
.form-control-navbar { .form-control-navbar {
border-right-width: 0; border-right-width: 0;
& + .input-group-append { + .input-group-append {
margin-left: 0; margin-left: 0;
} }
} }
@ -103,7 +103,7 @@
&:focus { &:focus {
&, &,
& + .input-group-append .btn-navbar { + .input-group-append .btn-navbar {
background-color: $main-header-dark-form-control-focused-bg; background-color: $main-header-dark-form-control-focused-bg;
border: $main-header-dark-form-control-focused-border !important; border: $main-header-dark-form-control-focused-border !important;
color: $main-header-dark-form-control-focused-color; color: $main-header-dark-form-control-focused-color;
@ -130,7 +130,7 @@
&:focus { &:focus {
&, &,
& + .input-group-append .btn-navbar { + .input-group-append .btn-navbar {
background-color: $main-header-light-form-control-focused-bg; background-color: $main-header-light-form-control-focused-bg;
border: $main-header-light-form-control-focused-border !important; border: $main-header-light-form-control-focused-border !important;
color: $main-header-light-form-control-focused-color; color: $main-header-light-form-control-focused-color;

2
build/scss/_main-sidebar.scss
View File

@ -385,7 +385,7 @@
// Hover and active states // Hover and active states
&.menu-open > .nav-link, &.menu-open > .nav-link,
&:hover > .nav-link, &:hover > .nav-link,
& > .nav-link:focus { > .nav-link:focus {
background-color: $sidebar-dark-hover-bg; background-color: $sidebar-dark-hover-bg;
color: $sidebar-dark-hover-color; color: $sidebar-dark-hover-color;
} }

12
build/scss/mixins/_custom-forms.scss
View File

@ -5,31 +5,31 @@
// Custom Switch Variant // Custom Switch Variant
@mixin custom-switch-variant($name, $color) { @mixin custom-switch-variant($name, $color) {
&.custom-switch-off-#{$name} { &.custom-switch-off-#{$name} {
& .custom-control-input ~ .custom-control-label::before { .custom-control-input ~ .custom-control-label::before {
background-color: #{$color}; background-color: #{$color};
border-color: darken($color, 20%); border-color: darken($color, 20%);
} }
& .custom-control-input:focus ~ .custom-control-label::before { .custom-control-input:focus ~ .custom-control-label::before {
box-shadow: 0 0 0 1px $body-bg, 0 0 0 2px rgba($color, .25); box-shadow: 0 0 0 1px $body-bg, 0 0 0 2px rgba($color, .25);
} }
& .custom-control-input ~ .custom-control-label::after { .custom-control-input ~ .custom-control-label::after {
background-color: darken($color, 25%); background-color: darken($color, 25%);
} }
} }
&.custom-switch-on-#{$name} { &.custom-switch-on-#{$name} {
& .custom-control-input:checked ~ .custom-control-label::before { .custom-control-input:checked ~ .custom-control-label::before {
background-color: #{$color}; background-color: #{$color};
border-color: darken($color, 20%); border-color: darken($color, 20%);
} }
& .custom-control-input:checked:focus ~ .custom-control-label::before { .custom-control-input:checked:focus ~ .custom-control-label::before {
box-shadow: 0 0 0 1px $body-bg, 0 0 0 2px rgba($color, .25); box-shadow: 0 0 0 1px $body-bg, 0 0 0 2px rgba($color, .25);
} }
& .custom-control-input:checked ~ .custom-control-label::after { .custom-control-input:checked ~ .custom-control-label::after {
background-color: lighten($color, 30%); background-color: lighten($color, 30%);
} }
} }

4
build/scss/mixins/_sidebar.scss
View File

@ -5,14 +5,14 @@
// Sidebar Color // Sidebar Color
@mixin sidebar-color($color) { @mixin sidebar-color($color) {
.nav-sidebar > .nav-item { .nav-sidebar > .nav-item {
& > .nav-link.active { > .nav-link.active {
background-color: $color; background-color: $color;
color: color-yiq($color); color: color-yiq($color);
} }
} }
.nav-sidebar.nav-legacy > .nav-item { .nav-sidebar.nav-legacy > .nav-item {
& > .nav-link.active { > .nav-link.active {
border-color: $color; border-color: $color;
} }
} }

10
build/scss/pages/_login_and_register.scss
View File

@ -52,8 +52,8 @@
&:focus { &:focus {
box-shadow: none; box-shadow: none;
& ~ .input-group-prepend .input-group-text, ~ .input-group-prepend .input-group-text,
& ~ .input-group-append .input-group-text { ~ .input-group-append .input-group-text {
border-color: $input-focus-border-color; border-color: $input-focus-border-color;
} }
} }
@ -63,8 +63,8 @@
box-shadow: none; box-shadow: none;
} }
& ~ .input-group-prepend .input-group-text, ~ .input-group-prepend .input-group-text,
& ~ .input-group-append .input-group-text { ~ .input-group-append .input-group-text {
border-color: $success; border-color: $success;
} }
} }
@ -74,7 +74,7 @@
box-shadow: none; box-shadow: none;
} }
& ~ .input-group-append .input-group-text { ~ .input-group-append .input-group-text {
border-color: $danger; border-color: $danger;
} }
} }