Bug 1377794 - Make the identity block background darker when active/open and hide the focus outline when clicked. r?daleharvey draft
authorDão Gottwald <dao@mozilla.com>
Thu, 06 Jul 2017 09:37:19 +0200
changeset 604640 9f94b9eff034fe9559912ac97fba8eeff1459199
parent 604481 af0466865a212c84fbbab343c9cbb984c6132920
child 636250 b5c189f27cd3c2aff66d76fe4b9ba8671627b0fa
push id67143
push userdgottwald@mozilla.com
push dateThu, 06 Jul 2017 07:37:57 +0000
reviewersdaleharvey
bugs1377794
milestone56.0a1
Bug 1377794 - Make the identity block background darker when active/open and hide the focus outline when clicked. r?daleharvey MozReview-Commit-ID: F1hiDzoTRWf
browser/themes/linux/browser.css
browser/themes/osx/browser.css
browser/themes/shared/identity-block/identity-block.inc.css
browser/themes/windows/browser.css
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -451,17 +451,17 @@ menuitem.bookmark-item {
   border-bottom-left-radius: 1.5px;
 }
 
 #identity-box:-moz-locale-dir(rtl) {
   border-top-right-radius: 1.5px;
   border-bottom-right-radius: 1.5px;
 }
 
-#identity-box:-moz-focusring {
+#identity-box:not(:active):-moz-focusring {
   outline: 1px dotted;
   outline-offset: -3px;
 }
 
 %include ../shared/identity-block/identity-block.inc.css
 
 %include ../shared/notification-icons.inc.css
 
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -662,17 +662,17 @@ toolbarpaletteitem[place="palette"] > #p
   border-bottom-left-radius: 2px;
 }
 
 #identity-box:-moz-locale-dir(rtl) {
   border-top-right-radius: 2px;
   border-bottom-right-radius: 2px;
 }
 
-#identity-box:-moz-focusring {
+#identity-box:not(:active):-moz-focusring {
   box-shadow: var(--focus-ring-box-shadow);
   border-inline-end-style: none;
   padding-inline-end: 5px;
 }
 .urlbar-input-box {
   margin: 0;
   padding: 3px 0 2px;
 }
--- a/browser/themes/shared/identity-block/identity-block.inc.css
+++ b/browser/themes/shared/identity-block/identity-block.inc.css
@@ -14,20 +14,23 @@
      the forward button when hovered. */
   transition: padding-left, padding-right;
 %endif
   /* This is for tracking-protection-icon's slide-in animation. */
   overflow: hidden;
 }
 
 %ifdef MOZ_PHOTON_THEME
-#identity-box:hover:not(.no-hover),
-#identity-box[open=true],
-#identity-box.grantedPermissions[open=true] {
-  background-color: hsla(240, 5%, 5%, .05);
+#identity-box:hover:not(.no-hover):not([open=true]) {
+  background-color: hsla(240,5%,5%,.05);
+}
+
+#identity-box:hover:active:not(.no-hover),
+#identity-box[open=true] {
+  background-color: hsla(240,5%,5%,.1);
 }
 %endif
 
 #urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity > #identity-icon-labels {
 %ifdef MOZ_PHOTON_THEME
   color: #058B00;
 %else
   color: hsl(92,100%,30%);
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -899,17 +899,17 @@ html|*.urlbar-input:-moz-lwtheme::placeh
 %include ../shared/urlbarSearchSuggestionsNotification.inc.css
 
 #search-container {
   min-width: calc(54px + 11ch);
 }
 
 /* identity box */
 
-#identity-box:-moz-focusring {
+#identity-box:not(:active):-moz-focusring {
   outline: 1px dotted;
   outline-offset: -3px;
 }
 
 /* Location bar dropmarker */
 
 .urlbar-history-dropmarker {
   -moz-appearance: none;