From 0886fee10328d5712055c87047b8040d0e64a356 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 19 Aug 2013 15:12:25 -0700 Subject: [PATCH 01/37] quick fix for docs mention --- css.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/css.html b/css.html index f976d229bd..6463f11fd9 100644 --- a/css.html +++ b/css.html @@ -80,20 +80,20 @@ base_url: "../" /* No media query since this is the default in Bootstrap */ /* Small devices (tablets, 768px and up) */ -@media (min-width: @screen-tablet) { ... } +@media (min-width: @screen-sm) { ... } /* Medium devices (desktops, 992px and up) */ -@media (min-width: @screen-desktop) { ... } +@media (min-width: @screen-md) { ... } /* Large devices (large desktops, 1200px and up) */ -@media (min-width: @screen-large-desktop) { ... } +@media (min-width: @screen-lg) { ... } {% endhighlight %}

We occasionally expand on these media queries to include a max-width to limit CSS to a narrower set of devices.

{% highlight css %} @media (max-width: @screen-phone-max) { ... } -@media (min-width: @screen-tablet) and (max-width: @screen-tablet-max) { ... } -@media (min-width: @screen-desktop) and (max-width: @screen-desktop-max) { ... } -@media (min-width: @screen-large-desktop) { ... } +@media (min-width: @screen-sm) and (max-width: @screen-sm-max) { ... } +@media (min-width: @screen-md) and (max-width: @screen-md-max) { ... } +@media (min-width: @screen-lg) { ... } {% endhighlight %}

Grid options

From a9d1f901c5006bd1cae8ab9eecd7491250067e87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rouven=20We=C3=9Fling?= Date: Tue, 20 Aug 2013 15:07:43 +0200 Subject: [PATCH 02/37] Add role="toolbar" to elements with .btn-toolbar. --- components.html | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/components.html b/components.html index a428529b15..368ed52464 100644 --- a/components.html +++ b/components.html @@ -230,7 +230,7 @@ base_url: "../"

Examples

Use them in buttons, button groups for a toolbar, navigation, or prepended form inputs.

-
+ -
+