added back focus states, still have a few bugs with dropdowns

Ben Centra · Ben Centra · commit 06571854fbf2 · 2014-11-02T20:52:02.000-05:00
diff --git a/dev/members.css b/dev/members.css
@@ -108,7 +108,8 @@ a.btn {
 .nav-tabs li.active > a {
   color: #8b2c93;
 }
-.nav-tabs li.active > a:hover {
+.nav-tabs li.active > a:hover,
+.nav-tabs li.active > a:focus {
   color: #66206c;
 }
 .nav-pills li.active > a {
@@ -117,7 +118,8 @@ a.btn {
 .nav-pills li.active > a .badge {
   color: #66206c;
 }
-.nav-pills li.active > a:hover {
+.nav-pills li.active > a:hover,
+.nav-pills li.active > a:focus {
   background-color: #66206c;
 }
 /*
@@ -126,6 +128,11 @@ a.btn {
 .navbar {
   background-color: #eee;
 }
+.navbar.navbar-fixed-top {
+  border-color: #ffffff;
+  border-width: 0 0 3px 0;
+  box-shadow: 0 6px #df0051;
+}
 /* 
 * Navbar Inverse
 */
@@ -149,12 +156,17 @@ a.btn {
   background-color: #66206c;
 }
 .navbar-inverse .navbar-nav li.active > a:hover,
-.navbar-inverse .navbar-nav li.active > a:active {
+.navbar-inverse .navbar-nav li.active > a:active,
+.navbar-inverse .navbar-nav li.active > a:focus {
   background-color: #66206c;
   color: #e0a6e5;
 }
+.navbar-inverse .navbar-nav li.dropdown .open a {
+  background-color: #66206c;
+}
 .navbar-inverse .navbar-nav li.dropdown a:hover,
-.navbar-inverse .navbar-nav li.dropdown a:active {
+.navbar-inverse .navbar-nav li.dropdown a:active,
+.navbar-inverse .navbar-nav li.dropdown a:focus {
   background-color: #66206c;
 }
 .navbar-inverse .navbar-nav li.dropdown .dropdown-menu li > a {
@@ -167,14 +179,10 @@ a.btn {
 .navbar-inverse .navbar-toggle {
   border-color: #66206c;
 }
-.navbar-inverse .navbar-toggle:hover {
+.navbar-inverse .navbar-toggle:hover,
+.navbar-inverse .navbar-toggle:focus {
   background-color: #66206c;
 }
-.navbar-inverse.navbar-fixed-top {
-  border-color: #ffffff;
-  border-width: 0 0 3px 0;
-  box-shadow: 0 6px #df0051;
-}
 /*
 * Alerts
 */
@@ -286,7 +294,7 @@ a.btn {
   color: #df0051;
 }
 /*
-*
+* Carousel
 */
 .carousel > a.carousel-control {
   color: #ffffff;
diff --git a/dev/members.less b/dev/members.less
@@ -141,7 +141,7 @@ a {
 .nav-tabs {
   li.active > a {
     color: @members-purple;
-    &:hover {
+    &:hover, &:focus {
       color: @members-purple-dark;
     }
   }
@@ -153,7 +153,7 @@ a {
     .badge {
       color: @members-purple-dark;
     }
-    &:hover {
+    &:hover, &:focus {
       background-color: @members-purple-dark;
     }
   }
@@ -165,6 +165,11 @@ a {
 
 .navbar {
   background-color: #eee;
+  &.navbar-fixed-top {
+    border-color: @white;
+    border-width: 0 0 3px 0;
+    box-shadow: 0 6px @members-pink;
+  }
 }
 
 /* 
@@ -189,13 +194,18 @@ a {
     }
     li.active > a {
       background-color: @members-purple-dark;
-      &:hover, &:active {
+      &:hover, &:active, &:focus {
         background-color: @members-purple-dark;
         color: @members-puprle-light;
       }
     }
     li.dropdown {
-      a:hover, a:active {
+      .open {
+        a {
+          background-color: @members-purple-dark;
+        }
+      }
+      a:hover, a:active, a:focus {
         background-color: @members-purple-dark;
       }
       .dropdown-menu {
@@ -210,15 +220,10 @@ a {
   }
   .navbar-toggle {
     border-color: @members-purple-dark;
-    &:hover {
+    &:hover, &:focus {
       background-color: @members-purple-dark;
     }
   }
-  &.navbar-fixed-top {
-    border-color: @white;
-    border-width: 0 0 3px 0;
-    box-shadow: 0 6px @members-pink;
-  }
 }
 
 /*
@@ -350,7 +355,7 @@ a {
 }
 
 /*
-*
+* Carousel
 */
 
 .carousel {
diff --git a/release/members.min.css b/release/members.min.css

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ a {`
`141`	`141`	`.nav-tabs {`
`142`	`142`	`li.active > a {`
`143`	`143`	`color: @members-purple;`
`144`		`- &:hover {`
	`144`	`+ &:hover, &:focus {`
`145`	`145`	`color: @members-purple-dark;`
`146`	`146`	`}`
`147`	`147`	`}`
`@@ -153,7 +153,7 @@ a {`
`153`	`153`	`.badge {`
`154`	`154`	`color: @members-purple-dark;`
`155`	`155`	`}`
`156`		`- &:hover {`
	`156`	`+ &:hover, &:focus {`
`157`	`157`	`background-color: @members-purple-dark;`
`158`	`158`	`}`
`159`	`159`	`}`
`@@ -165,6 +165,11 @@ a {`
`165`	`165`
`166`	`166`	`.navbar {`
`167`	`167`	`background-color: #eee;`
	`168`	`+ &.navbar-fixed-top {`
	`169`	`+ border-color: @white;`
	`170`	`+ border-width: 0 0 3px 0;`
	`171`	`+ box-shadow: 0 6px @members-pink;`
	`172`	`+ }`
`168`	`173`	`}`
`169`	`174`
`170`	`175`	`/*`
`@@ -189,13 +194,18 @@ a {`
`189`	`194`	`}`
`190`	`195`	`li.active > a {`
`191`	`196`	`background-color: @members-purple-dark;`
`192`		`- &:hover, &:active {`
	`197`	`+ &:hover, &:active, &:focus {`
`193`	`198`	`background-color: @members-purple-dark;`
`194`	`199`	`color: @members-puprle-light;`
`195`	`200`	`}`
`196`	`201`	`}`
`197`	`202`	`li.dropdown {`
`198`		`- a:hover, a:active {`
	`203`	`+ .open {`
	`204`	`+ a {`
	`205`	`+ background-color: @members-purple-dark;`
	`206`	`+ }`
	`207`	`+ }`
	`208`	`+ a:hover, a:active, a:focus {`
`199`	`209`	`background-color: @members-purple-dark;`
`200`	`210`	`}`
`201`	`211`	`.dropdown-menu {`
`@@ -210,15 +220,10 @@ a {`
`210`	`220`	`}`
`211`	`221`	`.navbar-toggle {`
`212`	`222`	`border-color: @members-purple-dark;`
`213`		`- &:hover {`
	`223`	`+ &:hover, &:focus {`
`214`	`224`	`background-color: @members-purple-dark;`
`215`	`225`	`}`
`216`	`226`	`}`
`217`		`- &.navbar-fixed-top {`
`218`		`- border-color: @white;`
`219`		`- border-width: 0 0 3px 0;`
`220`		`- box-shadow: 0 6px @members-pink;`
`221`		`- }`
`222`	`227`	`}`
`223`	`228`
`224`	`229`	`/*`
`@@ -350,7 +355,7 @@ a {`
`350`	`355`	`}`
`351`	`356`
`352`	`357`	`/*`
`353`		`-*`
	`358`	`+* Carousel`
`354`	`359`	`*/`
`355`	`360`
`356`	`361`	`.carousel {`