From c09602d172059c9fac67639ee803c6652dcc2c29 Mon Sep 17 00:00:00 2001 From: Han Lin Yap Date: Wed, 18 Apr 2012 11:38:14 +0300 Subject: [PATCH 1/3] add -ms-user-select --- less/mixins.less | 1 + 1 file changed, 1 insertion(+) diff --git a/less/mixins.less b/less/mixins.less index ddd25d0e42..e0cb5f8a50 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -291,6 +291,7 @@ .user-select(@select) { -webkit-user-select: @select; -moz-user-select: @select; + -ms-user-select: @select; -o-user-select: @select; user-select: @select; } From 178a9f3b519342788f653e2d5680913e36da2c4e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 18 Apr 2012 09:37:07 -0700 Subject: [PATCH 2/3] fix some text around media queries in the docs --- docs/scaffolding.html | 6 +++--- docs/templates/pages/scaffolding.mustache | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 20a9f5c73c..caffa6af66 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -533,13 +533,13 @@ @media (max-width: 480px) { ... } // Landscape phone to portrait tablet - @media (max-width: 768px) { ... } + @media (max-width: 767px) { ... } // Portrait tablet to landscape and desktop - @media (min-width: 768px) and (max-width: 980px) { ... } + @media (min-width: 768px) and (max-width: 979px) { ... } // Large desktop - @media (min-width: 1200px) { .. } + @media (min-width: 1200px) { ... } diff --git a/docs/templates/pages/scaffolding.mustache b/docs/templates/pages/scaffolding.mustache index 40b264d03e..13c777a260 100644 --- a/docs/templates/pages/scaffolding.mustache +++ b/docs/templates/pages/scaffolding.mustache @@ -456,13 +456,13 @@ @media (max-width: 480px) { ... } // {{_i}}Landscape phone to portrait tablet{{/i}} - @media (max-width: 768px) { ... } + @media (max-width: 767px) { ... } // {{_i}}Portrait tablet to landscape and desktop{{/i}} - @media (min-width: 768px) and (max-width: 980px) { ... } + @media (min-width: 768px) and (max-width: 979px) { ... } // {{_i}}Large desktop{{/i}} - @media (min-width: 1200px) { .. } + @media (min-width: 1200px) { ... } From 47b6e6bd80040cdaa50c27cb7eb11881df679eee Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 18 Apr 2012 09:47:30 -0700 Subject: [PATCH 3/3] fix #3111, badge and label alignment with surrounding text --- docs/assets/css/bootstrap.css | 2 +- less/labels-badges.less | 2 +- less/tests/css-tests.html | 28 ++++++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 00485499fd..43bba2beec 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3740,7 +3740,7 @@ a.thumbnail:hover { font-weight: bold; line-height: 14px; color: #ffffff; - vertical-align: middle; + vertical-align: baseline; white-space: nowrap; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); background-color: #999999; diff --git a/less/labels-badges.less b/less/labels-badges.less index e29f2c4340..0fbd7bbc61 100644 --- a/less/labels-badges.less +++ b/less/labels-badges.less @@ -8,7 +8,7 @@ font-weight: bold; line-height: 14px; // ensure proper line-height if floated color: @white; - vertical-align: middle; + vertical-align: baseline; white-space: nowrap; text-shadow: 0 -1px 0 rgba(0,0,0,.25); background-color: @grayLight; diff --git a/less/tests/css-tests.html b/less/tests/css-tests.html index 58e25be612..a39dde53db 100644 --- a/less/tests/css-tests.html +++ b/less/tests/css-tests.html @@ -462,6 +462,10 @@ +
+

Tabs

+
+
  • Section 1
    • @@ -502,6 +506,30 @@ + + +
    +

    Labels

    +
    + +
    +
    +

    Inline label

    +

    Cras justo odio, dapibus ac facilisis in, egestas eget quam. Maecenas sed diam Label name eget risus varius blandit sit amet non magna. Fusce .class-name dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.

    +
    +
    +
    + + Hey! Read this. +
    +
    +
    + +
    +
    + +