Skip to content

Commit 14da827

Browse files
REJackREJack
authored
Merge pull request #2141 from REJack/v3-dev
last fixes before releasing v3.0.0-beta.1
2 parents 01e6030 + d31d3f0 commit 14da827

File tree

14 files changed

+950
-279
lines changed

14 files changed

+950
-279
lines changed

‎build/scss/_bootstrap-variables.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ $yiq-text-light: $white !default;
101101
$enable-caret: true !default;
102102
$enable-rounded: true !default;
103103
$enable-shadows: true !default;
104-
$enable-gradients: true !default;
104+
$enable-gradients: false !default;
105105
$enable-transitions: true !default;
106106
$enable-hover-media-query: false !default; // Deprecated, no longer affects any compiled CSS
107107
$enable-grid-classes: true !default;

‎build/scss/_buttons.scss‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,3 +89,4 @@
8989
font-weight: 400;
9090
}
9191
}
92+

‎build/scss/_forms.scss‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -235,20 +235,20 @@ textarea.form-control {
235235
@each $name, $color in $theme-colors {
236236
&.custom-switch-off-#{$name} {
237237
& .custom-control-input ~ .custom-control-label::before {
238-
background-color: #{$color};
238+
background: #{$color};
239239
border-color: darken($color, 20%);
240240
}
241241
& .custom-control-input ~ .custom-control-label::after {
242-
background-color: darken($color, 25%);
242+
background: darken($color, 25%);
243243
}
244244
}
245245
&.custom-switch-on-#{$name} {
246246
& .custom-control-input:checked ~ .custom-control-label::before {
247-
background-color: #{$color};
247+
background: #{$color};
248248
border-color: darken($color, 20%);
249249
}
250250
& .custom-control-input:checked ~ .custom-control-label::after {
251-
background-color: lighten($color, 30%);
251+
background: lighten($color, 30%);
252252
}
253253
}
254254
}
@@ -257,20 +257,20 @@ textarea.form-control {
257257
@each $name, $color in $colors {
258258
&.custom-switch-off-#{$name} {
259259
& .custom-control-input ~ .custom-control-label::before {
260-
background-color: #{$color};
260+
background: #{$color};
261261
border-color: darken($color, 20%);
262262
}
263263
& .custom-control-input ~ .custom-control-label::after {
264-
background-color: darken($color, 25%);
264+
background: darken($color, 25%);
265265
}
266266
}
267267
&.custom-switch-on-#{$name} {
268268
& .custom-control-input:checked ~ .custom-control-label::before {
269-
background-color: #{$color};
269+
background: #{$color};
270270
border-color: darken($color, 20%);
271271
}
272272
& .custom-control-input:checked ~ .custom-control-label::after {
273-
background-color: lighten($color, 30%);
273+
background: lighten($color, 30%);
274274
}
275275
}
276276
}

‎build/scss/_info-box.scss‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161

6262
@each $name, $color in $theme-colors {
6363
.info-box.bg-#{$name},
64-
.info-box.bg-#{$name}-gradient {
64+
.info-box.bg-gradient-#{$name} {
6565
color: color-yiq($color);
6666

6767
.progress-bar {

‎build/scss/_layout.scss‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,28 +155,30 @@ body,
155155

156156
&.sidebar-collapse {
157157
.brand-link {
158-
$local-sidebar-transition: width $transition-speed $transition-fn;
159-
@include transition($local-sidebar-transition);
158+
transition: width $transition-speed $transition-fn;
160159
width: $sidebar-mini-width;
161160
height: 57px;
162161
}
163162

164163
.main-sidebar:hover {
165164
.brand-link {
165+
transition: width $transition-speed $transition-fn;
166166
width: $sidebar-width;
167167
}
168168
}
169169
}
170170

171+
171172
.sidebar {
172173
margin-top: 57px;
173174
}
174175

175176
.brand-link {
176-
177+
transition: width $transition-speed $transition-fn;
177178
position: fixed;
179+
overflow: hidden;
178180
top: 0;
179-
z-index: $zindex-main-sidebar;
181+
z-index: $zindex-main-sidebar + 1;
180182
width: $sidebar-width;
181183
}
182184

‎build/scss/_main-sidebar.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@
130130
}
131131

132132
&.nav-child-indent { 
133-
.nav-treeview > .nav-item > .nav-link {
134-
padding: 0.5rem 0.5rem 0.5rem 1.5rem;
133+
.nav-treeview{
134+
padding-left: 1rem;
135135
}
136136
}
137137

‎build/scss/_miscellaneous.scss‎

Lines changed: 50 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,17 +72,63 @@ a.text-muted:hover {
7272

7373
// Gradient Background colors (theme colors)
7474
@each $name, $color in $theme-colors {
75-
.bg-#{$name}-gradient {
76-
@include gradient-bg($color);
75+
.bg-gradient-#{$name} {
76+
@include bg-gradient-variant('&', $color);
7777
color: color-yiq($color);
78+
79+
&.btn {
80+
&.disabled,
81+
&:disabled,
82+
&:not(:disabled):not(.disabled):active,
83+
&:not(:disabled):not(.disabled).active,
84+
.show > &.dropdown-toggle {
85+
background-image: none !important;
86+
}
87+
88+
&:hover {
89+
color: color-yiq(darken($color, 7.5%));
90+
@include bg-gradient-variant('&', darken($color, 7.5%));
91+
border-color: darken($color, 10%);
92+
}
93+
94+
&:active,
95+
&.active {
96+
color: color-yiq(darken($color, 10%));
97+
@include bg-gradient-variant('&', darken($color, 10%));
98+
border-color: darken($color, 12.5%);
99+
}
100+
}
78101
}
79102
}
80103

81104
// Gradient Background colors (colors)
82105
@each $name, $color in $colors {
83-
.bg-#{$name}-gradient {
84-
@include gradient-bg($color);
106+
.bg-gradient-#{$name} {
107+
@include bg-gradient-variant('&', $color);
85108
color: color-yiq($color);
109+
110+
&.btn {
111+
&.disabled,
112+
&:disabled,
113+
&:not(:disabled):not(.disabled):active,
114+
&:not(:disabled):not(.disabled).active,
115+
.show > &.dropdown-toggle {
116+
background-image: none !important;
117+
}
118+
119+
&:hover {
120+
color: color-yiq(darken($color, 7.5%));
121+
@include bg-gradient-variant('&', darken($color, 7.5%));
122+
border-color: darken($color, 10%);
123+
}
124+
125+
&:active,
126+
&.active {
127+
color: color-yiq(darken($color, 10%));
128+
@include bg-gradient-variant('&', darken($color, 10%));
129+
border-color: darken($color, 12.5%);
130+
}
131+
}
86132
}
87133
}
88134

0 commit comments

Comments
 (0)