root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

nuke glyphicons changes in buttons for now because it's whack

This commit is contained in:
Mark Otto 2013-02-26 00:44:15 -08:00
parent 5b3b11c02a
commit e2e5580c0e
2 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
docs/assets/css/bootstrap.css vendored
View File

@ -1690,26 +1690,12 @@ fieldset[disabled] .btn {
border-radius: 3px; border-radius: 3px;
} }
.btn-mini [class^="icon-"],
.btn-mini [class*=" icon-"] {
margin-top: -1px;
}
.btn-mini { .btn-mini {
padding: 0 6px; padding: 0 6px;
font-size: 10.5px; font-size: 10.5px;
border-radius: 3px; border-radius: 3px;
} }
.btn [class^="glyphicon-"]::before {
vertical-align: -2px;
}
.btn-small [class^="glyphicon-"]::before,
.btn-mini [class^="glyphicon-"]::before {
vertical-align: -1px;
}
.btn-block { .btn-block {
display: block; display: block;
width: 100%; width: 100%;

9
less/buttons.less
View File

@ -64,10 +64,6 @@
font-size: @font-size-small; font-size: @font-size-small;
border-radius: @border-radius-small; border-radius: @border-radius-small;
} }
.btn-mini [class^="icon-"],
.btn-mini [class*=" icon-"] {
margin-top: -1px;
}
// Mini // Mini
.btn-mini { .btn-mini {
@ -80,10 +76,7 @@
// Icons in buttons // Icons in buttons
// ------------------------- // -------------------------
.btn [class^="glyphicon-"]::before { vertical-align: -2px; } // TODO: figure this shit out
.btn-small [class^="glyphicon-"]::before,
.btn-mini [class^="glyphicon-"]::before { vertical-align: -1px; }
// Block button // Block button
// ------------------------- // -------------------------