diff options
| author | Mark Otto <[email protected]> | 2012-08-17 16:04:35 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-08-17 16:04:35 -0700 |
| commit | f9deb8017a81fd3d88306fab2d0a5715df9dfe74 (patch) | |
| tree | 36f25fe5da909aedcc46f9d611cebbf77f2d4ada | |
| parent | 2b22c0c56efb86c213884897f14383f45e1414b3 (diff) | |
| parent | 48f5626499024df6a5cf386a5456c9ff03564644 (diff) | |
| download | bootstrap-f9deb8017a81fd3d88306fab2d0a5715df9dfe74.tar.xz bootstrap-f9deb8017a81fd3d88306fab2d0a5715df9dfe74.zip | |
Merge branch '2.1.0-wip' of https://github.com/tobz/bootstrap into tobz-2.1.0-wip
| -rw-r--r-- | docs/base-css.html | 2 | ||||
| -rw-r--r-- | less/buttons.less | 4 | ||||
| -rw-r--r-- | less/sprites.less | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/docs/base-css.html b/docs/base-css.html index c1598821c..fb6616fb7 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -967,7 +967,7 @@ For example, <code>section</code> should be wrapped as inline. </pre> <h3>Textarea</h3> - <p>Form control which supports multiple lines of text. Change <code>row</code> attribute as necessary.</p> + <p>Form control which supports multiple lines of text. Change <code>rows</code> attribute as necessary.</p> <form class="bs-docs-example form-inline"> <textarea rows="3"></textarea> </form> diff --git a/less/buttons.less b/less/buttons.less index a1d8989b6..872b5aec1 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -79,7 +79,7 @@ .border-radius(5px); } .btn-large [class^="icon-"] { - margin-top: 1px; + margin-top: 2px; } // Small @@ -89,7 +89,7 @@ line-height: @baseLineHeight - 2px; } .btn-small [class^="icon-"] { - margin-top: -1px; + margin-top: 0; } // Mini diff --git a/less/sprites.less b/less/sprites.less index b7babb568..8d5e40e7a 100644 --- a/less/sprites.less +++ b/less/sprites.less @@ -25,6 +25,7 @@ background-image: url("@{iconSpritePath}"); background-position: 14px 14px; background-repeat: no-repeat; + margin-top: 1px; } /* White icons with optional class, or on hover/active states of certain elements */ |