Merge pull request #12938 from vingtetun/hover

Bug 921824 - Highlight color is often not visible after a click on an el...
mozilla-b2g · Oct 18, 2013 · ab67baa · ab67baa
2 parents 70f1841 + 701832d
commit ab67baa
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/shared/style/edit_mode.css b/shared/style/edit_mode.css
@@ -105,13 +105,16 @@ form[role="dialog"][data-type="edit"] header menu[type="toolbar"] button:last-ch
 /* Press state */
 form[role="dialog"][data-type="edit"] header button::-moz-focus-inner,
 form[role="dialog"][data-type="edit"] header button:active,
+form[role="dialog"][data-type="edit"] header button:hover,
 form[role="dialog"][data-type="edit"] header button:focus {
   outline: none !important;
   border: none !important;
 }
 
 form[role="dialog"][data-type="edit"] header button:active:after,
-form[role="dialog"][data-type="edit"] header menu[type="toolbar"] button:active  {
+form[role="dialog"][data-type="edit"] header button:hover:after,
+form[role="dialog"][data-type="edit"] header menu[type="toolbar"] button:hover,
+form[role="dialog"][data-type="edit"] header menu[type="toolbar"] button:active {
   background: #008aaa !important;
   color: #fff;
 }
@@ -211,6 +214,8 @@ form[role="dialog"][data-type="edit"] menu button {
 
 /* Press (default & recommend) */
 form[role="dialog"][data-type="edit"] menu button:active,
+form[role="dialog"][data-type="edit"] menu button:hover,
+form[role="dialog"][data-type="edit"] menu button.recommend:hover,
 form[role="dialog"][data-type="edit"] menu button.recommend:active {
   border-color: #008aaa;
   background: #008aaa;
@@ -234,7 +239,8 @@ form[role="dialog"][data-type="edit"] menu button.danger{
 }
 
 /* Danger Press */
-form[role="dialog"][data-type="edit"] menu button.danger:active{
+form[role="dialog"][data-type="edit"] menu button.danger:hover,
+form[role="dialog"][data-type="edit"] menu button.danger:active {
   background-image: url(edit_mode/images/ui/danger-press.png);
   background-color: #890707;
 }

diff --git a/shared/style/headers.css b/shared/style/headers.css
@@ -150,6 +150,10 @@ section[role="region"] > header:first-child button:focus {
 
 section[role="region"] > header:first-child > a:not([aria-disabled="true"]):active:after,
 section[role="region"] > header:first-child > button:not(:disabled):active:after,
+section[role="region"] > header:first-child > a:not([aria-disabled="true"]):hover:after,
+section[role="region"] > header:first-child > button:not(:disabled):hover:after,
+section[role="region"] > header:first-child menu[type="toolbar"] a:not([aria-disabled="true"]):hover,
+section[role="region"] > header:first-child menu[type="toolbar"] button:not(:disabled):hover,
 section[role="region"] > header:first-child menu[type="toolbar"] a:not([aria-disabled="true"]):active,
 section[role="region"] > header:first-child menu[type="toolbar"] button:not(:disabled):active  {
   background: #008aaa !important;

diff --git a/shared/style_unstable/lists.css b/shared/style_unstable/lists.css
@@ -72,10 +72,9 @@
   z-index: 0;
 }
 
-[data-type="list"] li > a:active:after {
+[data-type="list"] li > a:active:after,
+[data-type="list"] li > a:hover:after {
   opacity: 0.6;
-  /* Only transition on 'press', not on 'release' */
-  transition: opacity 0.2s ease;
 }
 
 /* Disabled */
@@ -195,6 +194,7 @@
   pointer-events: auto;
 }
 
-[data-type="list"] [data-type="edit"] li > a:active:after {
+[data-type="list"] [data-type="edit"] li > a:active:after,
+[data-type="list"] [data-type="edit"] li > a:hover:after {
   display: none;
-}
+}