diff --git a/README.md b/README.md
index ad51b16fc163fc6ac491f0d98c74ba236785e41d..fd97265840b9704b7690c647efe48a2ca3c16a0d 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ Here's what the LESS version looks like:
<script src="less.js" type="text/javascript"></script>
```
-Or if you prefer, the standard css way:
+Or if you prefer, the standard CSS way:
``` html
<link rel="stylesheet" type="text/css" href="bootstrap.css">
@@ -72,7 +72,7 @@ http://groups.google.com/group/twitter-bootstrap
Developers
----------
-We have included a makefile with convenience methods for working with the bootstrap library.
+We have included a makefile with convenience methods for working with the Bootstrap library.
+ **build** - `make build`
This will run the less compiler on the bootstrap lib and generate a bootstrap.css and bootstrap.min.css file.
diff --git a/bootstrap.css b/bootstrap.css
index 462c254a8a758bafa9ef7378983de6d04246d721..afd87d1372665cc0006c8e4ebaec723e1f7653c0 100644
--- a/bootstrap.css
+++ b/bootstrap.css
@@ -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;
-}
-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;
+/*
+// ----------------
+
+// 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 .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;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 2a802744cf319d3b150c62496cb32010c9c48c1c..d8ee06c1565b9e22aabb25a7b2a21f488eb5e6d7 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -89,7 +89,8 @@ blockquote.pull-right{float:right;}blockquote.pull-right p,blockquote.pull-right
address{display:block;margin-bottom:18px;line-height:18px;}
code,pre{padding:0 3px 2px;font-family:"Menlo",Monaco,Courier New,monospace;font-size:12px;color:#404040;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
code{padding:1px 3px;background-color:#fee9cc;}
-pre{display:block;padding:8.5px;margin:0 0 9px;font-size:12px;line-height:18px;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;white-space:pre;white-space:pre-wrap;word-break:break-all;}pre code{padding:0;background-color:transparent;}
+pre{display:block;padding:8.5px;margin:0 0 9px;font-size:12px;line-height:18px;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;white-space:pre;white-space:pre-wrap;word-break:break-all;}pre.prettyprint{margin-bottom:18px;}
+pre code{padding:0;background-color:transparent;}
form{margin-bottom:18px;}
legend{display:block;width:100%;margin-bottom:27px;font-size:19.5px;line-height:36px;color:#404040;border-bottom:1px solid #eee;}
label,input,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:normal;font-weight:13px;line-height:18px;}
@@ -111,31 +112,31 @@ input[type=file]:focus,input[type=checkbox]:focus,select:focus{-webkit-box-shado
.input-xlarge{width:270px;}
.input-xxlarge{width:530px;}
input.span1,textarea.span1,select.span1,.uneditable-input.span1{display:inline-block;float:none;width:50px;margin-left:0;}
-input.span2,textarea.span2,select.span2,.uneditable-input.span2{display:inline-block;float:none;width:150px;margin-left:0;}
-input.span3,textarea.span3,select.span3,.uneditable-input.span3{display:inline-block;float:none;width:250px;margin-left:0;}
-input.span4,textarea.span4,select.span4,.uneditable-input.span4{display:inline-block;float:none;width:350px;margin-left:0;}
-input.span5,textarea.span5,select.span5,.uneditable-input.span5{display:inline-block;float:none;width:450px;margin-left:0;}
-input.span6,textarea.span6,select.span6,.uneditable-input.span6{display:inline-block;float:none;width:550px;margin-left:0;}
-input.span7,textarea.span7,select.span7,.uneditable-input.span7{display:inline-block;float:none;width:650px;margin-left:0;}
-input.span8,textarea.span8,select.span8,.uneditable-input.span8{display:inline-block;float:none;width:750px;margin-left:0;}
-input.span9,textarea.span9,select.span9,.uneditable-input.span9{display:inline-block;float:none;width:850px;margin-left:0;}
-input.span10,textarea.span10,select.span10,.uneditable-input.span10{display:inline-block;float:none;width:950px;margin-left:0;}
-input.span11,textarea.span11,select.span11,.uneditable-input.span11{display:inline-block;float:none;width:1050px;margin-left:0;}
-input.span12,textarea.span12,select.span12,.uneditable-input.span12{display:inline-block;float:none;width:1150px;margin-left:0;}
-input.span13,textarea.span13,select.span13,.uneditable-input.span13{display:inline-block;float:none;width:1250px;margin-left:0;}
-input.span14,textarea.span14,select.span14,.uneditable-input.span14{display:inline-block;float:none;width:1350px;margin-left:0;}
-input.span15,textarea.span15,select.span15,.uneditable-input.span15{display:inline-block;float:none;width:1450px;margin-left:0;}
-input.span16,textarea.span16,select.span16,.uneditable-input.span16{display:inline-block;float:none;width:1550px;margin-left:0;}
+input.span2,textarea.span2,select.span2,.uneditable-input.span2{display:inline-block;float:none;width:130px;margin-left:0;}
+input.span3,textarea.span3,select.span3,.uneditable-input.span3{display:inline-block;float:none;width:210px;margin-left:0;}
+input.span4,textarea.span4,select.span4,.uneditable-input.span4{display:inline-block;float:none;width:290px;margin-left:0;}
+input.span5,textarea.span5,select.span5,.uneditable-input.span5{display:inline-block;float:none;width:370px;margin-left:0;}
+input.span6,textarea.span6,select.span6,.uneditable-input.span6{display:inline-block;float:none;width:450px;margin-left:0;}
+input.span7,textarea.span7,select.span7,.uneditable-input.span7{display:inline-block;float:none;width:530px;margin-left:0;}
+input.span8,textarea.span8,select.span8,.uneditable-input.span8{display:inline-block;float:none;width:610px;margin-left:0;}
+input.span9,textarea.span9,select.span9,.uneditable-input.span9{display:inline-block;float:none;width:690px;margin-left:0;}
+input.span10,textarea.span10,select.span10,.uneditable-input.span10{display:inline-block;float:none;width:770px;margin-left:0;}
+input.span11,textarea.span11,select.span11,.uneditable-input.span11{display:inline-block;float:none;width:850px;margin-left:0;}
+input.span12,textarea.span12,select.span12,.uneditable-input.span12{display:inline-block;float:none;width:930px;margin-left:0;}
+input.span13,textarea.span13,select.span13,.uneditable-input.span13{display:inline-block;float:none;width:1010px;margin-left:0;}
+input.span14,textarea.span14,select.span14,.uneditable-input.span14{display:inline-block;float:none;width:1090px;margin-left:0;}
+input.span15,textarea.span15,select.span15,.uneditable-input.span15{display:inline-block;float:none;width:1170px;margin-left:0;}
+input.span16,textarea.span16,select.span16,.uneditable-input.span16{display:inline-block;float:none;width:1250px;margin-left:0;}
input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{background-color:#f5f5f5;border-color:#ddd;cursor:not-allowed;}
-form .clearfix.error>label,form .clearfix.error .help-block,form .clearfix.error .help-inline{color:#b94a48;}
-form .clearfix.error input,form .clearfix.error textarea{color:#b94a48;border-color:#ee5f5b;}form .clearfix.error input:focus,form .clearfix.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{color:#b94a48;background-color:#fce6e6;border-color:#b94a48;}
-form .clearfix.warning>label,form .clearfix.warning .help-block,form .clearfix.warning .help-inline{color:#c09853;}
-form .clearfix.warning input,form .clearfix.warning textarea{color:#c09853;border-color:#ccae64;}form .clearfix.warning input:focus,form .clearfix.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{color:#c09853;background-color:#d2b877;border-color:#c09853;}
-form .clearfix.success>label,form .clearfix.success .help-block,form .clearfix.success .help-inline{color:#468847;}
-form .clearfix.success input,form .clearfix.success textarea{color:#468847;border-color:#57a957;}form .clearfix.success input:focus,form .clearfix.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{color:#468847;background-color:#bcddbc;border-color:#468847;}
+.control-group.error>label,.control-group.error .help-block,.control-group.error .help-inline{color:#b94a48;}
+.control-group.error input,.control-group.error textarea{color:#b94a48;border-color:#ee5f5b;}.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;}
+.control-group.error .input-prepend .add-on,.control-group.error .input-append .add-on{color:#b94a48;background-color:#fce6e6;border-color:#b94a48;}
+.control-group.warning>label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#c09853;}
+.control-group.warning input,.control-group.warning textarea{color:#c09853;border-color:#ccae64;}.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;}
+.control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#c09853;background-color:#d2b877;border-color:#c09853;}
+.control-group.success>label,.control-group.success .help-block,.control-group.success .help-inline{color:#468847;}
+.control-group.success input,.control-group.success textarea{color:#468847;border-color:#57a957;}.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;}
+.control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#468847;background-color:#bcddbc;border-color:#468847;}
.form-actions{padding:17px 20px 18px;margin-top:18px;margin-bottom:18px;background-color:#f5f5f5;border-top:1px solid #ddd;}
.uneditable-input{display:block;background-color:#ffffff;border-color:#eee;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);cursor:not-allowed;}
:-moz-placeholder{color:#bfbfbf;}
@@ -160,51 +161,18 @@ form .clearfix.success .input-prepend .add-on,form .clearfix.success .input-appe
.horizontal-form .controls{margin-left:150px;}
.horizontal-form .control-list{padding-top:6px;}
.horizontal-form .form-actions{padding-left:150px;}
-table{width:100%;padding:0;margin-bottom:18px;font-size:13px;border-collapse:collapse;}table th,table td{padding:10px 10px 9px;line-height:18px;text-align:left;}
-table th{padding-top:9px;font-weight:bold;vertical-align:middle;}
-table td{vertical-align:top;border-top:1px solid #ddd;}
-table tbody th{border-top:1px solid #ddd;vertical-align:top;}
-.condensed-table th,.condensed-table td{padding:5px 5px 4px;}
-.bordered-table{border:1px solid #ddd;border-collapse:separate;*border-collapse:collapse;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.bordered-table th+th,.bordered-table td+td,.bordered-table th+td{border-left:1px solid #ddd;}
+table{width:100%;margin-bottom:18px;}
+th,td{padding:8px;line-height:18px;text-align:left;border-bottom:1px solid #ddd;}
+th{font-weight:bold;vertical-align:bottom;}
+td{vertical-align:top;}
+tbody tr:last-child th,tbody tr:last-child td{border-bottom:0;}
+.condensed-table th,.condensed-table td{padding:4px 5px;}
+.bordered-table{border:1px solid #ddd;border-collapse:separate;-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 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{-webkit-border-radius:4px 0 0 0;-moz-border-radius:4px 0 0 0;border-radius:4px 0 0 0;}
.bordered-table thead:first-child tr:first-child th:last-child,.bordered-table tbody:first-child tr:first-child td:last-child{-webkit-border-radius:0 4px 0 0;-moz-border-radius:0 4px 0 0;border-radius:0 4px 0 0;}
-.bordered-table tbody 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{-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;}
+.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 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;}
.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;}
-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;}
.navbar{height:40px;overflow:visible;}
.navbar-inner{background-color:#222222;background-color:#222222;background-image:-khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);-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);}
.navbar a{color:#bfbfbf;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}
@@ -311,6 +279,16 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;
.pills-vertical>li{float:none;}
.tab-content>.tab-pane,.pill-content>.pill-pane{display:none;}
.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;background-color:#f5f5f5;background-image:-khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#f5f5f5));background-image:-moz-linear-gradient(top, #ffffff, #f5f5f5);background-image:-ms-linear-gradient(top, #ffffff, #f5f5f5);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #f5f5f5));background-image:-webkit-linear-gradient(top, #ffffff, #f5f5f5);background-image:-o-linear-gradient(top, #ffffff, #f5f5f5);background-image:linear-gradient(top, #ffffff, #f5f5f5);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);border:1px solid #ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;}.breadcrumb li{display:inline;text-shadow:0 1px 0 #ffffff;}
.breadcrumb .divider{padding:0 5px;color:#bfbfbf;}
.breadcrumb .active a{color:#404040;}
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 0873d443f6f017ba9dc5244221b5c66acfd3dda3..a7b52821e35f5dabac1ab11d043f2131a9e7a01c 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -39,45 +39,6 @@ body > .navbar-fixed .brand:hover {
}
-/* Github buttons
--------------------------------------------------- */
-.github-btn + .github-btn {
- margin-left: 10px;
-}
-.github-btn {
- display: inline-block;
- height: 20px;
- overflow: hidden;
-}
-.github-btn .btn,
-.github-btn .count {
- float: left;
- padding: 1px 5px 1px 4px;
- font-size: 11px;
- font-weight: bold;
- line-height: 16px;
- color: #666;
- text-shadow: 0 1px 0 #fff;
- -webkit-border-radius: 3px;
- -moz-border-radius: 3px;
- border-radius: 3px;
-}
-.github-btn .btn {
- box-shadow: none;
-}
-.github-btn .github-ico {
- float: left;
- margin-right: 4px;
- opacity: .65;
-}
-.github-btn .count {
- display: inline-block;
- margin-left: 2px;
- background-color: #fff;
- border: 1px solid #ddd;
-}
-
-
/* Jumbotrons
-------------------------------------------------- */
.jumbotron {
@@ -304,13 +265,6 @@ body > .navbar-fixed .brand:hover {
margin-left: 10px;
}
-/* scrollspy docs */
-
-.scrollspy-example {
- overflow: auto;
- height: 200px;
- position: relative;
-}
/* Popover docs
-------------------------------------------------- */
@@ -473,19 +427,3 @@ h2 + table {
}
}
-#accordion dt a{
- display:block;
- padding: 9px 15px;
- line-height: 1;
- background-color: whiteSmoke;
- border: 1px solid #EEE;
- border-top-color: #fff;
-}
-
-#accordion dt:first-child a {
- border-top-color:#eee;
-}
-
-#accordion dd p {
- padding: 10px;
-}
\ No newline at end of file
diff --git a/docs/base-css.html b/docs/base-css.html
index 11346b5b0284a0f72ca7e6c410a792fb0b0d6308..2b7d17b4a055241128b3fadeefa6abaca8bbc794 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -50,7 +50,7 @@
================================================== -->
<header class="jumbotron subhead" id="overview">
<h1>Base CSS</h1>
- <p class="lead">The core typography, form, and table styles of Bootstrap</p>
+ <p class="lead">On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.</p>
</header>
@@ -519,7 +519,7 @@
<h2>Table options</h2>
<table class="bordered-table striped-table">
- <thead>
+ <thead>
<tr>
<th>Name</th>
<th>Class</th>
@@ -551,7 +551,7 @@
<td>
<code>.condensed-table</code>
</td>
- <td>Cuts padding in half, from 10px to 5px, within all <code>td</code> and <code>th</code> elements</td>
+ <td>Cuts vertical padding in half, from 8px to 4px, within all <code>td</code> and <code>th</code> elements</td>
</tr>
</tbody>
</table>
@@ -630,7 +630,49 @@
<table class="striped-table">
...
</table></pre>
- <h3>3. Condensed table</h3>
+ <h3>3. Bordered table</h3>
+ <p>Add borders around the entire table and between each row, plus a bit of rounded corners for aesthetic purposes.</p>
+ <p><span class="label">Note</span> Bordered tables do not work well with <code>rowspan</code> due to somewhat hacky CSS applied to the tables. Sorry about that!</p>
+ <table class="bordered-table">
+ <thead>
+ <tr>
+ <th>#</th>
+ <th>First Name</th>
+ <th>Last Name</th>
+ <th>Language</th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr>
+ <td>1</td>
+ <td colspan="2">Some One</td>
+ <td>English</td>
+ </tr>
+ <tr>
+ <td>2</td>
+ <td>Joe</td>
+ <td>Sixpack</td>
+ <td>English</td>
+ </tr>
+ </tr>
+ <td>Joe</td>
+ <td>Sixpack</td>
+ <td>English</td>
+ </tr>
+ <tr>
+ <td>3</td>
+ <td>Stu</td>
+ <td>Dent</td>
+ <td>Code</td>
+ </tr>
+ </tbody>
+ </table>
+ <p><strong>Note:</strong> Zebra-striping is a progressive enhancement not available for older browsers like IE8 and below.</p>
+<pre class="prettyprint linenums">
+<table class="striped-table">
+ ...
+</table></pre>
+ <h3>4. Condensed table</h3>
<p>Make your tables more compact by adding the <code>.condensed-table</code> class to cut table cell padding in half (from 10px to 5px).</p>
<table class="condensed-table">
<thead>
@@ -666,7 +708,7 @@
<table class="condensed-table">
...
</table></pre>
- <h3>4. Striped table w/ TableSorter.js</h3>
+ <h3>5. Striped table w/ TableSorter.js</h3>
<p>Taking the previous example, we improve the usefulness of our tables by providing sorting functionality via <a href="http://jquery.com">jQuery</a> and the <a href="http://tablesorter.com/docs/">Tablesorter</a> plugin. <strong>Click any column’s header to change the sort.</strong></p>
<table class="striped-table" id="sortTableExample">
<thead>
diff --git a/docs/components.html b/docs/components.html
index bb2f326b46751cc67daa0e01096e52fa822cca30..833f532d9f73ef6402019e1cdb3a76774527635c 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -50,7 +50,7 @@
================================================== -->
<header class="jumbotron subhead" id="overview">
<h1>Components</h1>
- <p class="lead">Reusable patterns for navigation, alerts, popovers, and much more</p>
+ <p class="lead">Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.</p>
</header>
@@ -412,6 +412,28 @@
</div>
</div>
+ <!-- Step nav -->
+ <div class="row">
+ <div class="span3">
+ <h2>Step nav</h2>
+ <p>Placeholder for now!</p>
+ </div>
+ <div class="span9">
+ <br>
+ <ul class="step-nav">
+ <li class="prev"><a href="#">« Overview</a></li>
+ <li class="active"><a class="dot" href="#">1</a></li>
+ <li><a class="dot" href="#">2</a></li>
+ <li><a class="dot" href="#">3</a></li>
+ <li><a class="dot" href="#">4</a></li>
+ <li><a class="dot" href="#">5</a></li>
+ <li class="next"><a href="#">Base CSS »</a></li>
+ </ul>
+ <br>
+ <br>
+ </div>
+ </div>
+
<!-- Pagination -->
<div class="row">
<div class="span3">
diff --git a/docs/index.html b/docs/index.html
index 0517787417d7556d71d4c91d9ddc469e1c2e43d3..ff7d56976da1db06bd8a02cdef40114c731e406e 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -55,7 +55,8 @@
<h1>Bootstrap,<br> from Twitter</h1>
<p class="lead">Bootstrap is a responsive frontend toolkit from Twitter designed to kickstart web development, complete with core HTML, CSS, and JS for grids, type, forms, navigation, and many more components.</p>
<p class="download-info">
- <a href="#" class="btn primary btn-large">Download on GitHub</a>
+ <a href="https://github.com/twitter/bootstrap/" class="btn primary btn-large">Download on GitHub</a>
+ <a href="./scaffolding.html" class="btn btn-large">Get started</a>
Currently v2.0.0
</p>
@@ -82,22 +83,11 @@
<li><a href="https://github.com/twitter/bootstrap/wiki/Changelog">Changelog</a></li>
<li class="divider">·</li>
<li>
- <span class="github-btn github-watchers">
- <a href="https://github.com/twitter/bootstrap" class="btn">
- <img class="github-ico" src="assets/img/github-16px.png">
- Watch
- </a>
- <span class="count"></span>
- </span>
- <span class="github-btn github-forks">
- <a href="https://github.com/twitter/bootstrap" class="btn">
- <img class="github-ico" src="assets/img/github-16px.png">
- Fork
- </a>
- <span class="count"></span>
- </span>
+ <iframe class="github-btn" src="http://markdotto.github.com/github-buttons/github-btn.html?user=twitter&repo=bootstrap&type=watch&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="110px" height="20px"></iframe>
+ </li>
+ <li>
+ <iframe class="github-btn" src="http://markdotto.github.com/github-buttons/github-btn.html?user=twitter&repo=bootstrap&type=fork&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="94px" height="20px"></iframe>
</li>
-
<!--
<li><strong>Authors</strong></li>
<li><a href="http://twitter.com/mdo">@mdo</a></li>
@@ -190,23 +180,6 @@
</div><!--/row-->
</div>
-
-
-
-<!-- <h3>Quick-start examples</h3>
- <p>Need some quick templates? Check out these basic examples we've put together:</p>
- <ul class="media-grid">
- <li>
- <a href="../examples/hero.html"><img src="assets/img/example-diagram-01.png" alt="Simple three-column layout with hero unit"></a>
- </li>
- <li>
- <a href="../examples/fluid.html"><img src="assets/img/example-diagram-02.png" alt="Fluid layout with static sidebar"></a>
- </li>
- <li>
- <a href="../examples/container-app.html"><img src="assets/img/example-diagram-03.png" alt="Simple hanging container for apps"></a>
- </li>
- </ul>
- -->
</div><!-- /#overview -->
@@ -232,41 +205,5 @@
<script src="../js/bootstrap-scrollspy.js"></script>
<script src="assets/js/application.js"></script>
-
- <script type="text/javascript">
- $(document).ready(function($){
-
- function addCommas(nStr) {
- nStr += '';
- x = nStr.split('.');
- x1 = x[0];
- x2 = x.length > 1 ? '.' + x[1] : '';
- var rgx = /(\d+)(\d{3})/;
- while (rgx.test(x1)) {
- x1 = x1.replace(rgx, '$1' + ',' + '$2');
- }
- return x1 + x2;
- }
-
- // GITHUB
- window.repoCallback = function (obj) {
-
- // Variables
- var watchers = obj['repository']['watchers'];
- var forks = obj['repository']['forks'];
-
- // Echo out the counts in correct elements
- $('.github-watchers .count').html(addCommas(watchers));
- $('.github-forks .count').html(addCommas(forks));
-
- // Debug log
- // console.log("Watchers:" + watchers);
- // console.log("Forks:" + forks);
- }
- $.ajax("http://github.com/api/v2/json/repos/show/twitter/bootstrap?callback=repoCallback", {dataType: "jsonp"});
- });
-
- </script>
-
</body>
</html>
diff --git a/docs/javascript.html b/docs/javascript.html
index 2db37a9fe1590bd52df5eb9455fbf58186957dd9..09cdc714cbb9ab2005dccdff446e2f79a5254e28 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -83,7 +83,7 @@
================================================== -->
<header class="jumbotron subhead" id="overview">
<h1>Javascript for Bootstrap</h1>
- <p class="lead">Bring Bootstrap's components to life with custom plugins for <a href="http://jquery.com/" target="_blank">jQuery</a> and <a href="http://ender.no.de" target="_blank">Ender</a></p>
+ <p class="lead">Bring Bootstrap's components to life with flexible, custom javascript plugins for many of our custom components that work with <a href="http://jquery.com/" target="_blank">jQuery</a> and <a href="http://ender.no.de" target="_blank">Ender</a>.</p>
</header>
diff --git a/docs/less.html b/docs/less.html
index 2d35eea267a0d75753ef3e3e33d295029faecc6f..97d95a3ab963bfcd3a746b9b021da166f3cd34aa 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -50,7 +50,7 @@
================================================== -->
<header class="jumbotron subhead" id="overview">
<h1>Using LESS with Bootstrap</h1>
- <p class="lead">Be a boss and use Bootstrap's built-in variables, mixins, and more via LESS</p>
+ <p class="lead">Customize and extend Bootstrap with <a href="http://lesscss.org" target="_blank">LESS</a>, a CSS preprocessor, to take advantage of the variables, mixins, and more used to build Bootstrap's CSS.</p>
</header>
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 10ad71a748a62a101bc203190075f999336e5dd1..dd7f05bc642dabf45786dcf04bed873c70e0d862 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -50,9 +50,18 @@
================================================== -->
<header class="jumbotron subhead" id="overview">
<h1>Scaffolding</h1>
- <p class="lead">Responsive 12-column grid and fixed- and fluid-width layouts</p>
+ <p class="lead">Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.</p>
</header>
+ <!-- Work in progress sub nav for docs -->
+ <div class="navbar subnav docked-top">
+ <ul class="nav">
+ <li class="active"><a href="#">Grid system</a></li>
+ <li><a href="#">Layouts</a></li>
+ <li><a href="#">Responsive</a></li>
+ </ul>
+ </div>
+
<!-- Grid system
@@ -162,7 +171,7 @@
</div>
<h2>Grid customization</h2>
- <table class="striped-table">
+ <table class="bordered-table striped-table">
<thead>
<tr>
<th>Variable</th>
@@ -173,12 +182,12 @@
<tbody>
<tr>
<td><code>@gridColumns</code></td>
- <td>16</td>
+ <td>12</td>
<td>The number of columns within the grid</td>
</tr>
<tr>
<td><code>@gridColumnWidth</code></td>
- <td>40px</td>
+ <td>60px</td>
<td>The width of each column within the grid</td>
</tr>
<tr>
@@ -274,7 +283,7 @@
<div class="span8">
<h2>Supported devices</h2>
<p>Bootstrap supports a handful of media queries to help make your projects more appropriate on different devices and screen resolutions. Here's what's included:</p>
- <table class="striped-table">
+ <table class="bordered-table striped-table">
<thead>
<tr>
<th>Label</th>
diff --git a/js/README.md b/js/README.md
index 2655af68e232691476126e617fb59136729dc431..2eef9e735768390fd4e0de626851424bfb8d5cbd 100644
--- a/js/README.md
+++ b/js/README.md
@@ -1,13 +1,13 @@
-## 2.0 BOOTSTRAP JS PHILSOPHY
-These are the highlevel design rules which guide the developement of Bootstrap's js plugins.
+## 2.0 BOOTSTRAP JS PHILOSOPHY
+These are the high-level design rules which guide the development of Bootstrap's JS plugins.
---
### DATA-ATTRIBUTE API
-We believe you should be able to use all plugins provided by bootstrap purely through the markup api without writing a single line of javascript.
+We believe you should be able to use all plugins provided by Bootstrap purely through the markup API without writing a single line of javascript.
-We acknoledge that this isn't always the most performant and sometimes it may be desirable to turn this functionality off altogether. Therefore, as of 2.0 we provide the ability to disable the data attribute api by unbinding all events on the body namespaced with `'data-api'`. This looks like this:
+We acknowledge that this isn't always the most performant and sometimes it may be desirable to turn this functionality off altogether. Therefore, as of 2.0 we provide the ability to disable the data attribute API by unbinding all events on the body namespaced with `'data-api'`. This looks like this:
$('body').unbind('.data-api')
@@ -19,13 +19,13 @@ To target a specific plugin, just include the plugins name as a namespace along
### PROGRAMATIC API
-We also believe you should be able to use all plugins provided by bootstrap purely through the JS api.
+We also believe you should be able to use all plugins provided by Bootstrap purely through the JS API.
-All pubilc APIs should be a single, chainable method, and return the collection acted upon.
+All public APIs should be a single, chainable method, and return the collection acted upon.
$(".btn.danger").button("toggle").addClass("fat")
-All methods should accept an optional options object, a string which targets a particular method, or null which innitiates the default behavior:
+All methods should accept an optional options object, a string which targets a particular method, or null which initiates the default behavior:
$("#myModal").modal() // initialized with defaults
@@ -39,7 +39,7 @@ All plugins should have a default object which can be modified to effect all ins
$.fn.modal.defaults = { … }
-An options definiton should take the following form:
+An options definition should take the following form:
*noun*: *adjective* - describes or modifies a quality of an instance
diff --git a/lib/forms.less b/lib/forms.less
index 39c2937999b743a24ee9a92810d27c87bcc0171b..e85b9f2015c291c5dc1e2e60d313df2fe708ed78 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -145,7 +145,7 @@ select:focus {
.formColumns(@columnSpan: 1) {
display: inline-block;
float: none;
- width: ((@gridColumnWidth - 10) * @columnSpan) + ((@gridColumnWidth - 10) * (@columnSpan - 1));
+ width: ((@gridColumnWidth) * @columnSpan) + (@gridGutterWidth * (@columnSpan - 1)) - 10;
margin-left: 0;
}
input,
@@ -220,15 +220,15 @@ textarea[readonly] {
}
}
// Error
-form .clearfix.error {
+.control-group.error {
.formFieldState(#b94a48, #ee5f5b, lighten(#ee5f5b, 30%));
}
// Warning
-form .clearfix.warning {
+.control-group.warning {
.formFieldState(#c09853, #ccae64, lighten(#CCAE64, 5%));
}
// Success
-form .clearfix.success {
+.control-group.success {
.formFieldState(#468847, #57a957, lighten(#57a957, 30%));
}
diff --git a/lib/tables.less b/lib/tables.less
index 22a319918517a457091755a7f357e0b406005551..524f959f06ed542070a183bb7dc06364dc3b70bc 100644
--- a/lib/tables.less
+++ b/lib/tables.less
@@ -4,45 +4,41 @@
// ----------------------------------------
+
// BASELINE STYLES
// ---------------
table {
width: 100%;
- padding: 0;
margin-bottom: @baseLineHeight;
- font-size: @baseFontSize;
- border-collapse: collapse;
- th,
- td {
- padding: 10px 10px 9px;
- line-height: @baseLineHeight;
- text-align: left;
- }
- th {
- padding-top: 9px;
- font-weight: bold;
- vertical-align: middle;
- }
- td {
- vertical-align: top;
- border-top: 1px solid #ddd;
- }
- // When scoped to row, fix th in tbody
- tbody th {
- border-top: 1px solid #ddd;
- vertical-align: top;
- }
+}
+th,
+td {
+ padding: 8px;
+ line-height: @baseLineHeight;
+ text-align: left;
+ border-bottom: 1px solid #ddd;
+}
+th {
+ font-weight: bold;
+ vertical-align: bottom;
+}
+td {
+ vertical-align: top;
+}
+tbody tr:last-child th,
+tbody tr:last-child td {
+ border-bottom: 0;
}
-// CONDENSED VERSION
-// -----------------
+// CONDENSED TABLE W/ HALF PADDING
+// -------------------------------
.condensed-table {
th,
td {
- padding: 5px 5px 4px;
+ padding: 4px 5px;
}
}
@@ -53,13 +49,14 @@ table {
.bordered-table {
border: 1px solid #ddd;
border-collapse: separate; // Done so we can round those corners!
- *border-collapse: collapse; /* IE7, collapse table to remove spacing */
.border-radius(4px);
th + th,
td + td,
- th + td {
+ th + td,
+ td + th {
border-left: 1px solid #ddd;
}
+ // For first th or td in the first row in the first thead or tbody
thead:first-child tr:first-child th:first-child,
tbody:first-child tr:first-child td:first-child {
.border-radius(4px 0 0 0);
@@ -68,15 +65,34 @@ table {
tbody:first-child tr:first-child td:last-child {
.border-radius(0 4px 0 0);
}
- tbody tr:last-child td:first-child {
+ // For first th or td in the first row in the first thead or tbody
+ thead:last-child tr:last-child th:first-child,
+ tbody:last-child tr:last-child td:first-child {
.border-radius(0 0 0 4px);
}
- tbody tr:last-child td:last-child {
+ thead:last-child tr:last-child th:last-child,
+ tbody:last-child tr:last-child td:last-child {
.border-radius(0 0 4px 0);
}
}
+// ZEBRA-STRIPING
+// --------------
+
+// Default zebra-stripe styles (alternating gray and transparent backgrounds)
+.striped-table {
+ tbody {
+ tr:nth-child(odd) td,
+ tr:nth-child(odd) th {
+ background-color: #f9f9f9;
+ }
+ }
+}
+
+
+
+/*
// ----------------
// This is a duplication of the main grid .columns() mixin, but subtracts 20px to account for input padding and border
@@ -104,24 +120,6 @@ table {
}
-// ZEBRA-STRIPING
-// --------------
-
-// Default zebra-stripe styles (alternating gray and transparent backgrounds)
-.striped-table {
- tbody {
- tr:nth-child(odd) td,
- tr:nth-child(odd) th {
- background-color: #f9f9f9;
- }
- tr:hover td,
- tr:hover th {
- background-color: #f5f5f5;
- }
- }
-}
-
-
// TABLESORTER
// -----------
@@ -225,4 +223,4 @@ table {
.headerSortDown.purple {
background-color: lighten(@purple, 40%);
}
-}
\ No newline at end of file
+}*/
diff --git a/lib/tabs-pills.less b/lib/tabs-pills.less
index 3ff08a67667014203870fc8d7a9c4da3113c5053..e9b58d04a5b4f06128e0d9bbd324c460b8aa90f0 100644
--- a/lib/tabs-pills.less
+++ b/lib/tabs-pills.less
@@ -216,3 +216,78 @@
.pill-content > .active {
display: block;
}
+
+
+// Step nav
+.step-nav {
+ position: relative; // for prev/next links
+ margin: 0 0 @baseLineHeight;
+ list-style: none;
+ line-height: 30px;
+ text-align: center;
+ background-color: #f5f5f5;
+ .border-radius(15px);
+ li {
+ display: inline;
+ color: @grayLight;
+ }
+ // prev/next links
+ .prev,
+ .next {
+ position: absolute;
+ top: 6px;
+ }
+ .prev {
+ left: 15px;
+ }
+ .next {
+ right: 15px;
+ }
+ // indicators for each step/page/item/etc
+ .dot {
+ display: inline-block;
+ width: 10px;
+ height: 10px;
+ margin: 0 3px;
+ text-indent: -999em;
+ background-color: @grayLight;
+ .border-radius(5px);
+ .box-shadow(inset 0 1px 1px rgba(0,0,0,.25));
+ }
+ .dot:hover,
+ .active .dot {
+ background-color: @grayDark;
+ }
+}
+
+
+// Subnav
+// STILL A WIP
+.subnav {
+ position: relative;
+ #gradient > .vertical(#f5f5f5, #eeeeee);
+ .border-radius(6px);
+ a {
+ padding: 10px 15px;
+ color: @linkColor;
+ text-shadow: 0 1px 0 #fff;
+ border-left: 1px solid #f9f9f9;
+ border-right: 1px solid #e5e5e5;
+ &:hover {
+ color: @linkColorHover;
+ background-color: #eee;
+ }
+ }
+ li:first-child a {
+ border-left: 0;
+ .border-radius(6px 0 0 6px);
+ }
+ li:last-child a {
+ border-right: 0;
+ .border-radius(0 6px 6px 0);
+ }
+ ul .active > a {
+ color: @grayDark;
+ background-color: #eee;
+ }
+}
\ No newline at end of file
diff --git a/lib/type.less b/lib/type.less
index 407a20ec29a5e40946e229675dd8600ae8735117..bdc99acdfa52c8fcf4167d2d067b2da7d6bea6ca 100644
--- a/lib/type.less
+++ b/lib/type.less
@@ -205,6 +205,11 @@ pre {
white-space: pre-wrap;
word-break: break-all;
+ // Make prettyprint styles more spaced out for readability
+ &.prettyprint {
+ margin-bottom: @baseLineHeight;
+ }
+
// Account for some code outputs that place code tags in pre tags
code {
padding: 0;