Commit 32e57efd authored by Mark Otto's avatar Mark Otto
Browse files

Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

parents 5844aa55 40b4793d
4 merge requests!14752.0 wip,!1403warningText and warningBackground docs fix,!13512.0 wip - relative font sizes,!1315[2.0-wip] Fix mustache glob when building
Showing with 3 additions and 0 deletions
+3 -0
......@@ -128,6 +128,9 @@
line-height: normal;
.border-radius(5px);
}
&.large .icon {
margin-top: 1px;
}
&.small {
padding: 7px 9px 7px;
font-size: @baseFontSize - 2px;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment