From 20d3ad10eb5d40e48074229c4dcc6ed423c6fe87 Mon Sep 17 00:00:00 2001 From: Steven Black Date: Sun, 1 Mar 2015 01:59:54 +0200 Subject: [PATCH] Accessibility and headings hierarchy for the "CSS" page. Closes #15948 by merging it. --- docs/_includes/css/grid.html | 32 ++++++++++++++++---------------- docs/_includes/css/overview.html | 10 +++++----- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/docs/_includes/css/grid.html b/docs/_includes/css/grid.html index a6a4eaacb5..2e551616ea 100644 --- a/docs/_includes/css/grid.html +++ b/docs/_includes/css/grid.html @@ -3,7 +3,7 @@

Bootstrap includes a responsive, mobile first fluid grid system that appropriately scales up to 12 columns as the device or viewport size increases. It includes predefined classes for easy layout options, as well as powerful mixins for generating more semantic layouts.

-

Introduction

+

Introduction

Grid systems are used for creating page layouts through a series of rows and columns that house your content. Here's how the Bootstrap grid system works:

Look to the examples for applying these principles to your code.

-

Media queries

+

Media queries

We use the following media queries in our Less files to create the key breakpoints in our grid system.

{% highlight scss %} /* Extra small devices (phones, less than 768px) */ @@ -41,7 +41,7 @@ @media (min-width: @screen-lg-min) { ... } {% endhighlight %} -

Grid options

+

Grid options

See how aspects of the Bootstrap grid system work across multiple devices with a handy table.

@@ -117,7 +117,7 @@
-

Example: Stacked-to-horizontal

+

Example: Stacked-to-horizontal

Using a single set of .col-md-* grid classes, you can create a basic grid system that starts out stacked on mobile devices and tablet devices (the extra small to small range) before becoming horizontal on desktop (medium) devices. Place grid columns in any .row.

@@ -178,7 +178,7 @@
{% endhighlight %} -

Example: Fluid container

+

Example: Fluid container

Turn any fixed-width grid layout into a full-width layout by changing your outermost .container to .container-fluid.

{% highlight html %}
@@ -188,7 +188,7 @@
{% endhighlight %} -

Example: Mobile and desktop

+

Example: Mobile and desktop

Don't want your columns to simply stack in smaller devices? Use the extra small and medium device grid classes by adding .col-xs-* .col-md-* to your columns. See the example below for a better idea of how it all works.

@@ -226,7 +226,7 @@
{% endhighlight %} -

Example: Mobile, tablet, desktop

+

Example: Mobile, tablet, desktop

Build on the previous example by creating even more dynamic and powerful layouts with tablet .col-sm-* classes.

@@ -255,7 +255,7 @@
{% endhighlight %} -

Example: Column wrapping

+

Example: Column wrapping

If more than 12 columns are placed within a single row, each group of extra columns will, as one unit, wrap onto a new line.

@@ -272,7 +272,7 @@
{% endhighlight %} -

Responsive column resets

+

Responsive column resets

With the four tiers of grids available you're bound to run into issues where, at certain breakpoints, your columns don't clear quite right as one is taller than the other. To fix that, use a combination of a .clearfix and our responsive utility classes.

@@ -316,7 +316,7 @@ {% endhighlight %} -

Offsetting columns

+

Offsetting columns

Move columns to the right using .col-md-offset-* classes. These classes increase the left margin of a column by * columns. For example, .col-md-offset-4 moves .col-md-4 over four columns.

@@ -346,7 +346,7 @@ {% endhighlight %} -

Nesting columns

+

Nesting columns

To nest your content with the default grid, add a new .row and set of .col-sm-* columns within an existing .col-sm-* column. Nested rows should include a set of columns that add up to 12 or fewer (it is not required that you use all 12 available columns).

@@ -377,7 +377,7 @@
{% endhighlight %} -

Column ordering

+

Column ordering

Easily change the order of our built-in grid columns with .col-md-push-* and .col-md-pull-* modifier classes.

.col-md-9 .col-md-push-3
@@ -391,10 +391,10 @@
{% endhighlight %} -

Less mixins and variables

+

Less mixins and variables

In addition to prebuilt grid classes for fast layouts, Bootstrap includes Less variables and mixins for quickly generating your own simple, semantic layouts.

-

Variables

+

Variables

Variables determine the number of columns, the gutter width, and the media query point at which to begin floating columns. We use these to generate the predefined grid classes documented above, as well as for the custom mixins listed below.

{% highlight scss %} @grid-columns: 12; @@ -402,7 +402,7 @@ @grid-float-breakpoint: 768px; {% endhighlight %} -

Mixins

+

Mixins

Mixins are used in conjunction with the grid variables to generate semantic CSS for individual grid columns.

{% highlight scss %} // Creates a wrapper for a series of columns @@ -538,7 +538,7 @@ } {% endhighlight %} -

Example usage

+

Example usage

You can modify the variables to your own custom values, or just use the mixins with their default values. Here's an example of using the default settings to create a two-column layout with a gap between.

{% highlight scss %} .wrapper { diff --git a/docs/_includes/css/overview.html b/docs/_includes/css/overview.html index 86a5b45b0e..bd0e538483 100644 --- a/docs/_includes/css/overview.html +++ b/docs/_includes/css/overview.html @@ -3,7 +3,7 @@

Get the lowdown on the key pieces of Bootstrap's infrastructure, including our approach to better, faster, stronger web development.

-

HTML5 doctype

+

HTML5 doctype

Bootstrap makes use of certain HTML elements and CSS properties that require the use of the HTML5 doctype. Include it at the beginning of all your projects.

{% highlight html %} @@ -12,7 +12,7 @@ {% endhighlight %} -

Mobile first

+

Mobile first

With Bootstrap 2, we added optional mobile friendly styles for key aspects of the framework. With Bootstrap 3, we've rewritten the project to be mobile friendly from the start. Instead of adding on optional mobile styles, they're baked right into the core. In fact, Bootstrap is mobile first. Mobile first styles can be found throughout the entire library instead of in separate files.

To ensure proper rendering and touch zooming, add the viewport meta tag to your <head>.

{% highlight html %} @@ -23,7 +23,7 @@ {% endhighlight %} - +

Bootstrap sets basic global display, typography, and link styles. Specifically, we:

  • Set background-color: #fff; on the body
    • @@ -32,10 +32,10 @@

These styles can be found within scaffolding.less.

-

Normalize.css

+

Normalize.css

For improved cross-browser rendering, we use Normalize.css, a project by Nicolas Gallagher and Jonathan Neal.

-

Containers

+

Containers

Bootstrap requires a containing element to wrap site contents and house our grid system. You may choose one of two containers to use in your projects. Note that, due to padding and more, neither container is nestable.

Use .container for a responsive fixed width container.

{% highlight html %}