mirror of
https://github.com/Hopiu/bootstrap.git
synced 2026-04-20 04:10:58 +00:00
Merge branch 'master' of https://github.com/twbs/bootstrap
This commit is contained in:
commit
c266f9773e
2 changed files with 3 additions and 4 deletions
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -42,12 +42,9 @@
|
|||
&.disabled,
|
||||
&[disabled],
|
||||
fieldset[disabled] & {
|
||||
&,
|
||||
&:hover,
|
||||
&:focus,
|
||||
&.focus,
|
||||
&:active,
|
||||
&.active {
|
||||
&.focus {
|
||||
background-color: @background;
|
||||
border-color: @border;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue