mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-20 20:00:36 +03:00
Code Activity

Merge branch 'master' of https://github.com/twbs/bootstrap

Browse Source
This commit is contained in:
Mark Otto
2015-08-04 20:35:12 -07:00
parent 079c35f613 70ab634938
commit c266f9773e
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
less/jumbotron.less
+2
View File
@@ -28,6 +28,8 @@
.container &, .container &,
.container-fluid & { .container-fluid & {
border-radius: @border-radius-large; // Only round corners at higher resolutions if contained in a container 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 { .container {
less/mixins/buttons.less
+1 -4
View File
@@ -42,12 +42,9 @@
&.disabled, &.disabled,
&[disabled], &[disabled],
fieldset[disabled] & { fieldset[disabled] & {
&,
&:hover, &:hover,
&:focus, &:focus,
&.focus, &.focus {
&:active,
&.active {
background-color: @background; background-color: @background;
border-color: @border; border-color: @border;
} }