2 files changed, 17 insertions, 8 deletions
diff --git a/lib/forms.less b/lib/forms.less
index 0440e3c67..0eae90a73 100644
--- 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
index e76cbd475..f308e5ebf 100644
--- 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