Commit 1d4e345e authored by Mark Otto's avatar Mark Otto

bug fixing

parent 3a99b98a
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Designed and built with all the love in the world @twitter by @mdo and @fat. * Designed and built with all the love in the world @twitter by @mdo and @fat.
* Date: Thu Sep 8 23:07:35 PDT 2011 * Date: Fri Sep 9 00:02:14 PDT 2011
*/ */
/* Reset.less /* Reset.less
* Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
...@@ -670,7 +670,7 @@ fieldset { ...@@ -670,7 +670,7 @@ fieldset {
} }
fieldset legend { fieldset legend {
display: block; display: block;
margin-left: 150px; padding-left: 150px;
font-size: 19.5px; font-size: 19.5px;
line-height: 1; line-height: 1;
*margin: 0 0 5px 145px; *margin: 0 0 5px 145px;
...@@ -771,7 +771,7 @@ textarea { ...@@ -771,7 +771,7 @@ textarea {
::-webkit-input-placeholder { ::-webkit-input-placeholder {
color: #bfbfbf; color: #bfbfbf;
} }
input, select, textarea { input, textarea {
-webkit-transition: border linear 0.2s, box-shadow linear 0.2s; -webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
-moz-transition: border linear 0.2s, box-shadow linear 0.2s; -moz-transition: border linear 0.2s, box-shadow linear 0.2s;
-ms-transition: border linear 0.2s, box-shadow linear 0.2s; -ms-transition: border linear 0.2s, box-shadow linear 0.2s;
...@@ -781,13 +781,19 @@ input, select, textarea { ...@@ -781,13 +781,19 @@ input, select, textarea {
-moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1); -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1);
box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1); box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1);
} }
input:focus, select:focus, textarea:focus { input:focus, textarea:focus {
outline: none; outline: none;
border-color: rgba(82, 168, 236, 0.8); border-color: rgba(82, 168, 236, 0.8);
-webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
-moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
} }
input[type=file]:focus, input[type=checkbox]:focus, select:focus {
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
outline: 1px dotted #666;
}
form div.error { form div.error {
background: #fae5e3; background: #fae5e3;
padding: 10px 0; padding: 10px 0;
...@@ -1442,7 +1448,7 @@ a.menu:after, .dropdown-toggle:after { ...@@ -1442,7 +1448,7 @@ a.menu:after, .dropdown-toggle:after {
display: none; display: none;
position: absolute; position: absolute;
top: 40px; top: 40px;
z-index: 1000; z-index: 900;
min-width: 160px; min-width: 160px;
max-width: 220px; max-width: 220px;
_width: 160px; _width: 160px;
...@@ -1713,6 +1719,9 @@ footer { ...@@ -1713,6 +1719,9 @@ footer {
color: #333; color: #333;
text-decoration: none; text-decoration: none;
} }
.btn:focus {
outline: 1px dotted #666;
}
.btn.primary { .btn.primary {
color: #fff; color: #fff;
background-color: #0064cd; background-color: #0064cd;
...@@ -1759,7 +1768,7 @@ footer { ...@@ -1759,7 +1768,7 @@ footer {
box-shadow: none; box-shadow: none;
} }
.btn.large { .btn.large {
font-size: 16px; font-size: 15px;
line-height: normal; line-height: normal;
padding: 9px 14px 9px; padding: 9px 14px 9px;
-webkit-border-radius: 6px; -webkit-border-radius: 6px;
......
This diff is collapsed.
...@@ -16,7 +16,7 @@ fieldset { ...@@ -16,7 +16,7 @@ fieldset {
padding-top: @baseline; padding-top: @baseline;
legend { legend {
display: block; display: block;
margin-left: 150px; padding-left: 150px;
font-size: @basefont * 1.5; font-size: @basefont * 1.5;
line-height: 1; line-height: 1;
*margin: 0 0 5px 145px; /* IE6-7 */ *margin: 0 0 5px 145px; /* IE6-7 */
...@@ -41,8 +41,8 @@ textarea { ...@@ -41,8 +41,8 @@ textarea {
// Float labels left // Float labels left
label { label {
padding-top: 6px; padding-top: 6px;
font-size: 13px; font-size: @basefont;
line-height: 18px; line-height: @baseline;
float: left; float: left;
width: 130px; width: 130px;
text-align: right; text-align: right;
...@@ -132,20 +132,24 @@ textarea { ...@@ -132,20 +132,24 @@ textarea {
// Focus states // Focus states
input, input,
select,
textarea { textarea {
@transition: border linear .2s, box-shadow linear .2s; @transition: border linear .2s, box-shadow linear .2s;
.transition(@transition); .transition(@transition);
.box-shadow(inset 0 1px 3px rgba(0,0,0,.1)); .box-shadow(inset 0 1px 3px rgba(0,0,0,.1));
} }
input:focus, input:focus,
select:focus,
textarea:focus { textarea:focus {
outline: none; outline: none;
border-color: rgba(82,168,236,.8); border-color: rgba(82,168,236,.8);
@shadow: inset 0 1px 3px rgba(0,0,0,.1), 0 0 8px rgba(82,168,236,.6); @shadow: inset 0 1px 3px rgba(0,0,0,.1), 0 0 8px rgba(82,168,236,.6);
.box-shadow(@shadow); .box-shadow(@shadow);
} }
input[type=file]:focus,
input[type=checkbox]:focus,
select:focus {
.box-shadow(none); // override for file inputs
outline: 1px dotted #666; // Selet elements don't get box-shadow styles, so instead we do outline
}
// Error styles // Error styles
form div.error { form div.error {
......
...@@ -491,7 +491,7 @@ footer { ...@@ -491,7 +491,7 @@ footer {
padding: 5px 14px 6px; padding: 5px 14px 6px;
text-shadow: 0 1px 1px rgba(255,255,255,.75); text-shadow: 0 1px 1px rgba(255,255,255,.75);
color: #333; color: #333;
font-size: 13px; font-size: @basefont;
line-height: normal; line-height: normal;
border: 1px solid #ccc; border: 1px solid #ccc;
border-bottom-color: #bbb; border-bottom-color: #bbb;
...@@ -505,6 +505,11 @@ footer { ...@@ -505,6 +505,11 @@ footer {
text-decoration: none; text-decoration: none;
} }
// Focus state for keyboard and accessibility
&:focus {
outline: 1px dotted #666;
}
// Primary Button Type // Primary Button Type
&.primary { &.primary {
color:#fff; color:#fff;
...@@ -538,14 +543,14 @@ footer { ...@@ -538,14 +543,14 @@ footer {
// Button Sizes // Button Sizes
&.large { &.large {
font-size: 16px; font-size: @basefont + 2px;
line-height: normal; line-height: normal;
padding: 9px 14px 9px; padding: 9px 14px 9px;
.border-radius(6px); .border-radius(6px);
} }
&.small { &.small {
padding: 7px 9px 7px; padding: 7px 9px 7px;
font-size: 11px; font-size: @basefont - 2px;
} }
} }
// Super jank hack for removing border-radius from IE9 so we can keep filter gradients on alerts and buttons // Super jank hack for removing border-radius from IE9 so we can keep filter gradients on alerts and buttons
......
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