+
<div class="container-fluid">
- <div class="row-fluid">
+ <div class="row">
<div class="span2">
<!--Sidebar content-->
</div>
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index e48cdb8bb2..e41aa408ef 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -449,7 +449,7 @@
{{_i}}Add any of the follow classes to the .table base class.{{/i}}
{{_i}}.table-striped{{/i}}
- {{_i}}Adds zebra-striping to any table row within the <tbody> via the :nth-child CSS selector (not available in IE7-IE8).{{/i}}
+ {{_i}}Adds zebra-striping to any table row within the <tbody> via the :nth-child CSS selector (not available in IE8).{{/i}}
@@ -1678,7 +1678,7 @@
<img src="..." class="img-circle">
<img src="..." class="img-polaroid">
- {{_i}}Heads up!{{/i}} {{_i}}.img-rounded and .img-circle do not work in IE7-8 due to lack of border-radius support.{{/i}}
+ {{_i}}Heads up!{{/i}} {{_i}}.img-rounded and .img-circle do not work in IE8 due to lack of border-radius support.{{/i}}
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 19f2e67e2a..15f60f5c12 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -1813,135 +1813,92 @@
{{_i}}Thumbnails{{/i}} {{_i}}Grids of images, videos, text, and more{{/i}}
- {{_i}}Default thumbnails{{/i}}
+ {{_i}}Default thumbnails{{/i}}
{{_i}}By default, Bootstrap's thumbnails are designed to showcase linked images with minimal required markup.{{/i}}
-
-
- -
+
+
+
-
-
-
+
+
-
-
-
+
+
-
-
-
+
+
-
-
-
-
-
{{_i}}Highly customizable{{/i}}
-
{{_i}}With a bit of extra markup, it's possible to add any kind of HTML content like headings, paragraphs, or buttons into thumbnails.{{/i}}
-
-
- -
-
-
-
-
{{_i}}Thumbnail label{{/i}}
-
Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.
-
{{_i}}Action{{/i}} {{_i}}Action{{/i}}
-
-
- -
-
-
-
-
{{_i}}Thumbnail label{{/i}}
-
Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.
-
{{_i}}Action{{/i}} {{_i}}Action{{/i}}
-
-
- -
-
-
-
-
{{_i}}Thumbnail label{{/i}}
-
Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.
-
{{_i}}Action{{/i}} {{_i}}Action{{/i}}
-
-
-
-
-
-
{{_i}}Why use thumbnails{{/i}}
-
{{_i}}Thumbnails (previously .media-grid up until v1.4) are great for grids of photos or videos, image search results, retail products, portfolios, and much more. They can be links or static content.{{/i}}
-
-
{{_i}}Simple, flexible markup{{/i}}
-
{{_i}}Thumbnail markup is simple—a ul with any number of li elements is all that is required. It's also super flexible, allowing for any type of content with just a bit more markup to wrap your contents.{{/i}}
-
-
{{_i}}Uses grid column sizes{{/i}}
-
{{_i}}Lastly, the thumbnails component uses existing grid system classes—like .span2 or .span3—for control of thumbnail dimensions.{{/i}}
-
-
{{_i}}Markup{{/i}}
-
{{_i}}As mentioned previously, the required markup for thumbnails is light and straightforward. Here's a look at the default setup for linked images:{{/i}}
+
+
-<ul class="thumbnails">
- <li class="span4">
+<div class="row">
+ <div class="span3">
<a href="#" class="thumbnail">
- <img src="http://placehold.it/300x200" alt="">
+ <img src="http://placehold.it/260x180" alt="">
</a>
- </li>
+ </div>
...
-</ul>
+</div>
- {{_i}}For custom HTML content in thumbnails, the markup changes slightly. To allow block level content anywhere, we swap the <a> for a <div> like so:{{/i}}
+
+ {{_i}}Custom content thumbnails{{/i}}
+ {{_i}}With a bit of extra markup, it's possible to add any kind of HTML content like headings, paragraphs, or buttons into thumbnails.{{/i}}
+
+
+
+
+
+
+
{{_i}}Thumbnail label{{/i}}
+
Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.
+
{{_i}}Action{{/i}} {{_i}}Action{{/i}}
+
+
+
+
+
+
+
+
{{_i}}Thumbnail label{{/i}}
+
Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.
+
{{_i}}Action{{/i}} {{_i}}Action{{/i}}
+
+
+
+
+
+
+
+
{{_i}}Thumbnail label{{/i}}
+
Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.
+
{{_i}}Action{{/i}} {{_i}}Action{{/i}}
+
+
+
+
+
-<ul class="thumbnails">
- <li class="span4">
+<div class="row">
+ <div class="span4">
<div class="thumbnail">
<img src="http://placehold.it/300x200" alt="">
<h3>{{_i}}Thumbnail label{{/i}}</h3>
<p>{{_i}}Thumbnail caption...{{/i}}</p>
</div>
- </li>
+ </div>
...
-</ul>
+</div>
- {{_i}}More examples{{/i}}
- {{_i}}Explore all your options with the various grid classes available to you. You can also mix and match different sizes.{{/i}}
-
-
@@ -2073,7 +2030,7 @@
{{_i}}Striped{{/i}}
- {{_i}}Uses a gradient to create a striped effect. Not available in IE7-8.{{/i}}
+ {{_i}}Uses a gradient to create a striped effect. Not available in IE8.{{/i}}
@@ -2188,7 +2145,7 @@
{{_i}}Browser support{{/i}}
-
{{_i}}Progress bars use CSS3 gradients, transitions, and animations to achieve all their effects. These features are not supported in IE7-9 or older versions of Firefox.{{/i}}
+
{{_i}}Progress bars use CSS3 gradients, transitions, and animations to achieve all their effects. These features are not supported in IE8-9 or older versions of Firefox.{{/i}}
{{_i}}Versions earlier than Internet Explorer 10 and Opera 12 do not support animations.{{/i}}
diff --git a/docs/templates/pages/getting-started.mustache b/docs/templates/pages/getting-started.mustache
index 0eecd6247d..7ea2bff2e4 100644
--- a/docs/templates/pages/getting-started.mustache
+++ b/docs/templates/pages/getting-started.mustache
@@ -35,7 +35,7 @@
{{_i}}Before downloading, be sure to have a code editor (we recommend Sublime Text 2) and some working knowledge of HTML and CSS. We won't walk through the source files here, but they are available for download. We'll focus on getting started with the compiled Bootstrap files.{{/i}}
-
+
{{_i}}Download compiled{{/i}}
{{_i}}Fastest way to get started: get the compiled and minified versions of our CSS, JS, and images. No docs or original source files.{{/i}}
diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache
index ddd296299c..bf20bd2c73 100644
--- a/docs/templates/pages/index.mustache
+++ b/docs/templates/pages/index.mustache
@@ -37,7 +37,7 @@
{{_i}}Introducing Bootstrap.{{/i}}
{{_i}}Need reasons to love Bootstrap? Look no further.{{/i}}
-
+
{{_i}}By nerds, for nerds.{{/i}}
@@ -46,7 +46,7 @@
{{_i}}Made for everyone.{{/i}}
-
{{_i}}Bootstrap was made to not only look and behave great in the latest desktop browsers (as well as IE7!), but in tablet and smartphone browsers via responsive CSS as well.{{/i}}
+
{{_i}}Bootstrap was made to not only look and behave great in the latest desktop browsers (including IE8+), but in tablet and smartphone browsers via responsive CSS as well.{{/i}}
@@ -59,7 +59,7 @@
{{_i}}Built with Bootstrap.{{/i}}
{{_i}}For even more sites built with Bootstrap, visit the unofficial Tumblr or browse the examples.{{/i}}
-
+
<div class="container-fluid">
- <div class="row-fluid">
+ <div class="row">
<div class="span2">
<!--{{_i}}Sidebar content{{/i}}-->
</div>
diff --git a/less/responsive-1200px-min.less b/less/responsive-1200px-min.less
index e8dcb73dcc..d028ef7243 100644
--- a/less/responsive-1200px-min.less
+++ b/less/responsive-1200px-min.less
@@ -16,12 +16,4 @@
#grid > .core(@gridColumnWidth1200, @gridGutterWidth1200, @gridRowWidth1200);
#grid > .input(@gridColumnWidth1200, @gridGutterWidth1200, @gridRowWidth1200);
- // Thumbnails
- .thumbnails {
- margin-left: -@gridGutterWidth1200;
- }
- .thumbnails > li {
- margin-left: @gridGutterWidth1200;
- }
-
}
diff --git a/less/responsive-767px-max.less b/less/responsive-767px-max.less
index ebac6edd23..95e446088d 100644
--- a/less/responsive-767px-max.less
+++ b/less/responsive-767px-max.less
@@ -43,15 +43,10 @@
.container {
width: auto;
}
- // Undo negative margin on rows and thumbnails
- .row,
- .thumbnails {
+ // Undo negative margin on rows
+ .row {
margin-left: 0;
}
- .thumbnails > li {
- float: none;
- margin-left: 0; // Reset the default margin for all li elements when no .span* classes are present
- }
// Make all grid-sized elements block level again
[class*="span"],
// Makes uneditable inputs full-width when using grid sizing
@@ -60,20 +55,12 @@
display: block;
width: 100%;
margin-left: 0;
- .box-sizing(border-box);
- }
- .span12 {
- width: 100%;
- .box-sizing(border-box);
}
// FORM FIELDS
// -----------
// Make span* classes full width
- .input-large,
- .input-xlarge,
- .input-xxlarge,
input[class*="span"],
select[class*="span"],
textarea[class*="span"],
diff --git a/less/thumbnails.less b/less/thumbnails.less
index 91b75f785b..c520a05abc 100644
--- a/less/thumbnails.less
+++ b/less/thumbnails.less
@@ -3,26 +3,6 @@
// --------------------------------------------------
-// Note: `.thumbnails` and `.thumbnails > li` are overriden in responsive files
-
-// Make wrapper ul behave like the grid
-.thumbnails {
- margin-left: -@gridGutterWidth;
- list-style: none;
- .clearfix();
-}
-// Fluid rows have no left margin
-.row-fluid .thumbnails {
- margin-left: 0;
-}
-
-// Float li to make thumbnails appear in a row
-.thumbnails > li {
- float: left; // Explicity set the float since we don't require .span* classes
- margin-bottom: @baseLineHeight;
- margin-left: @gridGutterWidth;
-}
-
// The actual thumbnail (can be `a` or `div`)
.thumbnail {
display: block;