]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
fix buttons focus state and swap a buttons for button buttons
authorMark Otto <markotto@twitter.com>
Fri, 17 Feb 2012 05:25:40 +0000 (21:25 -0800)
committerMark Otto <markotto@twitter.com>
Fri, 17 Feb 2012 05:25:40 +0000 (21:25 -0800)
docs/assets/bootstrap.zip
docs/assets/css/bootstrap.css
docs/base-css.html
docs/templates/pages/base-css.mustache
less/mixins.less

index 644dd58f7a26b2d26cf1ee1dffa7bfe80366de7d..71552e7f80c7166249aa278e0293710f224cf2f7 100644 (file)
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
index 57c30ab63c49bbff75ee6379995f9e2a9a10c082..e16383b1cc3717a120e72f9fb0b9367db6df80e3 100644 (file)
@@ -33,7 +33,7 @@ html {
   -ms-text-size-adjust: 100%;
 }
 a:focus {
-  outline: thin dotted;
+  outline: thin dotted #333;
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
 }
@@ -675,7 +675,7 @@ select:focus {
   -webkit-box-shadow: none;
   -moz-box-shadow: none;
   box-shadow: none;
-  outline: thin dotted;
+  outline: thin dotted #333;
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
 }
@@ -1749,7 +1749,7 @@ table .span12 {
   transition: background-position 0.1s linear;
 }
 .btn:focus {
-  outline: thin dotted;
+  outline: thin dotted #333;
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;
 }
index d67d1bd554f3c3540cbba74d249b516ca006fe7e..7ab18108c1299d9666ee2a99ec3ee99fd1d458c4 100644 (file)
@@ -1266,37 +1266,37 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
     </thead>
     <tbody>
       <tr>
-        <td><a class="btn" href="#">Default</a></td>
+        <td><button class="btn" href="#">Default</button></td>
         <td><code>.btn</code></td>
         <td>Standard gray button with gradient</td>
       </tr>
       <tr>
-        <td><a class="btn btn-primary" href="#">Primary</a></td>
+        <td><button class="btn btn-primary" href="#">Primary</button></td>
         <td><code>.btn-primary</code></td>
         <td>Provides extra visual weight and identifies the primary action in a set of buttons</td>
       </tr>
       <tr>
-        <td><a class="btn btn-info" href="#">Info</a></td>
+        <td><button class="btn btn-info" href="#">Info</button></td>
         <td><code>.btn-info</code></td>
         <td>Used as an alternate to the default styles</td>
       </tr>
       <tr>
-        <td><a class="btn btn-success" href="#">Success</a></td>
+        <td><button class="btn btn-success" href="#">Success</button></td>
         <td><code>.btn-success</code></td>
         <td>Indicates a successful or positive action</td>
       </tr>
       <tr>
-        <td><a class="btn btn-warning" href="#">Warning</a></td>
+        <td><button class="btn btn-warning" href="#">Warning</button></td>
         <td><code>.btn-warning</code></td>
         <td>Indicates caution should be taken with this action</td>
       </tr>
       <tr>
-        <td><a class="btn btn-danger" href="#">Danger</a></td>
+        <td><button class="btn btn-danger" href="#">Danger</button></td>
         <td><code>.btn-danger</code></td>
         <td>Indicates a dangerous or potentially negative action</td>
       </tr>
          <tr>
-        <td><a class="btn btn-inverse" href="#">Inverse</a></td>
+        <td><button class="btn btn-inverse" href="#">Inverse</button></td>
         <td><code>.btn-inverse</code></td>
         <td>Alternate dark gray button, not tied to a semantic action or use</td>
       </tr>
index 4b2f379c58ff6dd6d982281472a4fbc1a5255d9e..f3d18ffd0263f27479fb4ab51a7458cac93dc1c3 100644 (file)
     </thead>
     <tbody>
       <tr>
-        <td><a class="btn" href="#">{{_i}}Default{{/i}}</a></td>
+        <td><button class="btn" href="#">{{_i}}Default{{/i}}</button></td>
         <td><code>.btn</code></td>
         <td>{{_i}}Standard gray button with gradient{{/i}}</td>
       </tr>
       <tr>
-        <td><a class="btn btn-primary" href="#">{{_i}}Primary{{/i}}</a></td>
+        <td><button class="btn btn-primary" href="#">{{_i}}Primary{{/i}}</button></td>
         <td><code>.btn-primary</code></td>
         <td>{{_i}}Provides extra visual weight and identifies the primary action in a set of buttons{{/i}}</td>
       </tr>
       <tr>
-        <td><a class="btn btn-info" href="#">{{_i}}Info{{/i}}</a></td>
+        <td><button class="btn btn-info" href="#">{{_i}}Info{{/i}}</button></td>
         <td><code>.btn-info</code></td>
         <td>{{_i}}Used as an alternate to the default styles{{/i}}</td>
       </tr>
       <tr>
-        <td><a class="btn btn-success" href="#">{{_i}}Success{{/i}}</a></td>
+        <td><button class="btn btn-success" href="#">{{_i}}Success{{/i}}</button></td>
         <td><code>.btn-success</code></td>
         <td>{{_i}}Indicates a successful or positive action{{/i}}</td>
       </tr>
       <tr>
-        <td><a class="btn btn-warning" href="#">{{_i}}Warning{{/i}}</a></td>
+        <td><button class="btn btn-warning" href="#">{{_i}}Warning{{/i}}</button></td>
         <td><code>.btn-warning</code></td>
         <td>{{_i}}Indicates caution should be taken with this action{{/i}}</td>
       </tr>
       <tr>
-        <td><a class="btn btn-danger" href="#">{{_i}}Danger{{/i}}</a></td>
+        <td><button class="btn btn-danger" href="#">{{_i}}Danger{{/i}}</button></td>
         <td><code>.btn-danger</code></td>
         <td>{{_i}}Indicates a dangerous or potentially negative action{{/i}}</td>
       </tr>
          <tr>
-        <td><a class="btn btn-inverse" href="#">{{_i}}Inverse{{/i}}</a></td>
+        <td><button class="btn btn-inverse" href="#">{{_i}}Inverse{{/i}}</button></td>
         <td><code>.btn-inverse</code></td>
         <td>{{_i}}Alternate dark gray button, not tied to a semantic action or use{{/i}}</td>
       </tr>
index 93bb229b512f7b3ab14df02ee05af6f804bc935b..96af8219d8015558c324212051e30621858985ff 100644 (file)
@@ -25,7 +25,7 @@
 // ------------------
 .tab-focus() {
   // Default
-  outline: thin dotted;
+  outline: thin dotted #333;
   // Webkit
   outline: 5px auto -webkit-focus-ring-color;
   outline-offset: -2px;