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

Merge branch 'form_alignment' of https://github.com/phopkins/bootstrap into phopkins-form_alignment

Browse Source 
Conflicts:
	bootstrap.css
	bootstrap.min.css
This commit is contained in:
Mark Otto
2012-01-26 15:25:19 -08:00
parent f398926e46 721b8a1078
commit 2d67c34084
5 changed files with 35 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/buttons.less
+4 -3
View File
@@ -66,9 +66,9 @@
.btn {
// Button Base
display: inline-block;
padding: 5px 10px 6px;
padding: 4px 10px 4px;
font-size: @baseFontSize;
line-height: normal;
line-height: @baseLineHeight;
color: @grayDark;
text-shadow: 0 1px 1px rgba(255,255,255,.75);
#gradient > .vertical-three-colors(@white, @white, 25%, darken(@white, 10%)); // Don't use .gradientbar() here since it does a three-color gradient
@@ -132,8 +132,9 @@
margin-top: 1px;
}
&.small {
padding: 7px 9px 7px;
padding: 5px 9px 5px;
font-size: @baseFontSize - 2px;
line-height: @baseLineHeight - 2px;
}
&.small .icon {
margin-top: -2px;