mirror of
https://github.com/twbs/bootstrap.git
synced 2022-11-09 12:25:43 -05:00
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
This commit is contained in:
commit
29b1e86bf9
5 changed files with 50 additions and 2 deletions
27
docs/assets/css/bootstrap-responsive.css
vendored
27
docs/assets/css/bootstrap-responsive.css
vendored
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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>
|
||||
|
|
2
docs/templates/pages/components.mustache
vendored
2
docs/templates/pages/components.mustache
vendored
|
@ -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>
|
||||
|
|
|
@ -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; }
|
||||
|
|
|
@ -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"] {
|
||||
|
|
Loading…
Reference in a new issue