Skip to content
Permalink
Browse files

Merge pull request #2141 from REJack/v3-dev

last fixes before releasing v3.0.0-beta.1
  • Loading branch information...
REJack committed Jun 24, 2019
2 parents 01e6030 + d31d3f0 commit 14da827d371ed40ffe46312c25431e99e6adc674
@@ -101,7 +101,7 @@ $yiq-text-light: $white !default;
$enable-caret: true !default;
$enable-rounded: true !default;
$enable-shadows: true !default;
$enable-gradients: true !default;
$enable-gradients: false !default;
$enable-transitions: true !default;
$enable-hover-media-query: false !default; // Deprecated, no longer affects any compiled CSS
$enable-grid-classes: true !default;
@@ -89,3 +89,4 @@
font-weight: 400;
}
}

@@ -235,20 +235,20 @@ textarea.form-control {
@each $name, $color in $theme-colors {
&.custom-switch-off-#{$name} {
& .custom-control-input ~ .custom-control-label::before {
background-color: #{$color};
background: #{$color};
border-color: darken($color, 20%);
}
& .custom-control-input ~ .custom-control-label::after {
background-color: darken($color, 25%);
background: darken($color, 25%);
}
}
&.custom-switch-on-#{$name} {
& .custom-control-input:checked ~ .custom-control-label::before {
background-color: #{$color};
background: #{$color};
border-color: darken($color, 20%);
}
& .custom-control-input:checked ~ .custom-control-label::after {
background-color: lighten($color, 30%);
background: lighten($color, 30%);
}
}
}
@@ -257,20 +257,20 @@ textarea.form-control {
@each $name, $color in $colors {
&.custom-switch-off-#{$name} {
& .custom-control-input ~ .custom-control-label::before {
background-color: #{$color};
background: #{$color};
border-color: darken($color, 20%);
}
& .custom-control-input ~ .custom-control-label::after {
background-color: darken($color, 25%);
background: darken($color, 25%);
}
}
&.custom-switch-on-#{$name} {
& .custom-control-input:checked ~ .custom-control-label::before {
background-color: #{$color};
background: #{$color};
border-color: darken($color, 20%);
}
& .custom-control-input:checked ~ .custom-control-label::after {
background-color: lighten($color, 30%);
background: lighten($color, 30%);
}
}
}
@@ -61,7 +61,7 @@

@each $name, $color in $theme-colors {
.info-box.bg-#{$name},
.info-box.bg-#{$name}-gradient {
.info-box.bg-gradient-#{$name} {
color: color-yiq($color);

.progress-bar {
@@ -155,28 +155,30 @@ body,

&.sidebar-collapse {
.brand-link {
$local-sidebar-transition: width $transition-speed $transition-fn;
@include transition($local-sidebar-transition);
transition: width $transition-speed $transition-fn;
width: $sidebar-mini-width;
height: 57px;
}

.main-sidebar:hover {
.brand-link {
transition: width $transition-speed $transition-fn;
width: $sidebar-width;
}
}
}


.sidebar {
margin-top: 57px;
}

.brand-link {

transition: width $transition-speed $transition-fn;
position: fixed;
overflow: hidden;
top: 0;
z-index: $zindex-main-sidebar;
z-index: $zindex-main-sidebar + 1;
width: $sidebar-width;
}

@@ -130,8 +130,8 @@
}

&.nav-child-indent
.nav-treeview > .nav-item > .nav-link {
padding: 0.5rem 0.5rem 0.5rem 1.5rem;
.nav-treeview{
padding-left: 1rem;
}
}

@@ -72,17 +72,63 @@ a.text-muted:hover {

// Gradient Background colors (theme colors)
@each $name, $color in $theme-colors {
.bg-#{$name}-gradient {
@include gradient-bg($color);
.bg-gradient-#{$name} {
@include bg-gradient-variant('&', $color);
color: color-yiq($color);

&.btn {
&.disabled,
&:disabled,
&:not(:disabled):not(.disabled):active,
&:not(:disabled):not(.disabled).active,
.show > &.dropdown-toggle {
background-image: none !important;
}

&:hover {
color: color-yiq(darken($color, 7.5%));
@include bg-gradient-variant('&', darken($color, 7.5%));
border-color: darken($color, 10%);
}

&:active,
&.active {
color: color-yiq(darken($color, 10%));
@include bg-gradient-variant('&', darken($color, 10%));
border-color: darken($color, 12.5%);
}
}
}
}

// Gradient Background colors (colors)
@each $name, $color in $colors {
.bg-#{$name}-gradient {
@include gradient-bg($color);
.bg-gradient-#{$name} {
@include bg-gradient-variant('&', $color);
color: color-yiq($color);

&.btn {
&.disabled,
&:disabled,
&:not(:disabled):not(.disabled):active,
&:not(:disabled):not(.disabled).active,
.show > &.dropdown-toggle {
background-image: none !important;
}

&:hover {
color: color-yiq(darken($color, 7.5%));
@include bg-gradient-variant('&', darken($color, 7.5%));
border-color: darken($color, 10%);
}

&:active,
&.active {
color: color-yiq(darken($color, 10%));
@include bg-gradient-variant('&', darken($color, 10%));
border-color: darken($color, 12.5%);
}
}
}
}

0 comments on commit 14da827

Please sign in to comment.
You can’t perform that action at this time.