Merge branch 'glyphicons_font' into exploratory

Conflicts:
	docs/assets/css/bootstrap.css
	docs/assets/css/docs.css
	less/sprites.less

less/buttons.less

@@ -62,9 +62,8 @@
 }
 
 
-
 // Button Sizes
-// --------------------------------------------------
+// -------------------------
 
 // Large
 .btn-large {
@@ -72,10 +71,6 @@
   font-size: @fontSizeLarge;
   border-radius: @borderRadiusLarge;
 }
-.btn-large [class^="icon-"],
-.btn-large [class*=" icon-"] {
-  margin-top: 2px;
-}
 
 // Small
 .btn-small {
@@ -83,10 +78,6 @@
   font-size: @fontSizeSmall;
   border-radius: @borderRadiusSmall;
 }
-.btn-small [class^="icon-"],
-.btn-small [class*=" icon-"] {
-  margin-top: 0;
-}
 
 // Mini
 .btn-mini {
@@ -96,6 +87,14 @@
 }
 
 
+// Icons in buttons
+// -------------------------
+
+.btn [class^="glyphicon-"]::before       { vertical-align: -2px; }
+.btn-small [class^="glyphicon-"]::before,
+.btn-mini [class^="glyphicon-"]::before  { vertical-align: -1px; }
+
+
 // Block button
 // -------------------------