Merge branch 'accessibility' into 2.1.0-wip

Conflicts:
	docs/assets/js/bootstrap.min.js
	docs/javascript.html
	docs/templates/pages/javascript.mustache

1 files changed, 12 insertions, 2 deletions

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index bb40c85f7..0bd063ee7 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2384,12 +2384,17 @@ table .span24 {
   margin-left: 2px;
 }
 
-.dropdown:hover .caret,
+.dropdown a:focus .caret,
+.dropdown a:hover .caret,
 .open .caret {
   opacity: 1;
   filter: alpha(opacity=100);
 }
 
+.navbar .nav .open > a {
+  color: #ffffff;
+}
+
 .dropdown-menu {
   position: absolute;
   top: 100%;
@@ -2443,11 +2448,13 @@ table .span24 {
 }
 
 .dropdown-menu li > a:hover,
+.dropdown-menu li > a:focus,
 .dropdown-menu .active > a,
 .dropdown-menu .active > a:hover {
   color: #ffffff;
   text-decoration: none;
   background-color: #0088cc;
+  outline: 0;
 }
 
 .open {
@@ -3810,6 +3817,7 @@ input[type="submit"].btn.btn-mini {
   margin: 0;
 }
 
+.navbar .nav > li > a:focus,
 .navbar .nav > li > a:hover {
   color: #ffffff;
   text-decoration: none;
@@ -3817,7 +3825,8 @@ input[type="submit"].btn.btn-mini {
 }
 
 .navbar .nav .active > a,
-.navbar .nav .active > a:hover {
+.navbar .nav .active > a:hover,
+.navbar .nav .active > a:focus {
   color: #ffffff;
   text-decoration: none;
   background-color: #222222;
@@ -3947,6 +3956,7 @@ input[type="submit"].btn.btn-mini {
   background-color: transparent;
 }
 
+.navbar .nav li.dropdown.active > .dropdown-toggle:focus,
 .navbar .nav li.dropdown.active > .dropdown-toggle:hover {
   color: #ffffff;
 }