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

Conflicts:
	bootstrap.css
This commit is contained in:
Jacob Thornton
2011-11-30 22:05:49 -08:00
15 changed files with 539 additions and 451 deletions

438
bootstrap.css vendored
View File

@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Mon Nov 28 11:50:42 PST 2011
* Date: Wed Nov 30 22:05:44 PST 2011
*/
html, body {
margin: 0;
@@ -514,6 +514,9 @@ pre {
white-space: pre-wrap;
word-break: break-all;
}
pre.prettyprint {
margin-bottom: 18px;
}
pre code {
padding: 0;
background-color: transparent;
@@ -657,7 +660,7 @@ select.span2,
.uneditable-input.span2 {
display: inline-block;
float: none;
width: 150px;
width: 130px;
margin-left: 0;
}
input.span3,
@@ -666,7 +669,7 @@ select.span3,
.uneditable-input.span3 {
display: inline-block;
float: none;
width: 250px;
width: 210px;
margin-left: 0;
}
input.span4,
@@ -675,7 +678,7 @@ select.span4,
.uneditable-input.span4 {
display: inline-block;
float: none;
width: 350px;
width: 290px;
margin-left: 0;
}
input.span5,
@@ -684,7 +687,7 @@ select.span5,
.uneditable-input.span5 {
display: inline-block;
float: none;
width: 450px;
width: 370px;
margin-left: 0;
}
input.span6,
@@ -693,7 +696,7 @@ select.span6,
.uneditable-input.span6 {
display: inline-block;
float: none;
width: 550px;
width: 450px;
margin-left: 0;
}
input.span7,
@@ -702,7 +705,7 @@ select.span7,
.uneditable-input.span7 {
display: inline-block;
float: none;
width: 650px;
width: 530px;
margin-left: 0;
}
input.span8,
@@ -711,7 +714,7 @@ select.span8,
.uneditable-input.span8 {
display: inline-block;
float: none;
width: 750px;
width: 610px;
margin-left: 0;
}
input.span9,
@@ -720,7 +723,7 @@ select.span9,
.uneditable-input.span9 {
display: inline-block;
float: none;
width: 850px;
width: 690px;
margin-left: 0;
}
input.span10,
@@ -729,7 +732,7 @@ select.span10,
.uneditable-input.span10 {
display: inline-block;
float: none;
width: 950px;
width: 770px;
margin-left: 0;
}
input.span11,
@@ -738,7 +741,7 @@ select.span11,
.uneditable-input.span11 {
display: inline-block;
float: none;
width: 1050px;
width: 850px;
margin-left: 0;
}
input.span12,
@@ -747,7 +750,7 @@ select.span12,
.uneditable-input.span12 {
display: inline-block;
float: none;
width: 1150px;
width: 930px;
margin-left: 0;
}
input.span13,
@@ -756,7 +759,7 @@ select.span13,
.uneditable-input.span13 {
display: inline-block;
float: none;
width: 1250px;
width: 1010px;
margin-left: 0;
}
input.span14,
@@ -765,7 +768,7 @@ select.span14,
.uneditable-input.span14 {
display: inline-block;
float: none;
width: 1350px;
width: 1090px;
margin-left: 0;
}
input.span15,
@@ -774,7 +777,7 @@ select.span15,
.uneditable-input.span15 {
display: inline-block;
float: none;
width: 1450px;
width: 1170px;
margin-left: 0;
}
input.span16,
@@ -783,7 +786,7 @@ select.span16,
.uneditable-input.span16 {
display: inline-block;
float: none;
width: 1550px;
width: 1250px;
margin-left: 0;
}
input[disabled],
@@ -796,56 +799,56 @@ textarea[readonly] {
border-color: #ddd;
cursor: not-allowed;
}
form .clearfix.error > label, form .clearfix.error .help-block, form .clearfix.error .help-inline {
.control-group.error > label, .control-group.error .help-block, .control-group.error .help-inline {
color: #b94a48;
}
form .clearfix.error input, form .clearfix.error textarea {
.control-group.error input, .control-group.error textarea {
color: #b94a48;
border-color: #ee5f5b;
}
form .clearfix.error input:focus, form .clearfix.error textarea:focus {
.control-group.error input:focus, .control-group.error textarea:focus {
border-color: #e9322d;
-webkit-box-shadow: 0 0 6px #f8b9b7;
-moz-box-shadow: 0 0 6px #f8b9b7;
box-shadow: 0 0 6px #f8b9b7;
}
form .clearfix.error .input-prepend .add-on, form .clearfix.error .input-append .add-on {
.control-group.error .input-prepend .add-on, .control-group.error .input-append .add-on {
color: #b94a48;
background-color: #fce6e6;
border-color: #b94a48;
}
form .clearfix.warning > label, form .clearfix.warning .help-block, form .clearfix.warning .help-inline {
.control-group.warning > label, .control-group.warning .help-block, .control-group.warning .help-inline {
color: #c09853;
}
form .clearfix.warning input, form .clearfix.warning textarea {
.control-group.warning input, .control-group.warning textarea {
color: #c09853;
border-color: #ccae64;
}
form .clearfix.warning input:focus, form .clearfix.warning textarea:focus {
.control-group.warning input:focus, .control-group.warning textarea:focus {
border-color: #be9a3f;
-webkit-box-shadow: 0 0 6px #e5d6b1;
-moz-box-shadow: 0 0 6px #e5d6b1;
box-shadow: 0 0 6px #e5d6b1;
}
form .clearfix.warning .input-prepend .add-on, form .clearfix.warning .input-append .add-on {
.control-group.warning .input-prepend .add-on, .control-group.warning .input-append .add-on {
color: #c09853;
background-color: #d2b877;
border-color: #c09853;
}
form .clearfix.success > label, form .clearfix.success .help-block, form .clearfix.success .help-inline {
.control-group.success > label, .control-group.success .help-block, .control-group.success .help-inline {
color: #468847;
}
form .clearfix.success input, form .clearfix.success textarea {
.control-group.success input, .control-group.success textarea {
color: #468847;
border-color: #57a957;
}
form .clearfix.success input:focus, form .clearfix.success textarea:focus {
.control-group.success input:focus, .control-group.success textarea:focus {
border-color: #458845;
-webkit-box-shadow: 0 0 6px #9acc9a;
-moz-box-shadow: 0 0 6px #9acc9a;
box-shadow: 0 0 6px #9acc9a;
}
form .clearfix.success .input-prepend .add-on, form .clearfix.success .input-append .add-on {
.control-group.success .input-prepend .add-on, .control-group.success .input-append .add-on {
color: #468847;
background-color: #bcddbc;
border-color: #468847;
@@ -982,43 +985,38 @@ form .clearfix.success .input-prepend .add-on, form .clearfix.success .input-app
}
table {
width: 100%;
padding: 0;
margin-bottom: 18px;
font-size: 13px;
border-collapse: collapse;
}
table th, table td {
padding: 10px 10px 9px;
th, td {
padding: 8px;
line-height: 18px;
text-align: left;
border-bottom: 1px solid #ddd;
}
table th {
padding-top: 9px;
th {
font-weight: bold;
vertical-align: middle;
vertical-align: bottom;
}
table td {
td {
vertical-align: top;
border-top: 1px solid #ddd;
}
table tbody th {
border-top: 1px solid #ddd;
vertical-align: top;
tbody tr:last-child th, tbody tr:last-child td {
border-bottom: 0;
}
.condensed-table th, .condensed-table td {
padding: 5px 5px 4px;
padding: 4px 5px;
}
.bordered-table {
border: 1px solid #ddd;
border-collapse: separate;
*border-collapse: collapse;
/* IE7, collapse table to remove spacing */
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
}
.bordered-table th + th, .bordered-table td + td, .bordered-table th + td {
.bordered-table th + th,
.bordered-table td + td,
.bordered-table th + td,
.bordered-table td + th {
border-left: 1px solid #ddd;
}
.bordered-table thead:first-child tr:first-child th:first-child, .bordered-table tbody:first-child tr:first-child td:first-child {
@@ -1031,150 +1029,151 @@ table tbody th {
-moz-border-radius: 0 4px 0 0;
border-radius: 0 4px 0 0;
}
.bordered-table tbody tr:last-child td:first-child {
.bordered-table thead:last-child tr:last-child th:first-child, .bordered-table tbody:last-child tr:last-child td:first-child {
-webkit-border-radius: 0 0 0 4px;
-moz-border-radius: 0 0 0 4px;
border-radius: 0 0 0 4px;
}
.bordered-table tbody tr:last-child td:last-child {
.bordered-table thead:last-child tr:last-child th:last-child, .bordered-table tbody:last-child tr:last-child td:last-child {
-webkit-border-radius: 0 0 4px 0;
-moz-border-radius: 0 0 4px 0;
border-radius: 0 0 4px 0;
}
table .span1 {
width: 40px;
}
table .span2 {
width: 120px;
}
table .span3 {
width: 200px;
}
table .span4 {
width: 280px;
}
table .span5 {
width: 360px;
}
table .span6 {
width: 440px;
}
table .span7 {
width: 520px;
}
table .span8 {
width: 600px;
}
table .span9 {
width: 680px;
}
table .span10 {
width: 760px;
}
table .span11 {
width: 840px;
}
table .span12 {
width: 920px;
}
table .span13 {
width: 1000px;
}
table .span14 {
width: 1080px;
}
table .span15 {
width: 1160px;
}
table .span16 {
width: 1240px;
}
.striped-table tbody tr:nth-child(odd) td, .striped-table tbody tr:nth-child(odd) th {
background-color: #f9f9f9;
}
.striped-table tbody tr:hover td, .striped-table tbody tr:hover th {
background-color: #f5f5f5;
/*
// ----------------
// This is a duplication of the main grid .columns() mixin, but subtracts 20px to account for input padding and border
.tableColumns(@columnSpan: 1) {
width: ((@gridColumnWidth - 20) * @columnSpan) + ((@gridColumnWidth - 20) * (@columnSpan - 1));
}
table .header {
cursor: pointer;
}
table .header:after {
float: right;
margin-top: 7px;
border-width: 0 4px 4px;
border-style: solid;
border-color: #000 transparent;
content: "";
visibility: hidden;
}
table .headerSortUp, table .headerSortDown {
text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
background-color: rgba(141, 192, 219, 0.25);
}
table .header:hover:after {
visibility: visible;
}
table .headerSortDown:after, table .headerSortDown:hover:after {
visibility: visible;
filter: alpha(opacity=60);
-moz-opacity: 0.6;
opacity: 0.6;
}
table .headerSortUp:after {
border-bottom: none;
border-left: 4px solid transparent;
border-right: 4px solid transparent;
border-top: 4px solid #000;
visibility: visible;
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
filter: alpha(opacity=60);
-moz-opacity: 0.6;
opacity: 0.6;
}
table .blue {
color: #049cdb;
border-bottom-color: #049cdb;
}
table .headerSortUp.blue, table .headerSortDown.blue {
background-color: #ade6fe;
}
table .green {
color: #46a546;
border-bottom-color: #46a546;
}
table .headerSortUp.green, table .headerSortDown.green {
background-color: #cdeacd;
}
table .red {
color: #9d261d;
border-bottom-color: #9d261d;
}
table .headerSortUp.red, table .headerSortDown.red {
background-color: #f4c8c5;
}
table .yellow {
color: #ffc40d;
border-bottom-color: #ffc40d;
}
table .headerSortUp.yellow, table .headerSortDown.yellow {
background-color: #fff6d9;
}
table .orange {
color: #f89406;
border-bottom-color: #f89406;
}
table .headerSortUp.orange, table .headerSortDown.orange {
background-color: #fee9cc;
}
table .purple {
color: #7a43b6;
border-bottom-color: #7a43b6;
}
table .headerSortUp.purple, table .headerSortDown.purple {
background-color: #e2d5f0;
table {
// Default columns
.span1 { .tableColumns(1); }
.span2 { .tableColumns(2); }
.span3 { .tableColumns(3); }
.span4 { .tableColumns(4); }
.span5 { .tableColumns(5); }
.span6 { .tableColumns(6); }
.span7 { .tableColumns(7); }
.span8 { .tableColumns(8); }
.span9 { .tableColumns(9); }
.span10 { .tableColumns(10); }
.span11 { .tableColumns(11); }
.span12 { .tableColumns(12); }
.span13 { .tableColumns(13); }
.span14 { .tableColumns(14); }
.span15 { .tableColumns(15); }
.span16 { .tableColumns(16); }
}
// TABLESORTER
// -----------
table {
// Tablesorting styles w/ jQuery plugin
.header {
cursor: pointer;
&:after {
float: right;
margin-top: 7px;
border-width: 0 4px 4px;
border-style: solid;
border-color: #000 transparent;
content: "";
visibility: hidden;
}
}
// Style the sorted column headers (THs)
.headerSortUp,
.headerSortDown {
text-shadow: 0 1px 1px rgba(255,255,255,.75);
background-color: rgba(141,192,219,.25);
}
// Style the ascending (reverse alphabetical) column header
.header:hover {
&:after {
visibility: visible;
}
}
// Style the descending (alphabetical) column header
.headerSortDown,
.headerSortDown:hover {
&:after {
visibility: visible;
.opacity(60);
}
}
// Style the ascending (reverse alphabetical) column header
.headerSortUp {
&:after {
border-bottom: none;
border-left: 4px solid transparent;
border-right: 4px solid transparent;
border-top: 4px solid #000;
visibility:visible;
.box-shadow(none); //can't add boxshadow to downward facing arrow :(
.opacity(60);
}
}
// Blue Table Headings
.blue {
color: @blue;
border-bottom-color: @blue;
}
.headerSortUp.blue,
.headerSortDown.blue {
background-color: lighten(@blue, 40%);
}
// Green Table Headings
.green {
color: @green;
border-bottom-color: @green;
}
.headerSortUp.green,
.headerSortDown.green {
background-color: lighten(@green, 40%);
}
// Red Table Headings
.red {
color: @red;
border-bottom-color: @red;
}
.headerSortUp.red,
.headerSortDown.red {
background-color: lighten(@red, 50%);
}
// Yellow Table Headings
.yellow {
color: @yellow;
border-bottom-color: @yellow;
}
.headerSortUp.yellow,
.headerSortDown.yellow {
background-color: lighten(@yellow, 40%);
}
// Orange Table Headings
.orange {
color: @orange;
border-bottom-color: @orange;
}
.headerSortUp.orange,
.headerSortDown.orange {
background-color: lighten(@orange, 40%);
}
// Purple Table Headings
.purple {
color: @purple;
border-bottom-color: @purple;
}
.headerSortUp.purple,
.headerSortDown.purple {
background-color: lighten(@purple, 40%);
}
}*/
.navbar {
height: 40px;
overflow: visible;
@@ -2089,6 +2088,91 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
.tab-content > .active, .pill-content > .active {
display: block;
}
.step-nav {
position: relative;
margin: 0 0 18px;
list-style: none;
line-height: 30px;
text-align: center;
background-color: #f5f5f5;
-webkit-border-radius: 15px;
-moz-border-radius: 15px;
border-radius: 15px;
}
.step-nav li {
display: inline;
color: #bfbfbf;
}
.step-nav .prev, .step-nav .next {
position: absolute;
top: 6px;
}
.step-nav .prev {
left: 15px;
}
.step-nav .next {
right: 15px;
}
.step-nav .dot {
display: inline-block;
width: 10px;
height: 10px;
margin: 0 3px;
text-indent: -999em;
background-color: #bfbfbf;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.25);
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.25);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.25);
}
.step-nav .dot:hover, .step-nav .active .dot {
background-color: #404040;
}
.subnav {
position: relative;
background-color: #eeeeee;
background-image: -khtml-gradient(linear, left top, left bottom, from(#f5f5f5), to(#eeeeee));
background-image: -moz-linear-gradient(top, #f5f5f5, #eeeeee);
background-image: -ms-linear-gradient(top, #f5f5f5, #eeeeee);
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f5f5f5), color-stop(100%, #eeeeee));
background-image: -webkit-linear-gradient(top, #f5f5f5, #eeeeee);
background-image: -o-linear-gradient(top, #f5f5f5, #eeeeee);
background-image: linear-gradient(top, #f5f5f5, #eeeeee);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#eeeeee', GradientType=0);
-webkit-border-radius: 6px;
-moz-border-radius: 6px;
border-radius: 6px;
}
.subnav a {
padding: 10px 15px;
color: #0069d6;
text-shadow: 0 1px 0 #fff;
border-left: 1px solid #f9f9f9;
border-right: 1px solid #e5e5e5;
}
.subnav a:hover {
color: #00438a;
background-color: #eee;
}
.subnav li:first-child a {
border-left: 0;
-webkit-border-radius: 6px 0 0 6px;
-moz-border-radius: 6px 0 0 6px;
border-radius: 6px 0 0 6px;
}
.subnav li:last-child a {
border-right: 0;
-webkit-border-radius: 0 6px 6px 0;
-moz-border-radius: 0 6px 6px 0;
border-radius: 0 6px 6px 0;
}
.subnav ul .active > a {
color: #404040;
background-color: #eee;
}
.breadcrumb {
padding: 7px 14px;
margin: 0 0 18px;