0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-20 17:54:23 +01:00

Rebuild css and html

This commit is contained in:
Pete Hopkins 2012-01-27 16:39:38 -05:00
parent 1c9db106fa
commit 84b9a1bfb6
2 changed files with 57 additions and 8 deletions

View File

@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Designed and built with all the love in the world @twitter by @mdo and @fat. * Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Fri Jan 27 11:07:13 PST 2012 * Date: Fri Jan 27 16:39:29 EST 2012
*/ */
article, article,
aside, aside,
@ -814,6 +814,10 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
} }
.help-inline { .help-inline {
display: inline-block; display: inline-block;
*display: inline;
/* IE7 inline-block hack */
*zoom: 1;
margin-bottom: 9px; margin-bottom: 9px;
vertical-align: middle; vertical-align: middle;
padding-left: 5px; padding-left: 5px;
@ -1083,6 +1087,10 @@ table .span12 {
vertical-align: text-top; vertical-align: text-top;
width: 14px; width: 14px;
height: 14px; height: 14px;
*margin-right: .3em;
}
.icon:last-child {
*margin-left: 0;
} }
.icon.white { .icon.white {
background-image: url(../img/glyphicons-halflings-sprite-white.png); background-image: url(../img/glyphicons-halflings-sprite-white.png);
@ -1360,11 +1368,15 @@ table .span12 {
.dropdown { .dropdown {
position: relative; position: relative;
} }
.dropdown .dropdown-toggle {
*margin-bottom: -3px;
}
.caret { .caret {
display: inline-block; display: inline-block;
width: 0; width: 0;
height: 0; height: 0;
text-indent: -99999px; text-indent: -99999px;
*text-indent: 0;
vertical-align: top; vertical-align: top;
border-left: 4px solid transparent; border-left: 4px solid transparent;
border-right: 4px solid transparent; border-right: 4px solid transparent;
@ -1376,7 +1388,6 @@ table .span12 {
.dropdown .caret { .dropdown .caret {
margin-top: 8px; margin-top: 8px;
margin-left: 2px; margin-left: 2px;
*margin-top: 7px;
} }
.dropdown:hover .caret, .open.dropdown .caret { .dropdown:hover .caret, .open.dropdown .caret {
opacity: 1; opacity: 1;
@ -1385,6 +1396,7 @@ table .span12 {
.dropdown-menu { .dropdown-menu {
position: absolute; position: absolute;
top: 100%; top: 100%;
left: 0;
z-index: 1000; z-index: 1000;
float: left; float: left;
display: none; display: none;
@ -1408,7 +1420,6 @@ table .span12 {
-webkit-background-clip: padding-box; -webkit-background-clip: padding-box;
-moz-background-clip: padding; -moz-background-clip: padding;
background-clip: padding-box; background-clip: padding-box;
zoom: 1;
*border-right-width: 2px; *border-right-width: 2px;
*border-bottom-width: 2px; *border-bottom-width: 2px;
} }
@ -1423,6 +1434,8 @@ table .span12 {
overflow: hidden; overflow: hidden;
background-color: #e5e5e5; background-color: #e5e5e5;
border-bottom: 1px solid #ffffff; border-bottom: 1px solid #ffffff;
*width: 100%;
*margin: -5px 0 5px;
} }
.dropdown-menu a { .dropdown-menu a {
display: block; display: block;
@ -1438,6 +1451,9 @@ table .span12 {
text-decoration: none; text-decoration: none;
background-color: #0088cc; background-color: #0088cc;
} }
.dropdown.open {
*z-index: 1000;
}
.dropdown.open .dropdown-toggle { .dropdown.open .dropdown-toggle {
color: #ffffff; color: #ffffff;
background: #ccc; background: #ccc;
@ -1742,6 +1758,7 @@ table .span12 {
} }
.tabs-left .tabs .active > a, .tabs-left .tabs .active > a:hover { .tabs-left .tabs .active > a, .tabs-left .tabs .active > a:hover {
border-color: #ddd transparent #ddd #ddd; border-color: #ddd transparent #ddd #ddd;
*border-right-color: #ffffff;
} }
.tabs-right .tabs { .tabs-right .tabs {
float: right; float: right;
@ -1759,6 +1776,7 @@ table .span12 {
} }
.tabs-right .tabs .active > a, .tabs-right .tabs .active > a:hover { .tabs-right .tabs .active > a, .tabs-right .tabs .active > a:hover {
border-color: #ddd #ddd #ddd transparent; border-color: #ddd #ddd #ddd transparent;
*border-left-color: #ffffff;
} }
.navbar { .navbar {
overflow: visible; overflow: visible;
@ -1826,7 +1844,7 @@ table .span12 {
line-height: 1; line-height: 1;
color: #ffffff; color: #ffffff;
color: rgba(255, 255, 255, 0.75); color: rgba(255, 255, 255, 0.75);
background: #444; background: #6a6a6a;
background: rgba(255, 255, 255, 0.3); background: rgba(255, 255, 255, 0.3);
border: 1px solid #111; border: 1px solid #111;
-webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15); -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15);
@ -2455,8 +2473,6 @@ table .span12 {
.btn { .btn {
display: inline-block; display: inline-block;
padding: 4px 10px 4px; padding: 4px 10px 4px;
*padding: 2px 10px;
*margin-left: 4px;
font-size: 13px; font-size: 13px;
line-height: 18px; line-height: 18px;
color: #333333; color: #333333;
@ -2478,6 +2494,7 @@ table .span12 {
-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
cursor: pointer; cursor: pointer;
*margin-left: .3em;
} }
.btn:first-child { .btn:first-child {
*margin-left: 0; *margin-left: 0;
@ -2525,7 +2542,7 @@ table .span12 {
box-shadow: none; box-shadow: none;
} }
.btn.large { .btn.large {
padding: 9px 14px 9px; padding: 9px 14px;
font-size: 15px; font-size: 15px;
line-height: normal; line-height: normal;
-webkit-border-radius: 5px; -webkit-border-radius: 5px;
@ -2536,20 +2553,33 @@ table .span12 {
margin-top: 1px; margin-top: 1px;
} }
.btn.small { .btn.small {
padding: 5px 9px 5px; padding: 5px 9px;
font-size: 11px; font-size: 11px;
line-height: 16px; line-height: 16px;
} }
.btn.small .icon { .btn.small .icon {
margin-top: -2px; margin-top: -2px;
} }
button.btn, input[type=submit].btn {
*padding-top: 2px;
*padding-bottom: 2px;
}
button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
padding: 0; padding: 0;
border: 0; border: 0;
} }
button.btn.large, input[type=submit].btn.large {
*padding-top: 7px;
*padding-bottom: 7px;
}
button.btn.small, input[type=submit].btn.small {
*padding-top: 3px;
*padding-bottom: 3px;
}
.btn-group { .btn-group {
position: relative; position: relative;
*zoom: 1; *zoom: 1;
*margin-left: .3em;
} }
.btn-group:before, .btn-group:after { .btn-group:before, .btn-group:after {
display: table; display: table;
@ -2558,11 +2588,18 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
.btn-group:after { .btn-group:after {
clear: both; clear: both;
} }
.btn-group:first-child {
*margin-left: 0;
}
.btn-group + .btn-group { .btn-group + .btn-group {
margin-left: 5px; margin-left: 5px;
} }
.btn-toolbar .btn-group { .btn-toolbar .btn-group {
display: inline-block; display: inline-block;
*display: inline;
/* IE7 inline-block hack */
*zoom: 1;
} }
.btn-group .btn { .btn-group .btn {
position: relative; position: relative;
@ -2615,6 +2652,11 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
-webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
*padding-top: 5px;
*padding-bottom: 5px;
}
.btn-group.open {
*z-index: 1000;
} }
.btn-group.open .dropdown-menu { .btn-group.open .dropdown-menu {
display: block; display: block;

View File

@ -1034,6 +1034,12 @@
<input class="input-xlarge focused" id="focusedInput" type="text" value="This is focused…"> <input class="input-xlarge focused" id="focusedInput" type="text" value="This is focused…">
</div> </div>
</div> </div>
<div class="control-group">
<label class="control-label">Uneditable input</label>
<div class="controls">
<span class="input-xlarge uneditable-input">Some value here</span>
</div>
</div>
<div class="control-group"> <div class="control-group">
<label class="control-label" for="disabledInput">Disabled input</label> <label class="control-label" for="disabledInput">Disabled input</label>
<div class="controls"> <div class="controls">
@ -1491,6 +1497,7 @@
</div> </div>
</section> </section>
<!-- Footer <!-- Footer
================================================== --> ================================================== -->
<footer class="footer"> <footer class="footer">