bug fixing

lulit · Sep 9, 2011 · 1d4e345 · 1d4e345
1 parent 3a99b98
commit 1d4e345
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 19 deletions.
diff --git a/bootstrap-1.3.0.css b/bootstrap-1.3.0.css
@@ -6,7 +6,7 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  *
  * 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
  * 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 {
 }
 fieldset legend {
   display: block;
-  margin-left: 150px;
+  padding-left: 150px;
   font-size: 19.5px;
   line-height: 1;
   *margin: 0 0 5px 145px;
@@ -771,7 +771,7 @@ textarea {
 ::-webkit-input-placeholder {
   color: #bfbfbf;
 }
-input, select, textarea {
+input, textarea {
   -webkit-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;
@@ -781,13 +781,19 @@ input, select, textarea {
   -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);
 }
-input:focus, select:focus, textarea:focus {
+input:focus, textarea:focus {
   outline: none;
   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);
   -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);
 }
+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 {
   background: #fae5e3;
   padding: 10px 0;
@@ -1442,7 +1448,7 @@ a.menu:after, .dropdown-toggle:after {
   display: none;
   position: absolute;
   top: 40px;
-  z-index: 1000;
+  z-index: 900;
   min-width: 160px;
   max-width: 220px;
   _width: 160px;
@@ -1713,6 +1719,9 @@ footer {
   color: #333;
   text-decoration: none;
 }
+.btn:focus {
+  outline: 1px dotted #666;
+}
 .btn.primary {
   color: #fff;
   background-color: #0064cd;
@@ -1759,7 +1768,7 @@ footer {
   box-shadow: none;
 }
 .btn.large {
-  font-size: 16px;
+  font-size: 15px;
   line-height: normal;
   padding: 9px 14px 9px;
   -webkit-border-radius: 6px;

diff --git a/bootstrap-1.3.0.min.css b/bootstrap-1.3.0.min.css
diff --git a/lib/forms.less b/lib/forms.less
@@ -16,7 +16,7 @@ fieldset {
   padding-top: @baseline;
   legend {
     display: block;
-    margin-left: 150px;
+    padding-left: 150px;
     font-size: @basefont * 1.5;
     line-height: 1;
     *margin: 0 0 5px 145px; /* IE6-7 */
@@ -41,8 +41,8 @@ textarea {
 // Float labels left
 label {
   padding-top: 6px;
-  font-size: 13px;
-  line-height: 18px;
+  font-size: @basefont;
+  line-height: @baseline;
   float: left;
   width: 130px;
   text-align: right;
@@ -132,20 +132,24 @@ textarea {
 
 // Focus states
 input,
-select,
 textarea {
   @transition: border linear .2s, box-shadow linear .2s;
   .transition(@transition);
   .box-shadow(inset 0 1px 3px rgba(0,0,0,.1));
 }
 input:focus,
-select:focus,
 textarea:focus {
   outline: none;
   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);
   .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
 form div.error {

diff --git a/lib/patterns.less b/lib/patterns.less
@@ -491,7 +491,7 @@ footer {
   padding: 5px 14px 6px;
   text-shadow: 0 1px 1px rgba(255,255,255,.75);
   color: #333;
-  font-size: 13px;
+  font-size: @basefont;
   line-height: normal;
   border: 1px solid #ccc;
   border-bottom-color: #bbb;
@@ -505,6 +505,11 @@ footer {
     text-decoration: none;
   }
 
+  // Focus state for keyboard and accessibility
+  &:focus {
+    outline: 1px dotted #666;
+  }
+
   // Primary Button Type
   &.primary {
     color:#fff;
@@ -538,14 +543,14 @@ footer {
 
   // Button Sizes
   &.large {
-    font-size: 16px;
+    font-size: @basefont + 2px;
     line-height: normal;
     padding: 9px 14px 9px;
     .border-radius(6px);
   }
   &.small {
     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