Update Gruntfile.js to copy 'dist/' files to 'docs/dist/' with 'grunt…

… dist' task; Fixes twbs#12030: navbar toggle focus state
fehays · Jan 1, 2014 · 50cf0b1 · 50cf0b1
1 parent 83d26de
commit 50cf0b1
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 7 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -322,7 +322,7 @@ module.exports = function (grunt) {
   grunt.registerTask('dist-docs', ['copy:docs']);
 
   // Full distribution task.
-  grunt.registerTask('dist', ['clean', 'dist-css', 'copy:fonts', 'dist-js']);
+  grunt.registerTask('dist', ['clean', 'dist-css', 'copy:fonts', 'dist-docs', 'dist-js']);
 
   // Default task.
   grunt.registerTask('default', ['test', 'dist', 'build-glyphicons-data', 'build-customizer']);

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
diff --git a/dist/css/bootstrap.css.map b/dist/css/bootstrap.css.map
diff --git a/dist/css/bootstrap.min.css b/dist/css/bootstrap.min.css
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
@@ -110,10 +110,11 @@ body {
   color: #fff;
   background-color: #463265;
 }
-.bs-docs-nav .navbar-toggle {
+.bs-docs-nav .navbar-header .navbar-toggle {
   border-color: #563d7c;
 }
-.bs-docs-nav .navbar-toggle:hover {
+.bs-docs-nav .navbar-header .navbar-toggle:hover,
+.bs-docs-nav .navbar-header .navbar-toggle:focus {
   background-color: #463265;
   border-color: #463265;
 }

diff --git a/docs/assets/js/raw-files.js b/docs/assets/js/raw-files.js
diff --git a/docs/dist/css/bootstrap.min.css b/docs/dist/css/bootstrap.min.css
diff --git a/less/navbar.less b/less/navbar.less
@@ -193,6 +193,12 @@
   border: 1px solid transparent;
   border-radius: @border-radius-base;
 
+  // We remove the `outline` here, but later compensate by attaching `:hover`
+  // styles to `:focus`.
+  &:focus {
+    outline: none;
+  }
+
   // Bars
   .icon-bar {
     display: block;