Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

5 files changed, 19 insertions, 11 deletions

diff --git a/less/button-groups.less b/less/button-groups.less
index 3e08e6b09..7367103ca 100644
--- a/less/button-groups.less
+++ b/less/button-groups.less
@@ -78,6 +78,13 @@
   z-index: 2;
 }
 
+// On active and open, don't show outline
+.btn-group .dropdown-toggle:active,
+.btn-group.open .dropdown-toggle {
+  outline: 0;
+}
+
+
 
 // Split button dropdowns
 // ----------------------
diff --git a/less/buttons.less b/less/buttons.less
index f1060dc6b..54d00a13a 100644
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -88,6 +88,7 @@
     background-color: darken(@white, 10%);
     background-color: darken(@white, 15%) e("\9");
     color: rgba(0,0,0,.5);
+    outline: 0;
   }
   &.disabled,
   &[disabled] {
diff --git a/less/dropdowns.less b/less/dropdowns.less
index e73b056e9..83f535ae8 100644
--- a/less/dropdowns.less
+++ b/less/dropdowns.less
@@ -5,10 +5,14 @@
 .dropdown {
   position: relative;
 }
-.dropdown .dropdown-toggle {
+.dropdown-toggle {
   // The caret makes the toggle a bit too tall in IE7
   *margin-bottom: -3px;
 }
+.dropdown-toggle:active,
+.open .dropdown-toggle {
+  outline: 0;
+}
 // Dropdown arrow/caret
 .caret {
   display: inline-block;
diff --git a/less/mixins.less b/less/mixins.less
index 2ed28ac3f..5daa22234 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -29,10 +29,6 @@
   // Webkit
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
-  // Firefox
-  -moz-outline: 5px auto -moz-mac-focusring;
-  -moz-outline-radius: 6px;
-  -moz-outline-offset: 0;
 }
 
 // Center-align a block level element
@@ -333,11 +329,11 @@
     background-repeat: no-repeat;
   }
   .radial(@innerColor: #555, @outerColor: #333)  {
-    background-color: @outsideColor;
-    background-image: -webkit-gradient(radial, center center, 0, center center, 460, from(@centerColor), to(@outsideColor));
-    background-image: -webkit-radial-gradient(circle, @centerColor, @outsideColor);
-    background-image: -moz-radial-gradient(circle, @centerColor, @outsideColor);
-    background-image: -ms-radial-gradient(circle, @centerColor, @outsideColor);
+    background-color: @outerColor;
+    background-image: -webkit-gradient(radial, center center, 0, center center, 460, from(@innerColor), to(@outerColor));
+    background-image: -webkit-radial-gradient(circle, @innerColor, @outerColor);
+    background-image: -moz-radial-gradient(circle, @innerColor, @outerColor);
+    background-image: -ms-radial-gradient(circle, @innerColor, @outerColor);
     background-repeat: no-repeat;
     // Opera cannot do radial gradients yet
   }
diff --git a/less/modals.less b/less/modals.less
index 3e74f4227..36be57bf0 100644
--- a/less/modals.less
+++ b/less/modals.less
@@ -48,7 +48,7 @@
   &.fade.in { top: 50%; }
 }
 .modal-header {
-  padding: 5px 15px;
+  padding: 9px 15px;
   border-bottom: 1px solid #eee;
   // Close icon
   .close { margin-top: 2px; }