diff --git a/lib/bootstrap-sass/version.rb b/lib/bootstrap-sass/version.rb index bc4d52d8..7660998b 100644 --- a/lib/bootstrap-sass/version.rb +++ b/lib/bootstrap-sass/version.rb @@ -1,4 +1,4 @@ module Bootstrap VERSION = '3.0.3.0' - BOOTSTRAP_SHA = 'e5d6ab9b31315b189670a9a58d65054c1df35401' + BOOTSTRAP_SHA = '7a6bc67826d5aba3e551b04a054724c8cb817fa2' end diff --git a/vendor/assets/stylesheets/bootstrap/_buttons.scss b/vendor/assets/stylesheets/bootstrap/_buttons.scss index cf0af099..9fd37fe1 100644 --- a/vendor/assets/stylesheets/bootstrap/_buttons.scss +++ b/vendor/assets/stylesheets/bootstrap/_buttons.scss @@ -43,6 +43,7 @@ pointer-events: none; // Future-proof disabling of clicks @include opacity(.65); @include box-shadow(none); + opacity: 1; // iOS fix for unreadable disabled content } } diff --git a/vendor/assets/stylesheets/bootstrap/_forms.scss b/vendor/assets/stylesheets/bootstrap/_forms.scss index 86810eb8..c691d298 100644 --- a/vendor/assets/stylesheets/bootstrap/_forms.scss +++ b/vendor/assets/stylesheets/bootstrap/_forms.scss @@ -33,6 +33,10 @@ label { // Normalize form controls +// +// While most of our form styles require extra classes, some basic normalization +// is required to ensure optimum display with or without those classes to better +// address browser inconsistencies. // Override content-box in Normalize (* isn't specific enough) input[type="search"] { @@ -79,8 +83,9 @@ input[type="checkbox"]:focus { } // Fix for Chrome number input -// Setting certain font-sizes causes the `I` bar to appear on hover of the bottom increment button. -// See https://github.com/twbs/bootstrap/issues/8350 for more. +// +// Setting certain font-sizes causes the `I` bar to appear on hover of the +// bottom increment button. See https://github.com/twbs/bootstrap/issues/8350. input[type="number"] { &::-webkit-outer-spin-button, &::-webkit-inner-spin-button { @@ -139,9 +144,6 @@ output { @include form-control-focus(); // Placeholder - // - // Placeholder text gets special styles because when browsers invalidate entire - // lines if it doesn't understand a selector/ @include placeholder(); // Disabled and read-only inputs @@ -153,6 +155,7 @@ output { fieldset[disabled] & { cursor: not-allowed; background-color: $input-bg-disabled; + opacity: 1; // iOS fix for unreadable disabled content } // [converter] extracted textarea& to textarea.form-control diff --git a/vendor/assets/stylesheets/bootstrap/_navbar.scss b/vendor/assets/stylesheets/bootstrap/_navbar.scss index 62e9b266..3093ba7b 100644 --- a/vendor/assets/stylesheets/bootstrap/_navbar.scss +++ b/vendor/assets/stylesheets/bootstrap/_navbar.scss @@ -48,7 +48,7 @@ // content for the user's viewport. .navbar-collapse { - max-height: 340px; + max-height: $navbar-collapse-max-height; overflow-x: visible; padding-right: $navbar-padding-horizontal; padding-left: $navbar-padding-horizontal; diff --git a/vendor/assets/stylesheets/bootstrap/_print.scss b/vendor/assets/stylesheets/bootstrap/_print.scss index 07277a3c..3655d039 100644 --- a/vendor/assets/stylesheets/bootstrap/_print.scss +++ b/vendor/assets/stylesheets/bootstrap/_print.scss @@ -50,10 +50,6 @@ max-width: 100% !important; } - @page { - margin: 2cm .5cm; - } - p, h2, h3 { diff --git a/vendor/assets/stylesheets/bootstrap/_variables.scss b/vendor/assets/stylesheets/bootstrap/_variables.scss index f541aae8..9cd935b8 100644 --- a/vendor/assets/stylesheets/bootstrap/_variables.scss +++ b/vendor/assets/stylesheets/bootstrap/_variables.scss @@ -315,6 +315,7 @@ $navbar-margin-bottom: $line-height-computed !default; $navbar-border-radius: $border-radius-base !default; $navbar-padding-horizontal: floor(($grid-gutter-width / 2)) !default; $navbar-padding-vertical: (($navbar-height - $line-height-computed) / 2) !default; +$navbar-collapse-max-height: 340px !default; $navbar-default-color: #777 !default; $navbar-default-bg: #f8f8f8 !default;