diff --git a/bootstrap.css b/bootstrap.css
index a7adebc693..94dbb099be 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: Thu Sep 15 23:09:33 PDT 2011
+ * Date: Fri Sep 16 10:51:22 PDT 2011
*/
/* Reset.less
* Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
@@ -226,19 +226,10 @@ body {
width: 220px;
}
.container-fluid > .content {
+ float: left;
min-width: 700px;
max-width: 1180px;
- margin-left: 240px;
- zoom: 1;
-}
-.container-fluid > .content:before, .container-fluid > .content:after {
- display: table;
- content: "";
- zoom: 1;
- *display: inline;
-}
-.container-fluid > .content:after {
- clear: both;
+ margin-left: 20px;
}
.hide {
display: none;
@@ -686,6 +677,9 @@ select, input[type=file] {
/* For IE7, add top margin to align select with labels */
}
+select[multiple] {
+ height: inherit;
+}
textarea {
height: auto;
}
@@ -1092,6 +1086,10 @@ table {
width: 100%;
margin-bottom: 18px;
padding: 0;
+ border-collapse: separate;
+ *border-collapse: collapse;
+ /* IE7, collapse table to remove spacing */
+
font-size: 13px;
border: 1px solid #ddd;
-webkit-border-radius: 4px;
@@ -1591,24 +1589,24 @@ a.menu:after, .dropdown-toggle:after {
top: 1px;
}
.tabs > li > a {
- margin-right: 2px;
padding: 0 15px;
- line-height: 35px;
+ margin-right: 2px;
+ line-height: 36px;
+ border: 1px solid transparent;
-webkit-border-radius: 4px 4px 0 0;
-moz-border-radius: 4px 4px 0 0;
border-radius: 4px 4px 0 0;
}
.tabs > li > a:hover {
- background-color: #eee;
- border-bottom: 1px solid #ddd;
text-decoration: none;
+ background-color: #eee;
+ border-color: #eee #eee #ddd;
}
.tabs > li.active > a {
- background-color: #ffffff;
- padding: 0 14px;
- border: 1px solid #ddd;
- border-bottom: 0;
color: #808080;
+ background-color: #ffffff;
+ border: 1px solid #ddd;
+ border-bottom-color: transparent;
}
.tabs .menu-dropdown, .tabs .dropdown-menu {
top: 35px;
@@ -1940,6 +1938,11 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
}
+.alert-message .close {
+ *margin-top: 3px;
+ /* IE7 spacing */
+
+}
.alert-message h5 {
line-height: 18px;
}
@@ -2253,8 +2256,8 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
height: 0;
}
.popover .inner {
- background: #333;
- background: rgba(0, 0, 0, 0.8);
+ background-color: #000000;
+ background-color: rgba(0, 0, 0, 0.8);
padding: 3px;
overflow: hidden;
width: 280px;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 76ca63f54f..e9ddd96fc3 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -27,8 +27,7 @@ body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:
.container-fluid{position:relative;padding-left:20px;padding-right:20px;zoom:1;}.container-fluid:before,.container-fluid:after{display:table;content:"";zoom:1;*display:inline;}
.container-fluid:after{clear:both;}
.container-fluid>.sidebar{float:left;width:220px;}
-.container-fluid>.content{min-width:700px;max-width:1180px;margin-left:240px;zoom:1;}.container-fluid>.content:before,.container-fluid>.content:after{display:table;content:"";zoom:1;*display:inline;}
-.container-fluid>.content:after{clear:both;}
+.container-fluid>.content{float:left;min-width:700px;max-width:1180px;margin-left:20px;}
.hide{display:none;}
.show{display:block;}
a{color:#0069d6;text-decoration:none;line-height:inherit;font-weight:inherit;}a:hover{color:#00438a;text-decoration:underline;}
@@ -118,6 +117,7 @@ input[type=checkbox],input[type=radio]{width:auto;height:auto;padding:0;margin:3
input[type=file]{background-color:#ffffff;padding:initial;border:initial;line-height:initial;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
input[type=button],input[type=reset],input[type=submit]{width:auto;height:auto;}
select,input[type=file]{height:27px;line-height:27px;*margin-top:4px;}
+select[multiple]{height:inherit;}
textarea{height:auto;}
.uneditable-input{background-color:#ffffff;display:block;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;}
@@ -180,7 +180,7 @@ input[disabled],select[disabled],textarea[disabled],input[readonly],select[reado
.form-stacked .inputs-list{margin-bottom:0;}.form-stacked .inputs-list li{padding-top:0;}.form-stacked .inputs-list li label{font-weight:normal;padding-top:0;}
.form-stacked div.clearfix.error{padding-top:10px;padding-bottom:10px;padding-left:10px;margin-top:0;margin-left:-10px;}
.form-stacked .actions{margin-left:-20px;padding-left:20px;}
-table{width:100%;margin-bottom:18px;padding:0;font-size:13px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}table th,table td{padding:10px 10px 9px;line-height:18px;text-align:left;}
+table{width:100%;margin-bottom:18px;padding:0;border-collapse:separate;*border-collapse:collapse;font-size:13px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}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;border-bottom:1px solid #ddd;}
table td{vertical-align:top;}
table th+th,table td+td{border-left:1px solid #ddd;}
@@ -240,8 +240,8 @@ a.menu:after,.dropdown-toggle:after{width:0;height:0;display:inline-block;conten
.tabs,.pills{margin:0 0 20px;padding:0;list-style:none;zoom:1;}.tabs:before,.pills:before,.tabs:after,.pills:after{display:table;content:"";zoom:1;*display:inline;}
.tabs:after,.pills:after{clear:both;}
.tabs>li,.pills>li{float:left;}.tabs>li>a,.pills>li>a{display:block;}
-.tabs{float:left;width:100%;border-bottom:1px solid #ddd;}.tabs>li{position:relative;top:1px;}.tabs>li>a{margin-right:2px;padding:0 15px;line-height:35px;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.tabs>li>a:hover{background-color:#eee;border-bottom:1px solid #ddd;text-decoration:none;}
-.tabs>li.active>a{background-color:#ffffff;padding:0 14px;border:1px solid #ddd;border-bottom:0;color:#808080;}
+.tabs{float:left;width:100%;border-bottom:1px solid #ddd;}.tabs>li{position:relative;top:1px;}.tabs>li>a{padding:0 15px;margin-right:2px;line-height:36px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.tabs>li>a:hover{text-decoration:none;background-color:#eee;border-color:#eee #eee #ddd;}
+.tabs>li.active>a{color:#808080;background-color:#ffffff;border:1px solid #ddd;border-bottom-color:transparent;}
.tabs .menu-dropdown,.tabs .dropdown-menu{top:35px;border-width:1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px 6px;border-radius:0 6px 6px 6px;}
.tabs a.menu:after,.tabs .dropdown-toggle:after{border-top-color:#999;margin-top:15px;margin-left:5px;}
.tabs li.open.menu .menu,.tabs .open.dropdown .dropdown-toggle{border-color:#999;}
@@ -273,7 +273,8 @@ footer{margin-top:17px;padding-top:17px;border-top:1px solid #eee;}
:root .alert-message,:root .btn{border-radius:0 \0;}
button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;border:0;}
.close{float:right;color:#000000;font-size:20px;font-weight:bold;line-height:13.5px;text-shadow:0 1px 0 #ffffff;filter:alpha(opacity=20);-khtml-opacity:0.2;-moz-opacity:0.2;opacity:0.2;}.close:hover{color:#000000;text-decoration:none;filter:alpha(opacity=40);-khtml-opacity:0.4;-moz-opacity:0.4;opacity:0.4;}
-.alert-message{position:relative;padding:7px 15px;margin-bottom:18px;color:#404040;background-color:#eedc94;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94));background-image:-moz-linear-gradient(top, #fceec1, #eedc94);background-image:-ms-linear-gradient(top, #fceec1, #eedc94);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94));background-image:-webkit-linear-gradient(top, #fceec1, #eedc94);background-image:-o-linear-gradient(top, #fceec1, #eedc94);background-image:linear-gradient(top, #fceec1, #eedc94);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fceec1', endColorstr='#eedc94', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#eedc94 #eedc94 #e4c652;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);border-width:1px;border-style:solid;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);}.alert-message h5{line-height:18px;}
+.alert-message{position:relative;padding:7px 15px;margin-bottom:18px;color:#404040;background-color:#eedc94;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94));background-image:-moz-linear-gradient(top, #fceec1, #eedc94);background-image:-ms-linear-gradient(top, #fceec1, #eedc94);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94));background-image:-webkit-linear-gradient(top, #fceec1, #eedc94);background-image:-o-linear-gradient(top, #fceec1, #eedc94);background-image:linear-gradient(top, #fceec1, #eedc94);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fceec1', endColorstr='#eedc94', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#eedc94 #eedc94 #e4c652;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);border-width:1px;border-style:solid;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.25);}.alert-message .close{*margin-top:3px;}
+.alert-message h5{line-height:18px;}
.alert-message p{margin-bottom:0;}
.alert-message div{margin-top:5px;margin-bottom:2px;line-height:28px;}
.alert-message .btn{-webkit-box-shadow:0 1px 0 rgba(255, 255, 255, 0.25);-moz-box-shadow:0 1px 0 rgba(255, 255, 255, 0.25);box-shadow:0 1px 0 rgba(255, 255, 255, 0.25);}
@@ -314,7 +315,7 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;
.popover.below .arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;}
.popover.left .arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;}
.popover .arrow{position:absolute;width:0;height:0;}
-.popover .inner{background:#333;background:rgba(0, 0, 0, 0.8);padding:3px;overflow:hidden;width:280px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);}
+.popover .inner{background-color:#000000;background-color:rgba(0, 0, 0, 0.8);padding:3px;overflow:hidden;width:280px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);}
.popover .title{background-color:#f5f5f5;padding:9px 15px;line-height:1;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;border-bottom:1px solid #eee;}
.popover .content{background-color:#ffffff;padding:14px;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.popover .content p,.popover .content ul,.popover .content ol{margin-bottom:0;}
.fade{-webkit-transition:opacity 0.15s linear;-moz-transition:opacity 0.15s linear;-ms-transition:opacity 0.15s linear;-o-transition:opacity 0.15s linear;transition:opacity 0.15s linear;opacity:0;}.fade.in{opacity:1;}
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index ef8b138ad0..fb727a900a 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -22,6 +22,7 @@ section > .row {
/* Jumbotrons
-------------------------------------------------- */
.jumbotron {
+ min-width: 940px;
padding-top: 40px;
}
.jumbotron .inner {
@@ -98,6 +99,7 @@ section > .row {
-------------------------------------------------- */
.footer {
background-color: #eee;
+ min-width: 940px;
padding: 30px 0;
text-shadow: 0 1px 0 #fff;
border-top: 1px solid #e5e5e5;
@@ -183,7 +185,6 @@ section > .row {
}
.show-grid [class*="span"] {
background: #eee;
- background: rgba(0,0,0,.1);
text-align: center;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
@@ -193,12 +194,14 @@ section > .row {
}
.show-grid:hover [class*="span"] {
background: #ddd;
- background: rgba(0,0,0,.2);
}
.show-grid .show-grid {
margin-top: 0;
margin-bottom: 0;
}
+.show-grid .show-grid [class*="span"] {
+ background-color: #ccc;
+}
/* Render mini layout previews
diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js
index 7400bc12ba..16a20e068e 100644
--- a/docs/assets/js/application.js
+++ b/docs/assets/js/application.js
@@ -20,6 +20,7 @@ $(document).ready(function(){
// Disable certain links in docs
// =============================
+ // Please do not carry these styles over to your projects, it's merely here to prevent button clicks form taking you away from your spot on page
$('ul.tabs a, ul.pills a, .pagination a, .well .btn, .actions .btn, .alert-message .btn, a.close').click(function (e) {
e.preventDefault()
diff --git a/docs/index.html b/docs/index.html
index 2edd852ba9..f99b756fe1 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -1005,6 +1005,18 @@
+
+
Multiple select
+
+
+ 1
+ 2
+ 3
+ 4
+ 5
+
+
+
Uneditable input
diff --git a/examples/container-app.html b/examples/container-app.html
index 6432ecf0d8..75328e645f 100644
--- a/examples/container-app.html
+++ b/examples/container-app.html
@@ -78,7 +78,7 @@
-
+
Project name
Home
About
diff --git a/examples/fluid.html b/examples/fluid.html
index 07012e5e9c..eacb5c3d2d 100644
--- a/examples/fluid.html
+++ b/examples/fluid.html
@@ -31,7 +31,7 @@
-
+
+
Hello, world!
+
Vestibulum id ligula porta felis euismod semper. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.
+
Learn more »
+
+
+
+
+
+
+
+
+
Heading
+
Etiam porta sem malesuada magna mollis euismod. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.
+
View details »
+
+
+
Heading
+
Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.
+
View details »
+
+
+
Heading
+
Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.
+
View details »
+
+
+
diff --git a/examples/hero.html b/examples/hero.html
index fab3d688b1..6ded6e1e95 100644
--- a/examples/hero.html
+++ b/examples/hero.html
@@ -31,7 +31,7 @@
-
+
Project name
Home
About
diff --git a/lib/forms.less b/lib/forms.less
index d6b1a693db..0da4037df7 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -111,6 +111,11 @@ input[type=file] {
*margin-top: 4px; /* For IE7, add top margin to align select with labels */
}
+// Make multiple select elements height not fixed
+select[multiple] {
+ height: inherit;
+}
+
textarea {
height: auto;
}
diff --git a/lib/patterns.less b/lib/patterns.less
index 543332086e..ce387614e9 100644
--- a/lib/patterns.less
+++ b/lib/patterns.less
@@ -342,22 +342,22 @@ a.menu:after,
position: relative; // For the dropdowns mostly
top: 1px;
> a {
- margin-right: 2px;
padding: 0 15px;
- line-height: (@baseline * 2) - 1;
+ margin-right: 2px;
+ line-height: @baseline * 2;
+ border: 1px solid transparent;
.border-radius(4px 4px 0 0);
&:hover {
- background-color: #eee;
- border-bottom: 1px solid #ddd;
text-decoration: none;
+ background-color: #eee;
+ border-color: #eee #eee #ddd;
}
}
&.active > a {
- background-color: @white;
- padding: 0 14px;
- border: 1px solid #ddd;
- border-bottom: 0;
color: @gray;
+ background-color: @white;
+ border: 1px solid #ddd;
+ border-bottom-color: transparent;
}
}
// first one for backwards compatibility
@@ -641,6 +641,11 @@ input[type=submit].btn {
.border-radius(4px);
.box-shadow(inset 0 1px 0 rgba(255,255,255,.25));
+ // Adjust close icon
+ .close {
+ *margin-top: 3px; /* IE7 spacing */
+ }
+
// Remove extra margin from content
h5 {
line-height: @baseline;
@@ -915,8 +920,8 @@ input[type=submit].btn {
height: 0;
}
.inner {
- background: #333;
- background: rgba(0,0,0,.8);
+ background-color: @black;
+ background-color: rgba(0,0,0,.8);
padding: 3px;
overflow: hidden;
width: 280px;
diff --git a/lib/scaffolding.less b/lib/scaffolding.less
index e4afa5aebf..13cc4f2b1f 100644
--- a/lib/scaffolding.less
+++ b/lib/scaffolding.less
@@ -33,17 +33,17 @@ body {
}
// TODO in v2: rename this and .popover .content to be more specific
> .content {
+ float: left;
min-width: 700px;
max-width: 1180px;
- margin-left: 240px;
- .clearfix();
+ margin-left: 20px;
}
}
+// Toggling content
.hide {
display: none;
}
-
.show {
display: block;
}
diff --git a/lib/tables.less b/lib/tables.less
index 886d8bedd0..988483f0ef 100644
--- a/lib/tables.less
+++ b/lib/tables.less
@@ -11,6 +11,8 @@ table {
width: 100%;
margin-bottom: @baseline;
padding: 0;
+ border-collapse: separate; // Done so we can round those corners!
+ *border-collapse: collapse; /* IE7, collapse table to remove spacing */
font-size: @basefont;
border: 1px solid #ddd;
.border-radius(4px);