diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 5ebb752be7..97e43f22cd 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -784,107 +784,98 @@ pre code { margin-left: -15px; } -[class*="col-span-"], -[class*="col-small-"] { +.col { position: relative; + float: left; + width: 100%; min-height: 1px; padding-right: 15px; padding-left: 15px; } -[class*="col-small-"] { - float: left; -} - -.col-small-span-12 { +.col-sm-12 { width: 100%; } -.col-small-span-11 { +.col-sm-11 { width: 91.66666666666666%; } -.col-small-span-10 { +.col-sm-10 { width: 83.33333333333334%; } -.col-small-span-9 { +.col-sm-9 { width: 75%; } -.col-small-span-8 { +.col-sm-8 { width: 66.66666666666666%; } -.col-small-span-7 { +.col-sm-7 { width: 58.333333333333336%; } -.col-small-span-6 { +.col-sm-6 { width: 50%; } -.col-small-span-5 { +.col-sm-5 { width: 41.66666666666667%; } -.col-small-span-4 { +.col-sm-4 { width: 33.33333333333333%; } -.col-small-span-3 { +.col-sm-3 { width: 25%; } -.col-small-span-2 { +.col-sm-2 { width: 16.666666666666664%; } -.col-small-span-1 { +.col-sm-1 { width: 8.333333333333332%; } @media screen and (min-width: 768px) { - .container { - max-width: 728px; - } - [class*="col-span-"] { - float: left; - } - .col-span-12 { + .col-lg-12 { width: 100%; } - .col-span-11 { + .col-lg-11 { width: 91.66666666666666%; } - .col-span-10 { + .col-lg-10 { width: 83.33333333333334%; } - .col-span-9 { + .col-lg-9 { width: 75%; } - .col-span-8 { + .col-lg-8 { width: 66.66666666666666%; } - .col-span-7 { + .col-lg-7 { width: 58.333333333333336%; } - .col-span-6 { + .col-lg-6 { width: 50%; } - .col-span-5 { + .col-lg-5 { width: 41.66666666666667%; } - .col-span-4 { + .col-lg-4 { width: 33.33333333333333%; } - .col-span-3 { + .col-lg-3 { width: 25%; } - .col-span-2 { + .col-lg-2 { width: 16.666666666666664%; } - .col-span-1 { + .col-lg-1 { width: 8.333333333333332%; } .col-offset-12 { @@ -997,6 +988,12 @@ pre code { } } +@media screen and (min-width: 768px) { + .container { + max-width: 728px; + } +} + @media screen and (min-width: 992px) { .container { max-width: 940px; @@ -1009,9 +1006,9 @@ pre code { } } -[class*="col-span-"].pull-right { +/*[class*="col-span-"].pull-right { float: right; -} +}*/ table { max-width: 100%; diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index ff605b21e9..74c604e78d 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -124,13 +124,13 @@ section > ul li { .show-grid { margin-bottom: 15px; } -.show-grid [class*="col-span-"] { +.show-grid .col { padding-top: 10px; padding-bottom: 10px; background-color: #eee; border: 1px solid #ddd; } -.show-grid [class*="col-span-"]:hover { +.show-grid .col:hover { background-color: #ddd; } diff --git a/docs/docs.html b/docs/docs.html index c405293ea7..b134416cc5 100644 --- a/docs/docs.html +++ b/docs/docs.html @@ -20,22 +20,22 @@ title: Bootstrap Documentation
There are a few easy ways to quickly get started with Bootstrap, each one appealing to a different skill level and use case. Read through to see what suits your particular needs.
The fastest way to get started: get the compiled and minified versions of our CSS, JavaScript, and fonts. No documentation or original source files are included.
Get the original files for all CSS and JavaScript, along with a local copy of the docs by downloading the latest version directly from GitHub.
Clone the entire project or fork your own version of Bootstrap to make it your own by visiting us on GitHub.
Install and manage the original files for all CSS and JavaScript, along with a local copy of the docs, using Bower.
{% highlight bash %}$ bower install bootstrap{% endhighlight %} @@ -110,63 +110,63 @@ title: Bootstrap DocumentationAn interactive riff on the basic marketing site featuring a prominent carousel.
On mobile devices, the grid starts out stacked. Above 768px, it becomes horizontal as media queries kick in to apply float
s and width
s. To create a basic grid layout, wrap a series of .col-span-*
elements within a .row
. As this is a 12-column grid, each .col-span-*
spans a number of those 12 columns, and should always add up to 12 for each row (or the number of columns in the parent), even at mobile resolutions.
Move columns to the right using .col-offset-*
classes. These classes increase the left margin of a column by *
columns. For example, .col-offset-4
moves .col-span-4
over four columns.
Move columns to the right using .col-offset-*
classes. These classes increase the left margin of a column by *
columns. For example, .col-offset-4
moves .col col-lg-4
over four columns.
To nest your content with the default grid, add a new .row
and set of .col-span-*
columns within an existing .col-span-*
column. Nested rows should include a set of columns that add up to 12.
Easily change the order of our built-in grid columns with .col-push-*
and .col-pull-*
modifier classes.
Use the small device grid classes, like .col-small-span-6
, to create columned layouts on phone and tablet devices (anything under 768px). Offsets, pushes, and pulls are not available with the small grid at this time.
Use the small device grid classes, like .col-sm-6
, to create columned layouts on phone and tablet devices (anything under 768px). Offsets, pushes, and pulls are not available with the small grid at this time.
<section>
should be wrapped as inline.
Use contextual classes to color table rows.