diff options
| author | Mark Otto <[email protected]> | 2014-01-09 20:33:55 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-01-09 20:33:55 -0800 |
| commit | ea20f44815b535975d1f1416fee15bd1ea7acdb3 (patch) | |
| tree | edb73c6ae943629dbdc51d3350a50a079f7a2f7e /docs/assets/css/docs.css | |
| parent | 04161a8c753c5f9ef83dd1f0848a17e8c4ab155c (diff) | |
| parent | 7f153974e10980dccbdd485e63941b591e925148 (diff) | |
| download | bootstrap-ea20f44815b535975d1f1416fee15bd1ea7acdb3.tar.xz bootstrap-ea20f44815b535975d1f1416fee15bd1ea7acdb3.zip | |
Merge branch 'master' into docs_derp
Conflicts:
docs/assets/css/docs.css
Diffstat (limited to 'docs/assets/css/docs.css')
| -rw-r--r-- | docs/assets/css/docs.css | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index e2b026edf..4269e94f0 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -1,5 +1,6 @@ +/*csslint ids: false, overqualified-elements: false*/ /*! - * Copyright 2013 Twitter, Inc. + * Copyright 2011-2014 Twitter, Inc. * * Licensed under the Creative Commons Attribution 3.0 Unported License. For * details, see http://creativecommons.org/licenses/by/3.0/. @@ -1255,6 +1256,13 @@ h1[id] { font-weight: normal; } +.bs-customizer-input { + float: left; + width: 33.333333%; + padding-left: 15px; + padding-right: 15px; +} + /* Downloads */ .bs-customize-download .btn-outline { padding: 20px; @@ -1379,6 +1387,7 @@ h1[id] { /* Pseudo :focus state for showing how it looks in the docs */ #focusedInput { + border-color: rgb(204,204,204); /* Restate unfocused value to make CSSLint happy that there's a pre-CSS3 fallback*/ border-color: rgba(82,168,236,.8); outline: 0; outline: thin dotted \9; /* IE6-9 */ |