diff options
| author | Mark Otto <[email protected]> | 2015-03-28 20:31:53 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-03-28 20:31:53 -0700 |
| commit | 57c8e3cd51abcb4230d37863b40bcca564d033f4 (patch) | |
| tree | 32ccb26c5f92cd96d9d569e9db277b2990ce04e3 /less | |
| parent | df8010b815b8cc4d2f5854b9ec05ca05143be29e (diff) | |
| parent | 93bf800e1f00861525688007ae7aaf6f3daeda47 (diff) | |
| download | bootstrap-57c8e3cd51abcb4230d37863b40bcca564d033f4.tar.xz bootstrap-57c8e3cd51abcb4230d37863b40bcca564d033f4.zip | |
Merge branch 'master' into input_sizing
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
Diffstat (limited to 'less')
| -rw-r--r-- | less/buttons.less | 8 | ||||
| -rw-r--r-- | less/jumbotron.less | 2 | ||||
| -rw-r--r-- | less/mixins/background-variant.less | 3 | ||||
| -rw-r--r-- | less/mixins/buttons.less | 20 | ||||
| -rw-r--r-- | less/mixins/text-emphasis.less | 3 | ||||
| -rw-r--r-- | less/variables.less | 1 |
6 files changed, 31 insertions, 6 deletions
diff --git a/less/buttons.less b/less/buttons.less index 5a746049e..740905f52 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -47,10 +47,16 @@ &[disabled], fieldset[disabled] & { cursor: @cursor-disabled; - pointer-events: none; // Future-proof disabling of clicks .opacity(.65); .box-shadow(none); } + + a& { + &.disabled, + fieldset[disabled] & { + pointer-events: none; // Future-proof disabling of clicks on `<a>` elements + } + } } diff --git a/less/jumbotron.less b/less/jumbotron.less index 93036d3c9..fb4415bdc 100644 --- a/less/jumbotron.less +++ b/less/jumbotron.less @@ -44,7 +44,7 @@ h1, .h1 { - font-size: (@font-size-base * 4.5); + font-size: @jumbotron-heading-font-size; } } } diff --git a/less/mixins/background-variant.less b/less/mixins/background-variant.less index 556e490d4..a85c22b74 100644 --- a/less/mixins/background-variant.less +++ b/less/mixins/background-variant.less @@ -2,7 +2,8 @@ .bg-variant(@color) { background-color: @color; - a&:hover { + a&:hover, + a&:focus { background-color: darken(@color, 10%); } } diff --git a/less/mixins/buttons.less b/less/mixins/buttons.less index 92d8a056c..6875a97c8 100644 --- a/less/mixins/buttons.less +++ b/less/mixins/buttons.less @@ -8,15 +8,31 @@ background-color: @background; border-color: @border; - &:hover, &:focus, - &.focus, + &.focus { + color: @color; + background-color: darken(@background, 10%); + border-color: darken(@border, 25%); + } + &:hover { + color: @color; + background-color: darken(@background, 10%); + border-color: darken(@border, 12%); + } &:active, &.active, .open > .dropdown-toggle& { color: @color; background-color: darken(@background, 10%); border-color: darken(@border, 12%); + + &:hover, + &:focus, + &.focus { + color: @color; + background-color: darken(@background, 17%); + border-color: darken(@border, 25%); + } } &:active, &.active, diff --git a/less/mixins/text-emphasis.less b/less/mixins/text-emphasis.less index 0868ef9f2..9e8a77a69 100644 --- a/less/mixins/text-emphasis.less +++ b/less/mixins/text-emphasis.less @@ -2,7 +2,8 @@ .text-emphasis-variant(@color) { color: @color; - a&:hover { + a&:hover, + a&:focus { color: darken(@color, 10%); } } diff --git a/less/variables.less b/less/variables.less index b5fb9d02c..dd3c102ab 100644 --- a/less/variables.less +++ b/less/variables.less @@ -484,6 +484,7 @@ @jumbotron-bg: @gray-lighter; @jumbotron-heading-color: inherit; @jumbotron-font-size: ceil((@font-size-base * 1.5)); +@jumbotron-heading-font-size: ceil((@font-size-base * 4.5)); //== Form states and alerts |