diff options
| author | Mark Otto <[email protected]> | 2015-08-04 20:35:12 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-08-04 20:35:12 -0700 |
| commit | c266f9773ea85ed8497530ed639568a150bd79d6 (patch) | |
| tree | 89f15dae263f084e9b114aab37e95b1a600d9a55 | |
| parent | 079c35f6134e0af2d0e00fe45f0fcc8ccc0cb884 (diff) | |
| parent | 70ab634938eea69dcb996eac56fea657381578dc (diff) | |
| download | bootstrap-c266f9773ea85ed8497530ed639568a150bd79d6.tar.xz bootstrap-c266f9773ea85ed8497530ed639568a150bd79d6.zip | |
Merge branch 'master' of https://github.com/twbs/bootstrap
| -rw-r--r-- | less/jumbotron.less | 2 | ||||
| -rw-r--r-- | less/mixins/buttons.less | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/less/jumbotron.less b/less/jumbotron.less index fa80a38c6..1d9b515b3 100644 --- a/less/jumbotron.less +++ b/less/jumbotron.less @@ -28,6 +28,8 @@ .container &, .container-fluid & { border-radius: @border-radius-large; // Only round corners at higher resolutions if contained in a container + padding-left: (@grid-gutter-width / 2); + padding-right: (@grid-gutter-width / 2); } .container { diff --git a/less/mixins/buttons.less b/less/mixins/buttons.less index 6875a97c8..b294d8c21 100644 --- a/less/mixins/buttons.less +++ b/less/mixins/buttons.less @@ -42,12 +42,9 @@ &.disabled, &[disabled], fieldset[disabled] & { - &, &:hover, &:focus, - &.focus, - &:active, - &.active { + &.focus { background-color: @background; border-color: @border; } |