rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-17 14:54:30 +01:00
Code Issues Actions Packages Releases Activity

Minor Sass cleanup and consistency changes. (#23959)

Browse Source
This commit is contained in:
XhmikosR 2017-09-17 08:18:24 +03:00 committed by GitHub
parent 0705ee8070
commit 5cec8e0de6
6 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scss/_navbar.scss
View File

@ -147,8 +147,7 @@
} }
@include media-breakpoint-up($next) { @include media-breakpoint-up($next) {
flex-direction: row; flex-flow: row nowrap;
flex-wrap: nowrap;
justify-content: flex-start; justify-content: flex-start;
.navbar-nav { .navbar-nav {

2
scss/mixins/_grid-framework.scss
View File

@ -56,7 +56,7 @@
@for $i from 0 through ($columns - 1) { @for $i from 0 through ($columns - 1) {
@if not ($infix == "" and $i == 0) { // Avoid emitting useless .offset-0 @if not ($infix == "" and $i == 0) { // Avoid emitting useless .offset-0
.offset#{$infix}-#{$i} { .offset#{$infix}-#{$i} {
@include make-col-offset($i, $columns) @include make-col-offset($i, $columns);
} }
} }
} }

22
scss/mixins/_hover.scss
View File

@ -9,7 +9,7 @@
// } // }
// @else { // @else {
// scss-lint:disable Indentation // scss-lint:disable Indentation
&:hover { @content } &:hover { @content; }
// scss-lint:enable Indentation // scss-lint:enable Indentation
// } // }
} }
@ -17,12 +17,14 @@
@mixin hover-focus { @mixin hover-focus {
@if $enable-hover-media-query { @if $enable-hover-media-query {
&:focus { @content } &:focus {
@include hover { @content } @content;
}
@include hover { @content; }
} @else { } @else {
&:focus, &:focus,
&:hover { &:hover {
@content @content;
} }
} }
} }
@ -31,14 +33,14 @@
@if $enable-hover-media-query { @if $enable-hover-media-query {
&, &,
&:focus { &:focus {
@content @content;
} }
@include hover { @content } @include hover { @content; }
} @else { } @else {
&, &,
&:focus, &:focus,
&:hover { &:hover {
@content @content;
} }
} }
} }
@ -47,14 +49,14 @@
@if $enable-hover-media-query { @if $enable-hover-media-query {
&:focus, &:focus,
&:active { &:active {
@content @content;
} }
@include hover { @content } @include hover { @content; }
} @else { } @else {
&:focus, &:focus,
&:active, &:active,
&:hover { &:hover {
@content @content;
} }
} }
} }

9
scss/utilities/_background.scss
View File

@ -2,5 +2,10 @@
@include bg-variant('.bg-#{$color}', $value); @include bg-variant('.bg-#{$color}', $value);
} }
.bg-white { background-color: $white !important; } .bg-white {
.bg-transparent { background-color: transparent !important; } background-color: $white !important;
}
.bg-transparent {
background-color: transparent !important;
}