diff options
| -rw-r--r-- | assets/stylesheets/bootstrap/_forms.scss | 12 | ||||
| -rw-r--r-- | assets/stylesheets/bootstrap/_reboot.scss | 19 | ||||
| -rw-r--r-- | lib/bootstrap/version.rb | 2 |
3 files changed, 32 insertions, 1 deletions
diff --git a/assets/stylesheets/bootstrap/_forms.scss b/assets/stylesheets/bootstrap/_forms.scss index 729ca76..9a031c3 100644 --- a/assets/stylesheets/bootstrap/_forms.scss +++ b/assets/stylesheets/bootstrap/_forms.scss @@ -80,6 +80,18 @@ select.form-control { margin-bottom: 0; // Override the `<label>` default } +// +// Legends +// + +// For use with horizontal and inline forms, when you need the legend text to +// be the same size as regular labels, and to align with the form controls. +.form-control-legend { + padding: $input-padding-y $input-padding-x; + margin-bottom: 0; + font-size: $font-size-base; +} + // Todo: clear this up diff --git a/assets/stylesheets/bootstrap/_reboot.scss b/assets/stylesheets/bootstrap/_reboot.scss index 0b29901..4906cb4 100644 --- a/assets/stylesheets/bootstrap/_reboot.scss +++ b/assets/stylesheets/bootstrap/_reboot.scss @@ -171,6 +171,25 @@ a { } } +// And undo these styles for placeholder links/named anchors (without href). +// It would be more straightforward to just use a[href] in previous block, but that +// causes specificity issues in many other styles that are too complex to fix. +// See https://github.com/twbs/bootstrap/issues/19402 + +a:not([href]) { + color: inherit; + text-decoration: none; + + @include hover-focus { + color: inherit; + text-decoration: none; + } + + &:focus { + outline: none; + } +} + // // Code diff --git a/lib/bootstrap/version.rb b/lib/bootstrap/version.rb index 1c02cb6..2be13cc 100644 --- a/lib/bootstrap/version.rb +++ b/lib/bootstrap/version.rb @@ -1,4 +1,4 @@ module Bootstrap VERSION = '4.0.0.alpha3' - BOOTSTRAP_SHA = '255e89b2415e17fed75ca16962175f5d468edb1a' + BOOTSTRAP_SHA = 'fcb41c7afddc60e65218eaa7d4c95a76bc22380d' end |