kotovalexarian-likes-github/twbs--bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00
Code Releases Activity

Merge branch '2.1.0-wip' of https://github.com/tobz/bootstrap into tobz-2.1.0-wip

Browse source
This commit is contained in:
Mark Otto 2012-08-17 16:04:35 -07:00
commit f9deb8017a
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/base-css.html
View file

@ -967,7 +967,7 @@ For example, <code>section</code> should be wrapped as inline.
</pre> </pre>
<h3>Textarea</h3> <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"> <form class="bs-docs-example form-inline">
<textarea rows="3"></textarea> <textarea rows="3"></textarea>
</form> </form>

4
less/buttons.less
View file

@ -79,7 +79,7 @@
.border-radius(5px); .border-radius(5px);
} }
.btn-large [class^="icon-"] { .btn-large [class^="icon-"] {
margin-top: 1px; margin-top: 2px;
} }
// Small // Small
@ -89,7 +89,7 @@
line-height: @baseLineHeight - 2px; line-height: @baseLineHeight - 2px;
} }
.btn-small [class^="icon-"] { .btn-small [class^="icon-"] {
margin-top: -1px; margin-top: 0;
} }
// Mini // Mini

1
less/sprites.less
View file

@ -25,6 +25,7 @@
background-image: url("@{iconSpritePath}"); background-image: url("@{iconSpritePath}");
background-position: 14px 14px; background-position: 14px 14px;
background-repeat: no-repeat; background-repeat: no-repeat;
margin-top: 1px;
} }
/* White icons with optional class, or on hover/active states of certain elements */ /* White icons with optional class, or on hover/active states of certain elements */