2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-08 17:22:31 +03:00

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

This commit is contained in:
Mark Otto
2012-08-17 16:04:35 -07:00
3 changed files with 4 additions and 3 deletions
+2 -2
View File
@@ -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
+1
View File
@@ -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 */