diff options
author | Gleb Mazovetskiy <glex.spb@gmail.com> | 2016-03-12 03:43:38 +0300 |
---|---|---|
committer | Gleb Mazovetskiy <glex.spb@gmail.com> | 2016-03-12 03:43:38 +0300 |
commit | 5f603d67c9d4bd32cf77a3bcb48281dcbafd00c6 (patch) | |
tree | 793a0989a799b1110d58b54ffda9b48ecd175112 /assets | |
parent | 59a78d6f71e79f73a954a87a4b3769d9c85c49f2 (diff) |
rake update[v4-dev]
Diffstat (limited to 'assets')
-rw-r--r-- | assets/stylesheets/bootstrap/_forms.scss | 12 | ||||
-rw-r--r-- | assets/stylesheets/bootstrap/_reboot.scss | 19 |
2 files changed, 31 insertions, 0 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 |