2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-08 17:22:31 +03:00

Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip

Conflicts:
	docs/assets/bootstrap.zip
This commit is contained in:
Jacob Thornton
2012-04-04 15:13:27 -07:00
23 changed files with 440 additions and 186 deletions
Binary file not shown.
+65 -34
View File
@@ -139,6 +139,15 @@
.container-fluid {
padding: 0;
}
.dl-horizontal dt {
float: none;
clear: none;
width: auto;
text-align: left;
}
.dl-horizontal dd {
margin-left: 0;
}
.container {
width: auto;
}
@@ -148,16 +157,13 @@
.row {
margin-left: 0;
}
.row > [class*="span"],
.row-fluid > [class*="span"] {
[class*="span"],
.row-fluid [class*="span"] {
float: none;
display: block;
width: auto;
margin: 0;
}
.thumbnails [class*="span"] {
width: auto;
}
input[class*="span"],
select[class*="span"],
textarea[class*="span"],
@@ -174,8 +180,11 @@
-ms-box-sizing: border-box;
box-sizing: border-box;
}
.input-prepend input,
.input-append input,
.input-prepend input[class*="span"],
.input-append input[class*="span"] {
display: inline-block;
width: auto;
}
}
@@ -286,46 +295,57 @@
clear: both;
}
.row-fluid [class*="span"] {
display: block;
width: 100%;
min-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;
-moz-box-sizing: border-box;
-ms-box-sizing: border-box;
box-sizing: border-box;
float: left;
margin-left: 2.762430939%;
}
.row-fluid [class*="span"]:first-child {
margin-left: 0;
}
.row-fluid > .span12 {
.row-fluid .span12 {
width: 99.999999993%;
}
.row-fluid > .span11 {
.row-fluid .span11 {
width: 91.436464082%;
}
.row-fluid > .span10 {
.row-fluid .span10 {
width: 82.87292817100001%;
}
.row-fluid > .span9 {
.row-fluid .span9 {
width: 74.30939226%;
}
.row-fluid > .span8 {
.row-fluid .span8 {
width: 65.74585634900001%;
}
.row-fluid > .span7 {
.row-fluid .span7 {
width: 57.182320438000005%;
}
.row-fluid > .span6 {
.row-fluid .span6 {
width: 48.618784527%;
}
.row-fluid > .span5 {
.row-fluid .span5 {
width: 40.055248616%;
}
.row-fluid > .span4 {
.row-fluid .span4 {
width: 31.491712705%;
}
.row-fluid > .span3 {
.row-fluid .span3 {
width: 22.928176794%;
}
.row-fluid > .span2 {
.row-fluid .span2 {
width: 14.364640883%;
}
.row-fluid > .span1 {
.row-fluid .span1 {
width: 5.801104972%;
}
input,
@@ -477,46 +497,57 @@
clear: both;
}
.row-fluid [class*="span"] {
display: block;
width: 100%;
min-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;
-moz-box-sizing: border-box;
-ms-box-sizing: border-box;
box-sizing: border-box;
float: left;
margin-left: 2.564102564%;
}
.row-fluid [class*="span"]:first-child {
margin-left: 0;
}
.row-fluid > .span12 {
.row-fluid .span12 {
width: 100%;
}
.row-fluid > .span11 {
.row-fluid .span11 {
width: 91.45299145300001%;
}
.row-fluid > .span10 {
.row-fluid .span10 {
width: 82.905982906%;
}
.row-fluid > .span9 {
.row-fluid .span9 {
width: 74.358974359%;
}
.row-fluid > .span8 {
.row-fluid .span8 {
width: 65.81196581200001%;
}
.row-fluid > .span7 {
.row-fluid .span7 {
width: 57.264957265%;
}
.row-fluid > .span6 {
.row-fluid .span6 {
width: 48.717948718%;
}
.row-fluid > .span5 {
.row-fluid .span5 {
width: 40.170940171000005%;
}
.row-fluid > .span4 {
.row-fluid .span4 {
width: 31.623931624%;
}
.row-fluid > .span3 {
.row-fluid .span3 {
width: 23.076923077%;
}
.row-fluid > .span2 {
.row-fluid .span2 {
width: 14.529914530000001%;
}
.row-fluid > .span1 {
.row-fluid .span1 {
width: 5.982905983%;
}
input,
@@ -563,8 +594,8 @@
.thumbnails {
margin-left: -30px;
}
.thumbnails > li {
margin-left: 30px;
.row-fluid .thumbnails {
margin-left: 0;
}
}
@media (max-width: 979px) {
@@ -655,9 +686,9 @@
margin: 9px 0;
border-top: 1px solid #222222;
border-bottom: 1px solid #222222;
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
-webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1);
-moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1);
box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1);
}
.navbar .nav.pull-right {
float: none;
+75 -60
View File
@@ -254,46 +254,57 @@ a:hover {
clear: both;
}
.row-fluid [class*="span"] {
display: block;
width: 100%;
min-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;
-moz-box-sizing: border-box;
-ms-box-sizing: border-box;
box-sizing: border-box;
float: left;
margin-left: 2.127659574%;
}
.row-fluid [class*="span"]:first-child {
margin-left: 0;
}
.row-fluid > .span12 {
.row-fluid .span12 {
width: 99.99999998999999%;
}
.row-fluid > .span11 {
.row-fluid .span11 {
width: 91.489361693%;
}
.row-fluid > .span10 {
.row-fluid .span10 {
width: 82.97872339599999%;
}
.row-fluid > .span9 {
.row-fluid .span9 {
width: 74.468085099%;
}
.row-fluid > .span8 {
.row-fluid .span8 {
width: 65.95744680199999%;
}
.row-fluid > .span7 {
.row-fluid .span7 {
width: 57.446808505%;
}
.row-fluid > .span6 {
.row-fluid .span6 {
width: 48.93617020799999%;
}
.row-fluid > .span5 {
.row-fluid .span5 {
width: 40.425531911%;
}
.row-fluid > .span4 {
.row-fluid .span4 {
width: 31.914893614%;
}
.row-fluid > .span3 {
.row-fluid .span3 {
width: 23.404255317%;
}
.row-fluid > .span2 {
.row-fluid .span2 {
width: 14.89361702%;
}
.row-fluid > .span1 {
.row-fluid .span1 {
width: 6.382978723%;
}
.container {
@@ -447,6 +458,9 @@ dd {
margin-left: 9px;
}
.dl-horizontal dt {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
float: left;
clear: left;
width: 120px;
@@ -750,9 +764,9 @@ textarea {
input:focus,
textarea:focus {
border-color: rgba(82, 168, 236, 0.8);
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
-moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6);
outline: 0;
outline: thin dotted \9;
/* IE6-9 */
@@ -790,7 +804,11 @@ select:focus {
input[class*="span"],
select[class*="span"],
textarea[class*="span"],
.uneditable-input[class*="span"] {
.uneditable-input[class*="span"],
.row-fluid input[class*="span"],
.row-fluid select[class*="span"],
.row-fluid textarea[class*="span"],
.row-fluid .uneditable-input[class*="span"] {
float: none;
margin-left: 0;
}
@@ -2017,9 +2035,9 @@ button.close {
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
-webkit-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);
-webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
-moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
box-shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
cursor: pointer;
*margin-left: .3em;
/* Remove the border to prevent IE7's black border on input:focus */
@@ -2064,9 +2082,9 @@ button.close {
.btn.active,
.btn:active {
background-image: none;
-webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-webkit-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
-moz-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
background-color: #e6e6e6;
background-color: #d9d9d9 \9;
outline: 0;
@@ -2358,7 +2376,7 @@ input[type="submit"].btn.btn-mini {
*zoom: 1;
}
.btn-group .btn {
.btn-group > .btn {
position: relative;
float: left;
margin-left: -1px;
@@ -2366,7 +2384,7 @@ input[type="submit"].btn.btn-mini {
-moz-border-radius: 0;
border-radius: 0;
}
.btn-group .btn:first-child {
.btn-group > .btn:first-child {
margin-left: 0;
-webkit-border-top-left-radius: 4px;
-moz-border-radius-topleft: 4px;
@@ -2375,8 +2393,8 @@ input[type="submit"].btn.btn-mini {
-moz-border-radius-bottomleft: 4px;
border-bottom-left-radius: 4px;
}
.btn-group .btn:last-child,
.btn-group .dropdown-toggle {
.btn-group > .btn:last-child,
.btn-group > .dropdown-toggle {
-webkit-border-top-right-radius: 4px;
-moz-border-radius-topright: 4px;
border-top-right-radius: 4px;
@@ -2384,7 +2402,7 @@ input[type="submit"].btn.btn-mini {
-moz-border-radius-bottomright: 4px;
border-bottom-right-radius: 4px;
}
.btn-group .btn.large:first-child {
.btn-group > .btn.large:first-child {
margin-left: 0;
-webkit-border-top-left-radius: 6px;
-moz-border-radius-topleft: 6px;
@@ -2393,8 +2411,8 @@ input[type="submit"].btn.btn-mini {
-moz-border-radius-bottomleft: 6px;
border-bottom-left-radius: 6px;
}
.btn-group .btn.large:last-child,
.btn-group .large.dropdown-toggle {
.btn-group > .btn.large:last-child,
.btn-group > .large.dropdown-toggle {
-webkit-border-top-right-radius: 6px;
-moz-border-radius-topright: 6px;
border-top-right-radius: 6px;
@@ -2402,44 +2420,44 @@ input[type="submit"].btn.btn-mini {
-moz-border-radius-bottomright: 6px;
border-bottom-right-radius: 6px;
}
.btn-group .btn:hover,
.btn-group .btn:focus,
.btn-group .btn:active,
.btn-group .btn.active {
.btn-group > .btn:hover,
.btn-group > .btn:focus,
.btn-group > .btn:active,
.btn-group > .btn.active {
z-index: 2;
}
.btn-group .dropdown-toggle:active,
.btn-group.open .dropdown-toggle {
outline: 0;
}
.btn-group .dropdown-toggle {
.btn-group > .dropdown-toggle {
padding-left: 8px;
padding-right: 8px;
-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);
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,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
-moz-box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
box-shadow: inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
*padding-top: 3px;
*padding-bottom: 3px;
}
.btn-group .btn-mini.dropdown-toggle {
.btn-group > .btn-mini.dropdown-toggle {
padding-left: 5px;
padding-right: 5px;
*padding-top: 1px;
*padding-bottom: 1px;
}
.btn-group .btn-small.dropdown-toggle {
.btn-group > .btn-small.dropdown-toggle {
*padding-top: 4px;
*padding-bottom: 4px;
}
.btn-group .btn-large.dropdown-toggle {
.btn-group > .btn-large.dropdown-toggle {
padding-left: 12px;
padding-right: 12px;
}
.btn-group.open .dropdown-toggle {
background-image: none;
-webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
-webkit-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
-moz-box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
box-shadow: inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
}
.btn-group.open .btn.dropdown-toggle {
background-color: #e6e6e6;
@@ -2766,8 +2784,7 @@ input[type="submit"].btn.btn-mini {
clear: both;
}
.tab-content {
display: table;
width: 100%;
overflow: auto;
}
.tabs-below .nav-tabs,
.tabs-right .nav-tabs,
@@ -2802,10 +2819,6 @@ input[type="submit"].btn.btn-mini {
.tabs-below .nav-tabs .active > a:hover {
border-color: transparent #ddd #ddd #ddd;
}
.tabs-left .tab-content,
.tabs-right .tab-content {
width: auto;
}
.tabs-left .nav-tabs > li,
.tabs-right .nav-tabs > li {
float: none;
@@ -2876,9 +2889,9 @@ input[type="submit"].btn.btn-mini {
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
-moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
-webkit-box-shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);
-moz-box-shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);
box-shadow: 0 1px 3px rgba(0,0,0,.25), inset 0 -1px 0 rgba(0,0,0,.1);
}
.navbar .container {
width: auto;
@@ -2904,9 +2917,9 @@ input[type="submit"].btn.btn-mini {
*background-color: #222222;
/* Darken IE7 buttons by default so they stand out more given they won't have borders */
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
-webkit-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);
-moz-box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);
box-shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075);
}
.btn-navbar:hover,
.btn-navbar:active,
@@ -3023,9 +3036,9 @@ input[type="submit"].btn.btn-mini {
color: #ffffff;
background-color: #626262;
border: 1px solid #151515;
-webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15);
-moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15);
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,.1), 0 1px 0px rgba(255,255,255,.15);
-moz-box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15);
box-shadow: inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0px rgba(255,255,255,.15);
-webkit-transition: none;
-moz-transition: none;
-ms-transition: none;
@@ -3617,9 +3630,11 @@ input[type="submit"].btn.btn-mini {
.thumbnails:after {
clear: both;
}
.row-fluid .thumbnails {
margin-left: 0;
}
.thumbnails > li {
float: left;
margin: 0 0 18px 20px;
margin-bottom: 18px;
}
.thumbnail {
display: block;