Commit b2ebd5c4 authored by Mark Otto's avatar Mark Otto

update button styles to use updated 14px base font size, align carets to...

update button styles to use updated 14px base font size, align carets to others with no opacity changes
parent 7fa99fb1
...@@ -2893,7 +2893,7 @@ button.close { ...@@ -2893,7 +2893,7 @@ button.close {
padding: 4px 14px; padding: 4px 14px;
margin-bottom: 0; margin-bottom: 0;
*margin-left: .3em; *margin-left: .3em;
font-size: 13px; font-size: 14px;
line-height: 20px; line-height: 20px;
*line-height: 20px; *line-height: 20px;
color: #333333; color: #333333;
...@@ -2909,11 +2909,11 @@ button.close { ...@@ -2909,11 +2909,11 @@ button.close {
background-image: linear-gradient(to bottom, #ffffff, #e6e6e6); background-image: linear-gradient(to bottom, #ffffff, #e6e6e6);
background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6); background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
background-repeat: repeat-x; background-repeat: repeat-x;
border: 1px solid #cccccc; border: 1px solid #bbbbbb;
*border: 0; *border: 0;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
border-color: #e6e6e6 #e6e6e6 #bfbfbf; border-color: #e6e6e6 #e6e6e6 #bfbfbf;
border-bottom-color: #b3b3b3; border-bottom-color: #a2a2a2;
-webkit-border-radius: 4px; -webkit-border-radius: 4px;
-moz-border-radius: 4px; -moz-border-radius: 4px;
border-radius: 4px; border-radius: 4px;
...@@ -3012,7 +3012,7 @@ button.close { ...@@ -3012,7 +3012,7 @@ button.close {
.btn-mini { .btn-mini {
padding: 2px 6px; padding: 2px 6px;
font-size: 12px; font-size: 11px;
line-height: 16px; line-height: 16px;
} }
...@@ -3324,10 +3324,13 @@ input[type="submit"].btn.btn-mini { ...@@ -3324,10 +3324,13 @@ input[type="submit"].btn.btn-mini {
.btn-group > .btn, .btn-group > .btn,
.btn-group > .dropdown-menu { .btn-group > .dropdown-menu {
font-size: 13px; font-size: 14px;
}
.btn-group > .btn-mini {
font-size: 11px;
} }
.btn-group > .btn-mini,
.btn-group > .btn-small { .btn-group > .btn-small {
font-size: 12px; font-size: 12px;
} }
...@@ -3388,7 +3391,7 @@ input[type="submit"].btn.btn-mini { ...@@ -3388,7 +3391,7 @@ input[type="submit"].btn.btn-mini {
outline: 0; outline: 0;
} }
.btn-group > .dropdown-toggle { .btn-group > .btn + .dropdown-toggle {
*padding-top: 4px; *padding-top: 4px;
padding-right: 8px; padding-right: 8px;
*padding-bottom: 4px; *padding-bottom: 4px;
...@@ -3398,17 +3401,17 @@ input[type="submit"].btn.btn-mini { ...@@ -3398,17 +3401,17 @@ input[type="submit"].btn.btn-mini {
box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
} }
.btn-group > .btn-mini.dropdown-toggle { .btn-group > .btn-mini + .dropdown-toggle {
padding-right: 5px; padding-right: 5px;
padding-left: 5px; padding-left: 5px;
} }
.btn-group > .btn-small.dropdown-toggle { .btn-group > .btn-small + .dropdown-toggle {
*padding-top: 4px; *padding-top: 4px;
*padding-bottom: 4px; *padding-bottom: 4px;
} }
.btn-group > .btn-large.dropdown-toggle { .btn-group > .btn-large + .dropdown-toggle {
padding-right: 12px; padding-right: 12px;
padding-left: 12px; padding-left: 12px;
} }
...@@ -3449,26 +3452,17 @@ input[type="submit"].btn.btn-mini { ...@@ -3449,26 +3452,17 @@ input[type="submit"].btn.btn-mini {
} }
.btn .caret { .btn .caret {
margin-top: 7px; margin-top: 8px;
margin-left: 0; margin-left: 0;
} }
.btn:hover .caret, .btn-mini .caret,
.open.btn-group .caret { .btn-small .caret,
opacity: 1; .btn-large .caret {
filter: alpha(opacity=100);
}
.btn-mini .caret {
margin-top: 5px;
}
.btn-small .caret {
margin-top: 6px; margin-top: 6px;
} }
.btn-large .caret { .btn-large .caret {
margin-top: 6px;
border-top-width: 5px; border-top-width: 5px;
border-right-width: 5px; border-right-width: 5px;
border-left-width: 5px; border-left-width: 5px;
...@@ -3487,8 +3481,6 @@ input[type="submit"].btn.btn-mini { ...@@ -3487,8 +3481,6 @@ input[type="submit"].btn.btn-mini {
.btn-inverse .caret { .btn-inverse .caret {
border-top-color: #ffffff; border-top-color: #ffffff;
border-bottom-color: #ffffff; border-bottom-color: #ffffff;
opacity: 0.75;
filter: alpha(opacity=75);
} }
.btn-group-vertical { .btn-group-vertical {
......
...@@ -34,11 +34,13 @@ ...@@ -34,11 +34,13 @@
} }
.btn-group > .btn, .btn-group > .btn,
.btn-group > .dropdown-menu { .btn-group > .dropdown-menu {
font-size: 13px; // redeclare as part 2 of font-size inline-block hack font-size: @baseFontSize; // redeclare as part 2 of font-size inline-block hack
} }
// Reset fonts for other sizes // Reset fonts for other sizes
.btn-group > .btn-mini, .btn-group > .btn-mini {
font-size: 11px;
}
.btn-group > .btn-small { .btn-group > .btn-small {
font-size: 12px; font-size: 12px;
} }
...@@ -106,22 +108,22 @@ ...@@ -106,22 +108,22 @@
// ---------------------- // ----------------------
// Give the line between buttons some depth // Give the line between buttons some depth
.btn-group > .dropdown-toggle { .btn-group > .btn + .dropdown-toggle {
padding-left: 8px; padding-left: 8px;
padding-right: 8px; padding-right: 8px;
.box-shadow(~"inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)"); .box-shadow(~"inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)");
*padding-top: 4px; *padding-top: 4px;
*padding-bottom: 4px; *padding-bottom: 4px;
} }
.btn-group > .btn-mini.dropdown-toggle { .btn-group > .btn-mini + .dropdown-toggle {
padding-left: 5px; padding-left: 5px;
padding-right: 5px; padding-right: 5px;
} }
.btn-group > .btn-small.dropdown-toggle { .btn-group > .btn-small + .dropdown-toggle {
*padding-top: 4px; *padding-top: 4px;
*padding-bottom: 4px; *padding-bottom: 4px;
} }
.btn-group > .btn-large.dropdown-toggle { .btn-group > .btn-large + .dropdown-toggle {
padding-left: 12px; padding-left: 12px;
padding-right: 12px; padding-right: 12px;
} }
...@@ -162,22 +164,16 @@ ...@@ -162,22 +164,16 @@
// Reposition the caret // Reposition the caret
.btn .caret { .btn .caret {
margin-top: 7px; margin-top: 8px;
margin-left: 0; margin-left: 0;
} }
.btn:hover .caret,
.open.btn-group .caret {
.opacity(100);
}
// Carets in other button sizes // Carets in other button sizes
.btn-mini .caret { .btn-mini .caret,
margin-top: 5px; .btn-small .caret,
} .btn-large .caret {
.btn-small .caret {
margin-top: 6px; margin-top: 6px;
} }
.btn-large .caret { .btn-large .caret {
margin-top: 6px;
border-left-width: 5px; border-left-width: 5px;
border-right-width: 5px; border-right-width: 5px;
border-top-width: 5px; border-top-width: 5px;
...@@ -200,7 +196,6 @@ ...@@ -200,7 +196,6 @@
.caret { .caret {
border-top-color: @white; border-top-color: @white;
border-bottom-color: @white; border-bottom-color: @white;
.opacity(75);
} }
} }
......
...@@ -12,9 +12,9 @@ ...@@ -12,9 +12,9 @@
.ie7-inline-block(); .ie7-inline-block();
padding: 4px 14px; padding: 4px 14px;
margin-bottom: 0; // For input.btn margin-bottom: 0; // For input.btn
font-size: 13px; font-size: @baseFontSize;
line-height: 20px; line-height: @baseLineHeight;
*line-height: 20px; *line-height: @baseLineHeight;
text-align: center; text-align: center;
vertical-align: middle; vertical-align: middle;
cursor: pointer; cursor: pointer;
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
// Mini // Mini
.btn-mini { .btn-mini {
padding: 2px 6px; padding: 2px 6px;
font-size: @baseFontSize - 2px; font-size: @baseFontSize - 3px;
line-height: @baseLineHeight - 4px; line-height: @baseLineHeight - 4px;
} }
......
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
// ------------------------- // -------------------------
@btnBackground: @white; @btnBackground: @white;
@btnBackgroundHighlight: darken(@white, 10%); @btnBackgroundHighlight: darken(@white, 10%);
@btnBorder: #ccc; @btnBorder: #bbb;
@btnPrimaryBackground: @linkColor; @btnPrimaryBackground: @linkColor;
@btnPrimaryBackgroundHighlight: spin(@btnPrimaryBackground, 20%); @btnPrimaryBackgroundHighlight: spin(@btnPrimaryBackground, 20%);
......
Markdown is supported
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