Skip to content
GitLab
Commit 1f153b64 authored by Mark Otto's avatar Mark Otto
Browse files

re-fix #16154 in v4-dev /cc #17101

parent 421a1393
46 merge requests!28721Hot test,!27561Adds font-weight-medium to font weight classes,!26437merge,!26197V4 dev xmr,!20778V4 dev,!20539Allow multiple modals,!18047#17986,!18988Blockquote border width,!20854Fixes 15534,!19272V4 dev xmr grunt html,!19581V4 fix popover,!18283Tether docs fix,!20493V4 dev display,!20636Fix docs for heading sizes,!19824blockquote-center,!22547Finished a new translation for bootstrap,!19534Docs 17264,!19533Npm deps,!22143Fix selectable disabled toggle radio buttons,!19084V4 rhythm,!18085Ie9 click comment,!22598test,!18829Add prefix to carousel classes,!18581Check getting started files for broken links - Issue 18568,!18067replace grunt-autoprefixer with gruntpostcss + autoprefixer,!20099V4.0.0 alpha.3,!20438V4 grid classes,!17307Vertical alignment on Bootstrap columns with equal height,!18477add utility color-contrast function,!18864Feature/navbar toggler support color schemes,!19602V4 palettes arun,!18311V4 dev xmr,!19448New pull request for testing,!19358XXL grid size,!19825.blockquote-center,!17508Fix usage of “its” and “it’s” (v4 docs),!25326Adjust examples,!23995Add back cursor: pointer for .btn-link,!23178Spinner,!19754Issue template,!19753Card img overlay padding,!19747Blockquote border width,!19580ExitStars,!18684Docs: change "Button" to "Go somewhere",!18661Docs: accessibility fix-up of collapsible content navbar, change site-wide main navbar,!17021v4
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 262 additions and 83 deletions
+262 -83
dist/css/bootstrap.css
+ 120
- 36
View file @ 1f153b64
......@@ -2282,17 +2282,14 @@ fieldset[disabled] a.btn {
border-color: #0275d8;
}
.btn-primary:focus,
.btn-primary.focus,
.btn-primary:active,
.btn-primary.active,
.open > .btn-primary.dropdown-toggle {
.btn-primary:hover {
color: #fff;
background-color: #025aa5;
border-color: #01549b;
}
.btn-primary:hover {
.btn-primary:focus,
.btn-primary.focus {
color: #fff;
background-color: #025aa5;
border-color: #01549b;
......@@ -2301,7 +2298,24 @@ fieldset[disabled] a.btn {
.btn-primary:active,
.btn-primary.active,
.open > .btn-primary.dropdown-toggle {
color: #fff;
background-color: #025aa5;
background-image: none;
border-color: #01549b;
}
.btn-primary:active:hover,
.btn-primary:active:focus,
.btn-primary:active.focus,
.btn-primary.active:hover,
.btn-primary.active:focus,
.btn-primary.active.focus,
.open > .btn-primary.dropdown-toggle:hover,
.open > .btn-primary.dropdown-toggle:focus,
.open > .btn-primary.dropdown-toggle.focus {
color: #fff;
background-color: #014682;
border-color: #01315a;
}
.btn-primary.disabled:focus,
......@@ -2327,17 +2341,14 @@ fieldset[disabled] .btn-primary:hover {
border-color: #ccc;
}
.btn-secondary:focus,
.btn-secondary.focus,
.btn-secondary:active,
.btn-secondary.active,
.open > .btn-secondary.dropdown-toggle {
.btn-secondary:hover {
color: #373a3c;
background-color: #e6e6e6;
border-color: #adadad;
}
.btn-secondary:hover {
.btn-secondary:focus,
.btn-secondary.focus {
color: #373a3c;
background-color: #e6e6e6;
border-color: #adadad;
......@@ -2346,7 +2357,24 @@ fieldset[disabled] .btn-primary:hover {
.btn-secondary:active,
.btn-secondary.active,
.open > .btn-secondary.dropdown-toggle {
color: #373a3c;
background-color: #e6e6e6;
background-image: none;
border-color: #adadad;
}
.btn-secondary:active:hover,
.btn-secondary:active:focus,
.btn-secondary:active.focus,
.btn-secondary.active:hover,
.btn-secondary.active:focus,
.btn-secondary.active.focus,
.open > .btn-secondary.dropdown-toggle:hover,
.open > .btn-secondary.dropdown-toggle:focus,
.open > .btn-secondary.dropdown-toggle.focus {
color: #373a3c;
background-color: #d4d4d4;
border-color: #8c8c8c;
}
.btn-secondary.disabled:focus,
......@@ -2372,17 +2400,14 @@ fieldset[disabled] .btn-secondary:hover {
border-color: #5bc0de;
}
.btn-info:focus,
.btn-info.focus,
.btn-info:active,
.btn-info.active,
.open > .btn-info.dropdown-toggle {
.btn-info:hover {
color: #fff;
background-color: #31b0d5;
border-color: #2aabd2;
}
.btn-info:hover {
.btn-info:focus,
.btn-info.focus {
color: #fff;
background-color: #31b0d5;
border-color: #2aabd2;
......@@ -2391,7 +2416,24 @@ fieldset[disabled] .btn-secondary:hover {
.btn-info:active,
.btn-info.active,
.open > .btn-info.dropdown-toggle {
color: #fff;
background-color: #31b0d5;
background-image: none;
border-color: #2aabd2;
}
.btn-info:active:hover,
.btn-info:active:focus,
.btn-info:active.focus,
.btn-info.active:hover,
.btn-info.active:focus,
.btn-info.active.focus,
.open > .btn-info.dropdown-toggle:hover,
.open > .btn-info.dropdown-toggle:focus,
.open > .btn-info.dropdown-toggle.focus {
color: #fff;
background-color: #269abc;
border-color: #1f7e9a;
}
.btn-info.disabled:focus,
......@@ -2417,17 +2459,14 @@ fieldset[disabled] .btn-info:hover {
border-color: #5cb85c;
}
.btn-success:focus,
.btn-success.focus,
.btn-success:active,
.btn-success.active,
.open > .btn-success.dropdown-toggle {
.btn-success:hover {
color: #fff;
background-color: #449d44;
border-color: #419641;
}
.btn-success:hover {
.btn-success:focus,
.btn-success.focus {
color: #fff;
background-color: #449d44;
border-color: #419641;
......@@ -2436,7 +2475,24 @@ fieldset[disabled] .btn-info:hover {
.btn-success:active,
.btn-success.active,
.open > .btn-success.dropdown-toggle {
color: #fff;
background-color: #449d44;
background-image: none;
border-color: #419641;
}
.btn-success:active:hover,
.btn-success:active:focus,
.btn-success:active.focus,
.btn-success.active:hover,
.btn-success.active:focus,
.btn-success.active.focus,
.open > .btn-success.dropdown-toggle:hover,
.open > .btn-success.dropdown-toggle:focus,
.open > .btn-success.dropdown-toggle.focus {
color: #fff;
background-color: #398439;
border-color: #2d672d;
}
.btn-success.disabled:focus,
......@@ -2462,17 +2518,14 @@ fieldset[disabled] .btn-success:hover {
border-color: #f0ad4e;
}
.btn-warning:focus,
.btn-warning.focus,
.btn-warning:active,
.btn-warning.active,
.open > .btn-warning.dropdown-toggle {
.btn-warning:hover {
color: #fff;
background-color: #ec971f;
border-color: #eb9316;
}
.btn-warning:hover {
.btn-warning:focus,
.btn-warning.focus {
color: #fff;
background-color: #ec971f;
border-color: #eb9316;
......@@ -2481,7 +2534,24 @@ fieldset[disabled] .btn-success:hover {
.btn-warning:active,
.btn-warning.active,
.open > .btn-warning.dropdown-toggle {
color: #fff;
background-color: #ec971f;
background-image: none;
border-color: #eb9316;
}
.btn-warning:active:hover,
.btn-warning:active:focus,
.btn-warning:active.focus,
.btn-warning.active:hover,
.btn-warning.active:focus,
.btn-warning.active.focus,
.open > .btn-warning.dropdown-toggle:hover,
.open > .btn-warning.dropdown-toggle:focus,
.open > .btn-warning.dropdown-toggle.focus {
color: #fff;
background-color: #d58512;
border-color: #b06d0f;
}
.btn-warning.disabled:focus,
......@@ -2507,17 +2577,14 @@ fieldset[disabled] .btn-warning:hover {
border-color: #d9534f;
}
.btn-danger:focus,
.btn-danger.focus,
.btn-danger:active,
.btn-danger.active,
.open > .btn-danger.dropdown-toggle {
.btn-danger:hover {
color: #fff;
background-color: #c9302c;
border-color: #c12e2a;
}
.btn-danger:hover {
.btn-danger:focus,
.btn-danger.focus {
color: #fff;
background-color: #c9302c;
border-color: #c12e2a;
......@@ -2526,7 +2593,24 @@ fieldset[disabled] .btn-warning:hover {
.btn-danger:active,
.btn-danger.active,
.open > .btn-danger.dropdown-toggle {
color: #fff;
background-color: #c9302c;
background-image: none;
border-color: #c12e2a;
}
.btn-danger:active:hover,
.btn-danger:active:focus,
.btn-danger:active.focus,
.btn-danger.active:hover,
.btn-danger.active:focus,
.btn-danger.active.focus,
.open > .btn-danger.dropdown-toggle:hover,
.open > .btn-danger.dropdown-toggle:focus,
.open > .btn-danger.dropdown-toggle.focus {
color: #fff;
background-color: #ac2925;
border-color: #8b211e;
}
.btn-danger.disabled:focus,
......
dist/css/bootstrap.css.map
+652 bytes (+1%)
View file @ 1f153b64
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
dist/css/bootstrap.min.css
+ 1
- 1
View file @ 1f153b64
This diff is collapsed.
dist/css/bootstrap.min.css.map
+767 bytes (+2%)
View file @ 1f153b64
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
docs/dist/css/bootstrap.css
+ 120
- 36
View file @ 1f153b64
......@@ -2282,17 +2282,14 @@ fieldset[disabled] a.btn {
border-color: #0275d8;
}
.btn-primary:focus,
.btn-primary.focus,
.btn-primary:active,
.btn-primary.active,
.open > .btn-primary.dropdown-toggle {
.btn-primary:hover {
color: #fff;
background-color: #025aa5;
border-color: #01549b;
}
.btn-primary:hover {
.btn-primary:focus,
.btn-primary.focus {
color: #fff;
background-color: #025aa5;
border-color: #01549b;
......@@ -2301,7 +2298,24 @@ fieldset[disabled] a.btn {
.btn-primary:active,
.btn-primary.active,
.open > .btn-primary.dropdown-toggle {
color: #fff;
background-color: #025aa5;
background-image: none;
border-color: #01549b;
}
.btn-primary:active:hover,
.btn-primary:active:focus,
.btn-primary:active.focus,
.btn-primary.active:hover,
.btn-primary.active:focus,
.btn-primary.active.focus,
.open > .btn-primary.dropdown-toggle:hover,
.open > .btn-primary.dropdown-toggle:focus,
.open > .btn-primary.dropdown-toggle.focus {
color: #fff;
background-color: #014682;
border-color: #01315a;
}
.btn-primary.disabled:focus,
......@@ -2327,17 +2341,14 @@ fieldset[disabled] .btn-primary:hover {
border-color: #ccc;
}
.btn-secondary:focus,
.btn-secondary.focus,
.btn-secondary:active,
.btn-secondary.active,
.open > .btn-secondary.dropdown-toggle {
.btn-secondary:hover {
color: #373a3c;
background-color: #e6e6e6;
border-color: #adadad;
}
.btn-secondary:hover {
.btn-secondary:focus,
.btn-secondary.focus {
color: #373a3c;
background-color: #e6e6e6;
border-color: #adadad;
......@@ -2346,7 +2357,24 @@ fieldset[disabled] .btn-primary:hover {
.btn-secondary:active,
.btn-secondary.active,
.open > .btn-secondary.dropdown-toggle {
color: #373a3c;
background-color: #e6e6e6;
background-image: none;
border-color: #adadad;
}
.btn-secondary:active:hover,
.btn-secondary:active:focus,
.btn-secondary:active.focus,
.btn-secondary.active:hover,
.btn-secondary.active:focus,
.btn-secondary.active.focus,
.open > .btn-secondary.dropdown-toggle:hover,
.open > .btn-secondary.dropdown-toggle:focus,
.open > .btn-secondary.dropdown-toggle.focus {
color: #373a3c;
background-color: #d4d4d4;
border-color: #8c8c8c;
}
.btn-secondary.disabled:focus,
......@@ -2372,17 +2400,14 @@ fieldset[disabled] .btn-secondary:hover {
border-color: #5bc0de;
}
.btn-info:focus,
.btn-info.focus,
.btn-info:active,
.btn-info.active,
.open > .btn-info.dropdown-toggle {
.btn-info:hover {
color: #fff;
background-color: #31b0d5;
border-color: #2aabd2;
}
.btn-info:hover {
.btn-info:focus,
.btn-info.focus {
color: #fff;
background-color: #31b0d5;
border-color: #2aabd2;
......@@ -2391,7 +2416,24 @@ fieldset[disabled] .btn-secondary:hover {
.btn-info:active,
.btn-info.active,
.open > .btn-info.dropdown-toggle {
color: #fff;
background-color: #31b0d5;
background-image: none;
border-color: #2aabd2;
}
.btn-info:active:hover,
.btn-info:active:focus,
.btn-info:active.focus,
.btn-info.active:hover,
.btn-info.active:focus,
.btn-info.active.focus,
.open > .btn-info.dropdown-toggle:hover,
.open > .btn-info.dropdown-toggle:focus,
.open > .btn-info.dropdown-toggle.focus {
color: #fff;
background-color: #269abc;
border-color: #1f7e9a;
}
.btn-info.disabled:focus,
......@@ -2417,17 +2459,14 @@ fieldset[disabled] .btn-info:hover {
border-color: #5cb85c;
}
.btn-success:focus,
.btn-success.focus,
.btn-success:active,
.btn-success.active,
.open > .btn-success.dropdown-toggle {
.btn-success:hover {
color: #fff;
background-color: #449d44;
border-color: #419641;
}
.btn-success:hover {
.btn-success:focus,
.btn-success.focus {
color: #fff;
background-color: #449d44;
border-color: #419641;
......@@ -2436,7 +2475,24 @@ fieldset[disabled] .btn-info:hover {
.btn-success:active,
.btn-success.active,
.open > .btn-success.dropdown-toggle {
color: #fff;
background-color: #449d44;
background-image: none;
border-color: #419641;
}
.btn-success:active:hover,
.btn-success:active:focus,
.btn-success:active.focus,
.btn-success.active:hover,
.btn-success.active:focus,
.btn-success.active.focus,
.open > .btn-success.dropdown-toggle:hover,
.open > .btn-success.dropdown-toggle:focus,
.open > .btn-success.dropdown-toggle.focus {
color: #fff;
background-color: #398439;
border-color: #2d672d;
}
.btn-success.disabled:focus,
......@@ -2462,17 +2518,14 @@ fieldset[disabled] .btn-success:hover {
border-color: #f0ad4e;
}
.btn-warning:focus,
.btn-warning.focus,
.btn-warning:active,
.btn-warning.active,
.open > .btn-warning.dropdown-toggle {
.btn-warning:hover {
color: #fff;
background-color: #ec971f;
border-color: #eb9316;
}
.btn-warning:hover {
.btn-warning:focus,
.btn-warning.focus {
color: #fff;
background-color: #ec971f;
border-color: #eb9316;
......@@ -2481,7 +2534,24 @@ fieldset[disabled] .btn-success:hover {
.btn-warning:active,
.btn-warning.active,
.open > .btn-warning.dropdown-toggle {
color: #fff;
background-color: #ec971f;
background-image: none;
border-color: #eb9316;
}
.btn-warning:active:hover,
.btn-warning:active:focus,
.btn-warning:active.focus,
.btn-warning.active:hover,
.btn-warning.active:focus,
.btn-warning.active.focus,
.open > .btn-warning.dropdown-toggle:hover,
.open > .btn-warning.dropdown-toggle:focus,
.open > .btn-warning.dropdown-toggle.focus {
color: #fff;
background-color: #d58512;
border-color: #b06d0f;
}
.btn-warning.disabled:focus,
......@@ -2507,17 +2577,14 @@ fieldset[disabled] .btn-warning:hover {
border-color: #d9534f;
}
.btn-danger:focus,
.btn-danger.focus,
.btn-danger:active,
.btn-danger.active,
.open > .btn-danger.dropdown-toggle {
.btn-danger:hover {
color: #fff;
background-color: #c9302c;
border-color: #c12e2a;
}
.btn-danger:hover {
.btn-danger:focus,
.btn-danger.focus {
color: #fff;
background-color: #c9302c;
border-color: #c12e2a;
......@@ -2526,7 +2593,24 @@ fieldset[disabled] .btn-warning:hover {
.btn-danger:active,
.btn-danger.active,
.open > .btn-danger.dropdown-toggle {
color: #fff;
background-color: #c9302c;
background-image: none;
border-color: #c12e2a;
}
.btn-danger:active:hover,
.btn-danger:active:focus,
.btn-danger:active.focus,
.btn-danger.active:hover,
.btn-danger.active:focus,
.btn-danger.active.focus,
.open > .btn-danger.dropdown-toggle:hover,
.open > .btn-danger.dropdown-toggle:focus,
.open > .btn-danger.dropdown-toggle.focus {
color: #fff;
background-color: #ac2925;
border-color: #8b211e;
}
.btn-danger.disabled:focus,
......
docs/dist/css/bootstrap.css.map
+652 bytes (+1%)
View file @ 1f153b64
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
docs/dist/css/bootstrap.min.css
+ 1
- 1
View file @ 1f153b64
This diff is collapsed.
docs/dist/css/bootstrap.min.css.map
+767 bytes (+2%)
View file @ 1f153b64
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
scss/mixins/_buttons.scss
+ 20
- 9
View file @ 1f153b64
......@@ -4,35 +4,46 @@
// and disabled options for all buttons
@mixin button-variant($color, $background, $border) {
$active-background: darken($background, 10%);
$active-border: darken($border, 12%);
color: $color;
background-color: $background;
border-color: $border;
@include box-shadow(inset 0 1px 0 rgba(255,255,255,.15), 0 1px 1px rgba(0,0,0,.075));
$active-background: darken($background, 10%);
$active-border: darken($border, 12%);
&:focus,
&.focus,
&:active,
&.active,
.open > &.dropdown-toggle {
@include hover {
color: $color;
background-color: $active-background;
border-color: $active-border;
}
@include hover {
&:focus,
&.focus {
color: $color;
background-color: $active-background;
border-color: $active-border;
}
&:active,
&.active,
.open > &.dropdown-toggle {
color: $color;
background-color: $active-background;
border-color: $active-border;
// Remove the gradient for the pressed/active state
background-image: none;
@include box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
&:hover,
&:focus,
&.focus {
color: $color;
background-color: darken($background, 17%);
border-color: darken($border, 25%);
}
}
&.disabled,
&:disabled,
fieldset[disabled] & {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment