Merge branch '2.1.0-wip' of https://github.com/tobz/bootstrap into tobz-2.1.0-wip
This commit is contained in:
commit
f9deb8017a
|
@ -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>
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 */
|
||||
|
|
Loading…
Reference in New Issue