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 /bootstrap.css | |
| 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 'bootstrap.css')
| -rw-r--r-- | bootstrap.css | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bootstrap.css b/bootstrap.css index 91216cc32..e9f2a3822 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Sat Nov 12 20:22:29 PST 2011 + * Date: Wed Nov 16 00:28:10 PST 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -380,10 +380,10 @@ a:hover { .span-two-thirds { width: 620px; } -.offset-one-third { +.row > .offset-one-third { margin-left: 340px; } -.offset-two-thirds { +.row > .offset-two-thirds { margin-left: 660px; } /* Typography.less @@ -1925,7 +1925,7 @@ footer { border-color: #0064cd #0064cd #003f81; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); } -.btn.active, .btn :active { +.btn.active, .btn:active { -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05); -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05); |