Bug 1366484 - Reorganize urlbar and searchbar border color rules for Photon. r=dale

MozReview-Commit-ID: LdAgXlYquEx

browser/themes/linux/browser.css

@@ -265,14 +265,6 @@ menuitem.bookmark-item {
 }
 
 /* Location bar */
-#main-window {
-  --urlbar-border-color: ThreeDShadow;
-  --urlbar-border-color-hover: var(--urlbar-border-color);
-}
-
-#navigator-toolbox:-moz-lwtheme {
-  --urlbar-border-color: rgba(0,0,0,.3);
-}
 
 #urlbar {
   /* override textbox[enablehistory="true"] styling: */
@@ -283,6 +275,11 @@ menuitem.bookmark-item {
 
 %ifdef MOZ_PHOTON_THEME
 
+#urlbar:not(:-moz-lwtheme):not([focused="true"]),
+.searchbar-textbox:not(:-moz-lwtheme):not([focused="true"]) {
+  border-color: ThreeDShadow;
+}
+
 #urlbar[focused="true"],
 .searchbar-textbox[focused="true"] {
   border-color: Highlight;
@@ -290,6 +287,15 @@ menuitem.bookmark-item {
 
 %else
 
+#main-window {
+  --urlbar-border-color: ThreeDShadow;
+  --urlbar-border-color-hover: var(--urlbar-border-color);
+}
+
+#navigator-toolbox:-moz-lwtheme {
+  --urlbar-border-color: rgba(0,0,0,.3);
+}
+
 #urlbar,
 .searchbar-textbox {
   -moz-appearance: none;

browser/themes/osx/browser.css

@@ -526,9 +526,9 @@ toolbarpaletteitem[place="palette"] > #personal-bookmarks > #bookmarks-toolbar-p
 
 %ifdef MOZ_PHOTON_THEME
 
-#main-window {
-  --urlbar-border-color: hsla(240, 5%, 5%, .25);
-  --urlbar-border-color-hover: hsla(240, 5%, 5%, .35);
+#urlbar,
+.searchbar-textbox {
+  font-size: 1.25em;
 }
 
 #urlbar[focused="true"],
@@ -537,11 +537,6 @@ toolbarpaletteitem[place="palette"] > #personal-bookmarks > #bookmarks-toolbar-p
   box-shadow: var(--focus-ring-box-shadow);
 }
 
-#urlbar,
-.searchbar-textbox {
-  font-size: 1.25em;
-}
-
 %else
 
 #urlbar,

browser/themes/shared/urlbar-searchbar.inc.css

@@ -8,14 +8,20 @@
 .searchbar-textbox {
   -moz-appearance: none;
   background-clip: content-box;
-  border: 1px solid var(--urlbar-border-color);
+  border: 1px solid hsla(240,5%,5%,.25);
   border-radius: var(--toolbarbutton-border-radius);
-  box-shadow: 0 1px 4px hsla(0, 0%, 0%, .05);
+  box-shadow: 0 1px 4px rgba(0,0,0,.05);
   padding: 0;
   margin: 0 5px;
   min-height: 30px;
 }
 
+#urlbar:hover,
+.searchbar-textbox:hover {
+  border-color: hsla(240,5%,5%,.35);
+  box-shadow: 0 1px 6px rgba(0,0,0,.1), 0 0 1px rgba(0,0,0,.1);
+}
+
 #urlbar:-moz-lwtheme,
 .searchbar-textbox:-moz-lwtheme {
   background-color: hsla(0,0%,100%,.8);
@@ -29,12 +35,6 @@
   background-color: white;
 }
 
-#urlbar:hover,
-.searchbar-textbox:hover {
-  border: 1px solid var(--urlbar-border-color-hover);
-  box-shadow: 0 1px 6px hsla(0, 0%, 0%, .1), 0 0 1px 0 rgba(0, 0, 0, .1);
-}
-
 %endif
 
 #urlbar-container {

browser/themes/windows/browser.css

@@ -652,31 +652,22 @@ toolbar[brighttext] #close-button {
 
 /* ::::: Location Bar ::::: */
 
-#main-window {
-  --urlbar-border-color: ThreeDShadow;
-  --urlbar-border-color-hover: var(--urlbar-border-color);
-}
-
-#navigator-toolbox:-moz-lwtheme {
-  --urlbar-border-color: var(--toolbarbutton-hover-bordercolor);
-}
-
 %include ../shared/urlbar-searchbar.inc.css
 
 %ifdef MOZ_PHOTON_THEME
 
-@media (-moz-windows-default-theme) {
-  #main-window:not(:-moz-lwtheme) {
-    --urlbar-border-color: hsla(240, 5%, 5%, .25);
-    --urlbar-border-color-hover: hsla(240, 5%, 5%, .35);
-  }
-}
-
 #urlbar,
 .searchbar-textbox {
   font-size: 1.15em;
 }
 
+@media (-moz-windows-default-theme: 0) {
+  #urlbar:not(:-moz-lwtheme):not([focused="true"]),
+  .searchbar-textbox:not(:-moz-lwtheme):not([focused="true"]) {
+    border-color: ThreeDShadow;
+  }
+}
+
 #urlbar[focused="true"],
 .searchbar-textbox[focused="true"] {
   border-color: Highlight;
@@ -684,6 +675,15 @@ toolbar[brighttext] #close-button {
 
 %else
 
+#main-window {
+  --urlbar-border-color: ThreeDShadow;
+  --urlbar-border-color-hover: var(--urlbar-border-color);
+}
+
+#navigator-toolbox:-moz-lwtheme {
+  --urlbar-border-color: var(--toolbarbutton-hover-bordercolor);
+}
+
 @media (-moz-windows-default-theme) {
   @media (-moz-os-version: windows-win7),
          (-moz-os-version: windows-win8) {