From: Starsam80 Date: Mon, 28 Nov 2016 06:23:12 +0000 (-0700) Subject: Rename `.navbar-toggleable-xs` to `.navbar-toggleable` + more cleanup (#21226) X-Git-Tag: v4.0.0-alpha.6~381^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54908a95a87b592d81df3231823979c75917d57a;p=thirdparty%2Fbootstrap.git Rename `.navbar-toggleable-xs` to `.navbar-toggleable` + more cleanup (#21226) * Clean up some utilities - Align CSS properties - In `_spacing.scss`, we had a comment saying what 'a' was for, but we removed that so this comment no longer applies * Remove '-xs' from `.navbar-toggleable-xs` and remove duplication * Fix outdated classes to use newer ones --- diff --git a/docs/_includes/nav-home.html b/docs/_includes/nav-home.html index 6dd3723f65..8ba41c7b42 100644 --- a/docs/_includes/nav-home.html +++ b/docs/_includes/nav-home.html @@ -1,7 +1,7 @@

{% comment %} -

Bootstrap diff --git a/docs/examples/album/index.html b/docs/examples/album/index.html index 1926dabf93..ecfa63befc 100644 --- a/docs/examples/album/index.html +++ b/docs/examples/album/index.html @@ -103,7 +103,7 @@
-
+
Back to top

Album example is © Bootstrap, but please download and customize it for yourself!
diff --git a/docs/examples/carousel/index.html b/docs/examples/carousel/index.html index aec1d0dfd1..990553b97a 100644 --- a/docs/examples/carousel/index.html +++ b/docs/examples/carousel/index.html @@ -164,7 +164,7 @@
-
Back to top
+
Back to top

© 2014 Company, Inc. · Privacy · Terms

diff --git a/docs/examples/narrow-jumbotron/index.html b/docs/examples/narrow-jumbotron/index.html index 3d96259e0b..e27aca212d 100644 --- a/docs/examples/narrow-jumbotron/index.html +++ b/docs/examples/narrow-jumbotron/index.html @@ -23,7 +23,7 @@
-
+

Home (current)
diff --git a/docs/examples/navbar/index.html b/docs/examples/navbar/index.html index f04d187487..3d35b7904f 100644 --- a/docs/examples/navbar/index.html +++ b/docs/examples/navbar/index.html @@ -23,7 +23,7 @@

-
+
Navbar

@@ -39,7 +39,7 @@ About

-
+
diff --git a/docs/examples/offcanvas/index.html b/docs/examples/offcanvas/index.html index cf59f4722d..f43e0e5d5e 100644 --- a/docs/examples/offcanvas/index.html +++ b/docs/examples/offcanvas/index.html @@ -35,7 +35,7 @@

-
+

diff --git a/docs/examples/sticky-footer-navbar/index.html b/docs/examples/sticky-footer-navbar/index.html index 855f0418d6..77242a6f64 100644 --- a/docs/examples/sticky-footer-navbar/index.html +++ b/docs/examples/sticky-footer-navbar/index.html @@ -31,7 +31,7 @@

-
+
Sticky footer

diff --git a/docs/examples/tooltip-viewport/index.html b/docs/examples/tooltip-viewport/index.html index ee990b9756..2ca1ed2b08 100644 --- a/docs/examples/tooltip-viewport/index.html +++ b/docs/examples/tooltip-viewport/index.html @@ -20,7 +20,7 @@ - + @@ -30,7 +30,7 @@ - +
diff --git a/scss/_navbar.scss b/scss/_navbar.scss index ebf27af8b2..c6cc4e2fec 100644 --- a/scss/_navbar.scss +++ b/scss/_navbar.scss @@ -128,42 +128,6 @@ } } -// scss-lint:disable ImportantRule -.navbar-toggleable { - @each $breakpoint in map-keys($grid-breakpoints) { - $next: breakpoint-next($breakpoint, $grid-breakpoints); - - &-#{$breakpoint} { - @include clearfix; - - @include media-breakpoint-down($breakpoint) { - .navbar-brand { - display: block; - float: none; - margin-top: .5rem; - margin-right: 0; - } - - .navbar-nav { - margin-top: .5rem; - margin-bottom: .5rem; - - .dropdown-menu { - position: static; - float: none; - } - } - } - - @include media-breakpoint-up($next) { - display: block; - } - } - } -} -// scss-lint:enable ImportantRule - - // Navigation // // Custom navbar navigation built on the base `.nav` styles. @@ -284,48 +248,48 @@ } } - // Navbar toggleable // // Custom override for collapse plugin in navbar. +// Placed at the end of the file so it can override some CSS properties +// scss-lint:disable ImportantRule .navbar-toggleable { - &-xs { - @include clearfix; - @include media-breakpoint-down(xs) { - .navbar-nav .nav-item { - float: none; - margin-left: 0; - } - } - @include media-breakpoint-up(sm) { - display: block !important; - } - } + @each $breakpoint in map-keys($grid-breakpoints) { + $next: breakpoint-next($breakpoint, $grid-breakpoints); + + // Get rid of the 'xs' prefix while reducing duplication + #{if(breakpoint-min($breakpoint, $grid-breakpoints), "&-#{$breakpoint}", "&")} { + @include clearfix; - &-sm { - @include clearfix; - @include media-breakpoint-down(sm) { - .navbar-nav .nav-item { - float: none; - margin-left: 0; + @include media-breakpoint-down($breakpoint) { + .navbar-brand { + display: block; + float: none; + margin-top: .5rem; + margin-right: 0; + } + + .navbar-nav { + margin-top: .5rem; + margin-bottom: .5rem; + + .dropdown-menu { + position: static; + float: none; + } + + .nav-item { + float: none; + margin-left: 0; + } + } } - } - @include media-breakpoint-up(md) { - display: block !important; - } - } - &-md { - @include clearfix; - @include media-breakpoint-down(md) { - .navbar-nav .nav-item { - float: none; - margin-left: 0; + @include media-breakpoint-up($next) { + display: block !important; } } - @include media-breakpoint-up(lg) { - display: block !important; - } } } +// scss-lint:enable ImportantRule diff --git a/scss/utilities/_align.scss b/scss/utilities/_align.scss index 4886e059fe..4dbbbc2dbc 100644 --- a/scss/utilities/_align.scss +++ b/scss/utilities/_align.scss @@ -1,6 +1,6 @@ -.align-baseline { vertical-align: baseline !important; } // Browser default -.align-top { vertical-align: top !important; } -.align-middle { vertical-align: middle !important; } -.align-bottom { vertical-align: bottom !important; } +.align-baseline { vertical-align: baseline !important; } // Browser default +.align-top { vertical-align: top !important; } +.align-middle { vertical-align: middle !important; } +.align-bottom { vertical-align: bottom !important; } .align-text-bottom { vertical-align: text-bottom !important; } -.align-text-top { vertical-align: text-top !important; } +.align-text-top { vertical-align: text-top !important; } diff --git a/scss/utilities/_borders.scss b/scss/utilities/_borders.scss index 015c9b943b..b256881e5e 100644 --- a/scss/utilities/_borders.scss +++ b/scss/utilities/_borders.scss @@ -2,11 +2,11 @@ // Border // -.border-0 { border: 0 !important; } -.border-top-0 { border-top: 0 !important; } -.border-right-0 { border-right: 0 !important; } +.border-0 { border: 0 !important; } +.border-top-0 { border-top: 0 !important; } +.border-right-0 { border-right: 0 !important; } .border-bottom-0 { border-bottom: 0 !important; } -.border-left-0 { border-left: 0 !important; } +.border-left-0 { border-left: 0 !important; } // // Border-radius diff --git a/scss/utilities/_display.scss b/scss/utilities/_display.scss index 0e386cf6fb..6325f72227 100644 --- a/scss/utilities/_display.scss +++ b/scss/utilities/_display.scss @@ -8,21 +8,21 @@ $min: breakpoint-min($breakpoint, $grid-breakpoints); @if $min { - .d-#{$breakpoint}-none { display: none !important; } - .d-#{$breakpoint}-inline { display: inline !important; } + .d-#{$breakpoint}-none { display: none !important; } + .d-#{$breakpoint}-inline { display: inline !important; } .d-#{$breakpoint}-inline-block { display: inline-block !important; } - .d-#{$breakpoint}-block { display: block !important; } - .d-#{$breakpoint}-table { display: table !important; } - .d-#{$breakpoint}-table-cell { display: table-cell !important; } - .d-#{$breakpoint}-flex { display: flex !important; } + .d-#{$breakpoint}-block { display: block !important; } + .d-#{$breakpoint}-table { display: table !important; } + .d-#{$breakpoint}-table-cell { display: table-cell !important; } + .d-#{$breakpoint}-flex { display: flex !important; } } @else { - .d-none { display: none !important; } - .d-inline { display: inline !important; } + .d-none { display: none !important; } + .d-inline { display: inline !important; } .d-inline-block { display: inline-block !important; } - .d-block { display: block !important; } - .d-table { display: table !important; } - .d-table-cell { display: table-cell !important; } - .d-flex { display: flex !important; } + .d-block { display: block !important; } + .d-table { display: table !important; } + .d-table-cell { display: table-cell !important; } + .d-flex { display: flex !important; } } } } diff --git a/scss/utilities/_float.scss b/scss/utilities/_float.scss index 6c8a5dba4b..5f8c2d5879 100644 --- a/scss/utilities/_float.scss +++ b/scss/utilities/_float.scss @@ -4,14 +4,14 @@ @if $min { // everything else - .float-#{$breakpoint}-left { @include float-left; } + .float-#{$breakpoint}-left { @include float-left; } .float-#{$breakpoint}-right { @include float-right; } - .float-#{$breakpoint}-none { @include float-none; } + .float-#{$breakpoint}-none { @include float-none; } } @else { // xs - .float-left { @include float-left; } + .float-left { @include float-left; } .float-right { @include float-right; } - .float-none { @include float-none; } + .float-none { @include float-none; } } } } diff --git a/scss/utilities/_spacing.scss b/scss/utilities/_spacing.scss index ff96c58d1f..a845cf9ad8 100644 --- a/scss/utilities/_spacing.scss +++ b/scss/utilities/_spacing.scss @@ -24,7 +24,7 @@ @if $min { // everything else - .#{$abbrev}-#{$breakpoint}-#{$size} { #{$prop}: $length-y $length-x !important; } // a = All sides + .#{$abbrev}-#{$breakpoint}-#{$size} { #{$prop}: $length-y $length-x !important; } .#{$abbrev}t-#{$breakpoint}-#{$size} { #{$prop}-top: $length-y !important; } .#{$abbrev}r-#{$breakpoint}-#{$size} { #{$prop}-right: $length-x !important; } .#{$abbrev}b-#{$breakpoint}-#{$size} { #{$prop}-bottom: $length-y !important; } @@ -39,7 +39,7 @@ } } @else { // xs - .#{$abbrev}-#{$size} { #{$prop}: $length-y $length-x !important; } // a = All sides + .#{$abbrev}-#{$size} { #{$prop}: $length-y $length-x !important; } .#{$abbrev}t-#{$size} { #{$prop}-top: $length-y !important; } .#{$abbrev}r-#{$size} { #{$prop}-right: $length-x !important; } .#{$abbrev}b-#{$size} { #{$prop}-bottom: $length-y !important; } diff --git a/scss/utilities/_text.scss b/scss/utilities/_text.scss index 2bf21804f4..75f694a853 100644 --- a/scss/utilities/_text.scss +++ b/scss/utilities/_text.scss @@ -4,9 +4,9 @@ // Alignment -.text-justify { text-align: justify !important; } -.text-nowrap { white-space: nowrap !important; } -.text-truncate { @include text-truncate; } +.text-justify { text-align: justify !important; } +.text-nowrap { white-space: nowrap !important; } +.text-truncate { @include text-truncate; } // Responsive alignment @@ -28,15 +28,15 @@ // Transformation -.text-lowercase { text-transform: lowercase !important; } -.text-uppercase { text-transform: uppercase !important; } -.text-capitalize { text-transform: capitalize !important; } +.text-lowercase { text-transform: lowercase !important; } +.text-uppercase { text-transform: uppercase !important; } +.text-capitalize { text-transform: capitalize !important; } // Weight and italics -.font-weight-normal { font-weight: $font-weight-normal; } -.font-weight-bold { font-weight: $font-weight-bold; } -.font-italic { font-style: italic; } +.font-weight-normal { font-weight: $font-weight-normal; } +.font-weight-bold { font-weight: $font-weight-bold; } +.font-italic { font-style: italic; } // Contextual colors