From fda5bb135e0a91f335f1e3bd4e5313070f6e0708 Mon Sep 17 00:00:00 2001 From: Mark Otto <otto@github.com> Date: Wed, 28 Nov 2012 00:46:09 -0800 Subject: [PATCH] Fixes #5963: Add large button example to icons, fix vertical alignment in large buttons --- docs/assets/css/bootstrap.css | 2 +- docs/base-css.html | 8 ++++++++ docs/templates/pages/base-css.mustache | 8 ++++++++ less/buttons.less | 2 +- 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index f2cd3d3e98..ed58d7aafa 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -3238,7 +3238,7 @@ button.close { .btn-large [class^="icon-"], .btn-large [class*=" icon-"] { - margin-top: 2px; + margin-top: 4px; } .btn-small { diff --git a/docs/base-css.html b/docs/base-css.html index fee6fc8970..69229231f6 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -2076,6 +2076,14 @@ For example, <code><section></code> should be wrapped as inlin <li><a href="#"><i class="i"></i> Make admin</a></li> </ul> </div> +</pre> + + <h5>Large button</h5> + <div class="bs-docs-example"> + <a class="btn btn-large" href="#"><i class="icon-star"></i> Star</a> + </div> +<pre class="prettyprint linenums"> +<a class="btn btn-large" href="#"><i class="icon-star"></i> Star</a> </pre> <h5>Small button</h5> diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 29c4cebb1e..17f446b3d8 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -2013,6 +2013,14 @@ <li><a href="#"><i class="i"></i> {{_i}}Make admin{{/i}}</a></li> </ul> </div> +</pre> + + <h5>{{_i}}Large button{{/i}}</h5> + <div class="bs-docs-example"> + <a class="btn btn-large" href="#"><i class="icon-star"></i> Star</a> + </div>{{! /bs-docs-example }} +<pre class="prettyprint linenums"> +<a class="btn btn-large" href="#"><i class="icon-star"></i> Star</a> </pre> <h5>{{_i}}Small button{{/i}}</h5> diff --git a/less/buttons.less b/less/buttons.less index e0afbed96b..78371c6ff0 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -73,7 +73,7 @@ } .btn-large [class^="icon-"], .btn-large [class*=" icon-"] { - margin-top: 2px; + margin-top: 4px; } // Small -- GitLab