diff options
| author | Jacob Thornton <[email protected]> | 2012-01-28 14:48:20 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-01-28 14:48:20 -0800 |
| commit | 29b1e86bf967e1cfbf869c0eed1a46655d8db126 (patch) | |
| tree | aff7377a79d54fd8781046c2bde820b63e06033c | |
| parent | 616cbf93d2ba2b21a72d81d2c9148a0f25e4810c (diff) | |
| parent | 9db4f2a344ebf452b88ac4af0261192f3a8e9eb6 (diff) | |
| download | bootstrap-29b1e86bf967e1cfbf869c0eed1a46655d8db126.tar.xz bootstrap-29b1e86bf967e1cfbf869c0eed1a46655d8db126.zip | |
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
| -rw-r--r-- | docs/assets/css/bootstrap-responsive.css | 27 | ||||
| -rw-r--r-- | docs/components.html | 2 | ||||
| -rw-r--r-- | docs/templates/pages/components.mustache | 2 | ||||
| -rw-r--r-- | less/progress-bars.less | 1 | ||||
| -rw-r--r-- | less/responsive.less | 20 |
5 files changed, 50 insertions, 2 deletions
diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index b991d1242..19c465e44 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -7,6 +7,33 @@ display: block; line-height: 18px; } + input[class*="span"], + select[class*="span"], + textarea[class*="span"], + .uneditable-input { + display: block; + width: 100%; + height: 28px; + /* Make inputs at least the height of their button counterpart */ + + /* Makes inputs behave like true block-level elements */ + + -webkit-box-sizing: border-box; + /* Older Webkit */ + + -moz-box-sizing: border-box; + /* Older FF */ + + -ms-box-sizing: border-box; + /* IE8 */ + + box-sizing: border-box; + /* CSS3 spec*/ + + } + .input-prepend input[class*="span"], .input-append input[class*="span"] { + width: auto; + } input[type="checkbox"], input[type="radio"] { border: 1px solid #ccc; } diff --git a/docs/components.html b/docs/components.html index 499e6b87c..1d5cbc926 100644 --- a/docs/components.html +++ b/docs/components.html @@ -564,7 +564,7 @@ </ul> </div> <!-- /tabbable --> <pre class="prettyprint linenums" style="margin-top: 11px;"> -<div class="tabbable tabs-bottom"> +<div class="tabbable tabs-below"> <ul class="nav tabs"> ... </ul> diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index d08ea98b5..363ed1ba1 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -499,7 +499,7 @@ </ul> </div> <!-- /tabbable --> <pre class="prettyprint linenums" style="margin-top: 11px;"> -<div class="tabbable tabs-bottom"> +<div class="tabbable tabs-below"> <ul class="nav tabs"> ... </ul> diff --git a/less/progress-bars.less b/less/progress-bars.less index cfca78d68..eeb14eef7 100644 --- a/less/progress-bars.less +++ b/less/progress-bars.less @@ -11,6 +11,7 @@ to { background-position: 40px 0; } } +// Firefox @-moz-keyframes progress-bar-stripes { from { background-position: 0 0; } to { background-position: 40px 0; } diff --git a/less/responsive.less b/less/responsive.less index 2d49f2095..ef2df5f1d 100644 --- a/less/responsive.less +++ b/less/responsive.less @@ -33,6 +33,26 @@ line-height: @baseLineHeight; } + // Make span* classes full width + input[class*="span"], + select[class*="span"], + textarea[class*="span"], + .uneditable-input { + display: block; + width: 100%; + height: 28px; /* Make inputs at least the height of their button counterpart */ + /* Makes inputs behave like true block-level elements */ + -webkit-box-sizing: border-box; /* Older Webkit */ + -moz-box-sizing: border-box; /* Older FF */ + -ms-box-sizing: border-box; /* IE8 */ + box-sizing: border-box; /* CSS3 spec*/ + } + // But don't let it screw up prepend/append inputs + .input-prepend input[class*="span"], + .input-append input[class*="span"] { + width: auto; + } + // Update checkboxes for iOS input[type="checkbox"], input[type="radio"] { |