diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index c7a6d854cc..c474e5f0c9 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index 4b032cdb55..4d464ea88d 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -84,7 +84,7 @@ position: static; } } -@media (max-width: 768px) { +@media (max-width: 767px) { .container { width: auto; padding: 0 20px; diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 3833da6116..188b970365 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1668,11 +1668,13 @@ table .span12 { .btn { display: inline-block; padding: 4px 10px 4px; + margin-bottom: 0; font-size: 13px; line-height: 18px; color: #333333; text-align: center; text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); + vertical-align: middle; background-color: #fafafa; background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6)); background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6); diff --git a/docs/base-css.html b/docs/base-css.html index b345a8434e..a7dcbff198 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1289,17 +1289,10 @@ For example, <code>section</code> should be wrapped as inline.

Buttons for actions

As a convention, buttons should only be used for actions while hyperlinks are to be used for objects. For instance, "Download" should be a button while "recent activity" should be a link.

+

Button styles can be applied to anything with the .btn class applied. However, typically you'll want to apply these to only <a> and <button> elements.

+

Cross browser compatibility

+

IE9 doesn't crop background gradients on rounded corners, so we remove it. Related, IE9 jankifies disabled button elements, rendering text gray with a nasty text-shadow that we cannot fix.

-
-

For anchors and forms

-

Button styles can be applied to anything with the .btn applied. However, typically you'll want to apply these to only <a> and <button> elements.

-
-
-

Note: All buttons must include the .btn class. Button styles should be applied to <button> and <a> elements for consistency.

-
- - -

Multiple sizes

Fancy larger or smaller buttons? Add .btn-large or .btn-small for two additional sizes.

@@ -1311,8 +1304,7 @@ For example, <code>section</code> should be wrapped as inline. Primary action Action

-
-
+

Disabled state

For disabled buttons, use .btn-disabled for links and :disabled for <button> elements.

@@ -1325,14 +1317,27 @@ For example, <code>section</code> should be wrapped as inline.

-

Cross browser compatibility

-

In IE9, we drop the gradient on all buttons in favor of rounded corners as IE9 doesn't crop background gradients to the corners.

-

Related, IE9 jankifies disabled button elements, rendering text gray with a nasty text-shadow—unfortunately we can't fix this.

+

One class, multiple tags

+

Use the .btn class on an <a>, <button>, or <input> element.

+
+Link + + + +
+
+<a class="btn" href="">Link</a>
+<button class="btn" type="submit">
+  Button
+</button>
+<input class="btn" type="button" 
+         value="Input">
+<input class="btn" type="submit" 
+         value="Submit">
+
+

As a best practice, try to match the element for you context to ensure matching cross-browser rendering. If you have an input, use an <input type="submit"> for your button.

- -
- diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index c23444a07a..1b8307b926 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -1213,17 +1213,10 @@

{{_i}}Buttons for actions{{/i}}

{{_i}}As a convention, buttons should only be used for actions while hyperlinks are to be used for objects. For instance, "Download" should be a button while "recent activity" should be a link.{{/i}}

+

{{_i}}Button styles can be applied to anything with the .btn class applied. However, typically you'll want to apply these to only <a> and <button> elements.{{/i}}

+

{{_i}}Cross browser compatibility{{/i}}

+

{{_i}}IE9 doesn't crop background gradients on rounded corners, so we remove it. Related, IE9 jankifies disabled button elements, rendering text gray with a nasty text-shadow that we cannot fix.{{/i}}

-
-

{{_i}}For anchors and forms{{/i}}

-

{{_i}}Button styles can be applied to anything with the .btn applied. However, typically you'll want to apply these to only <a> and <button> elements.{{/i}}

-
-
-

{{_i}}Note: All buttons must include the .btn class. Button styles should be applied to <button> and <a> elements for consistency.{{/i}}

-
- - -

{{_i}}Multiple sizes{{/i}}

{{_i}}Fancy larger or smaller buttons? Add .btn-large or .btn-small for two additional sizes.{{/i}}

@@ -1235,8 +1228,7 @@ {{_i}}Primary action{{/i}} {{_i}}Action{{/i}}

-
-
+

{{_i}}Disabled state{{/i}}

{{_i}}For disabled buttons, use .btn-disabled for links and :disabled for <button> elements.{{/i}}

@@ -1249,14 +1241,27 @@

-

Cross browser compatibility

-

In IE9, we drop the gradient on all buttons in favor of rounded corners as IE9 doesn't crop background gradients to the corners.

-

Related, IE9 jankifies disabled button elements, rendering text gray with a nasty text-shadow—unfortunately we can't fix this.

+

{{_i}}One class, multiple tags{{/i}}

+

{{_i}}Use the .btn class on an <a>, <button>, or <input> element.{{/i}}

+
+{{_i}}Link{{/i}} + + + +
+
+<a class="btn" href="">{{_i}}Link{{/i}}</a>
+<button class="btn" type="submit">
+  {{_i}}Button{{/i}}
+</button>
+<input class="btn" type="button" 
+         value="{{_i}}Input{{/i}}">
+<input class="btn" type="submit" 
+         value="{{_i}}Submit{{/i}}">
+
+

{{_i}}As a best practice, try to match the element for you context to ensure matching cross-browser rendering. If you have an input, use an <input type="submit"> for your button.{{/i}}

- -
- diff --git a/less/buttons.less b/less/buttons.less index 61d0bc7bf8..880d1f64a4 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -9,11 +9,13 @@ .btn { display: inline-block; padding: 4px 10px 4px; + margin-bottom: 0; // For input.btn font-size: @baseFontSize; line-height: @baseLineHeight; color: @grayDark; text-align: center; text-shadow: 0 1px 1px rgba(255,255,255,.75); + vertical-align: middle; #gradient > .vertical-three-colors(@white, @white, 25%, darken(@white, 10%)); // Don't use .gradientbar() here since it does a three-color gradient border: 1px solid #ccc; border-bottom-color: #bbb; @@ -147,7 +149,7 @@ button.btn, input[type="submit"].btn { &::-moz-focus-inner { - padding: 0; + padding: 0; border: 0; } diff --git a/less/responsive.less b/less/responsive.less index 7d494a3576..7ed58bb4e0 100644 --- a/less/responsive.less +++ b/less/responsive.less @@ -123,7 +123,7 @@ // LANDSCAPE PHONE TO SMALL DESKTOP & PORTRAIT TABLET // -------------------------------------------------- -@media (max-width: 768px) { +@media (max-width: 767px) { // GRID & CONTAINERS // ----------------- // Remove width from containers