diff options
-rw-r--r-- | assets/stylesheets/bootstrap/_buttons.scss | 2 | ||||
-rw-r--r-- | assets/stylesheets/bootstrap/_reboot.scss | 2 | ||||
-rw-r--r-- | assets/stylesheets/bootstrap/_variables.scss | 2 | ||||
-rw-r--r-- | assets/stylesheets/bootstrap/mixins/_grid-framework.scss | 10 | ||||
-rw-r--r-- | templates/project/_bootstrap-variables.sass | 2 |
5 files changed, 8 insertions, 10 deletions
diff --git a/assets/stylesheets/bootstrap/_buttons.scss b/assets/stylesheets/bootstrap/_buttons.scss index 97d2251..265f357 100644 --- a/assets/stylesheets/bootstrap/_buttons.scss +++ b/assets/stylesheets/bootstrap/_buttons.scss @@ -48,7 +48,7 @@ } // Future-proof disabling of clicks on `<a>` elements -a.btn.disaabled, +a.btn.disabled, fieldset[disabled] a.btn { pointer-events: none; } diff --git a/assets/stylesheets/bootstrap/_reboot.scss b/assets/stylesheets/bootstrap/_reboot.scss index fe466da..de32aae 100644 --- a/assets/stylesheets/bootstrap/_reboot.scss +++ b/assets/stylesheets/bootstrap/_reboot.scss @@ -15,7 +15,7 @@ // recommendations on resolving such conflicts, see // http://getbootstrap.com/getting-started/#third-box-sizing. // -// Credit: shttp://css-tricks.com/inheriting-box-sizing-probably-slightly-better-best-practice/ +// Credit: https://css-tricks.com/inheriting-box-sizing-probably-slightly-better-best-practice/ html { box-sizing: border-box; diff --git a/assets/stylesheets/bootstrap/_variables.scss b/assets/stylesheets/bootstrap/_variables.scss index b655a3f..2cd88f6 100644 --- a/assets/stylesheets/bootstrap/_variables.scss +++ b/assets/stylesheets/bootstrap/_variables.scss @@ -4,7 +4,7 @@ // the Bootstrap defaults without modifying key, versioned files. -// Table of ontents +// Table of Contents // // Colors // Options diff --git a/assets/stylesheets/bootstrap/mixins/_grid-framework.scss b/assets/stylesheets/bootstrap/mixins/_grid-framework.scss index ad2060c..aa5f492 100644 --- a/assets/stylesheets/bootstrap/mixins/_grid-framework.scss +++ b/assets/stylesheets/bootstrap/mixins/_grid-framework.scss @@ -22,15 +22,13 @@ @include media-breakpoint-up($breakpoint) { // Work around cross-media @extend (https://github.com/sass/sass/issues/1050) %grid-column-float-#{$breakpoint} { - @if $enable-flex { - // Do nothing - } @else { - float: left; - } + float: left; } @for $i from 1 through $columns { .col-#{$breakpoint}-#{$i} { - @extend %grid-column-float-#{$breakpoint}; + @if not $enable-flex { + @extend %grid-column-float-#{$breakpoint}; + } @include make-col-span($i, $columns); } } diff --git a/templates/project/_bootstrap-variables.sass b/templates/project/_bootstrap-variables.sass index e14ecb0..55081f6 100644 --- a/templates/project/_bootstrap-variables.sass +++ b/templates/project/_bootstrap-variables.sass @@ -5,7 +5,7 @@ // the Bootstrap defaults without modifying key, versioned files. -// Table of ontents +// Table of Contents // // Colors // Options |