diff options
| author | Jacob Thornton <[email protected]> | 2011-11-16 00:28:20 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2011-11-16 00:28:20 -0800 |
| commit | 90f8eb6c144bbd409f196a0b33ec4ae2b47e1eb5 (patch) | |
| tree | 64e735a74d5256bcfd1769cc5b9c2a71402de22a /lib | |
| parent | a6f055ee5e74e14ce28a5f3246d8132f680e63f5 (diff) | |
| parent | 270def40f76b692d28c37126e94beb307161e264 (diff) | |
| download | bootstrap-90f8eb6c144bbd409f196a0b33ec4ae2b47e1eb5.tar.xz bootstrap-90f8eb6c144bbd409f196a0b33ec4ae2b47e1eb5.zip | |
Merge branch 'master' of https://github.com/twitter/bootstrap
Conflicts:
bootstrap.css
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/patterns.less | 2 | ||||
| -rw-r--r-- | lib/scaffolding.less | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/patterns.less b/lib/patterns.less index 9cccf10a4..5b72081b2 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -581,7 +581,7 @@ footer { // Active and Disabled states &.active, - :active { + &:active { @shadow: inset 0 2px 4px rgba(0,0,0,.25), 0 1px 2px rgba(0,0,0,.05); .box-shadow(@shadow); } diff --git a/lib/scaffolding.less b/lib/scaffolding.less index a0066393e..e99046253 100644 --- a/lib/scaffolding.less +++ b/lib/scaffolding.less @@ -133,5 +133,7 @@ a { // Unique column sizes for 16-column grid .span-one-third { width: 300px; } .span-two-thirds { width: 620px; } -.offset-one-third { margin-left: 340px; } -.offset-two-thirds { margin-left: 660px; } +.row { + > .offset-one-third { margin-left: 340px; } + > .offset-two-thirds { margin-left: 660px; } +}
\ No newline at end of file |