Bug 1173738 - Update URL and search bar borders on Windows 10. r=gijs a=sylvestre
authorDão Gottwald <dao@mozilla.com>
Thu, 02 Jul 2015 00:23:45 +0200
changeset 281507 ba188c7b76e7d9cf6cd5e593e4cf5a63a7f72f8a
parent 281506 e6fa7a2a3846e62aef779c4574af83d4a2de212c
child 281508 49900e53b9d4d2666ec88485c70967eeb351a77c
push id4932
push userjlund@mozilla.com
push dateMon, 10 Aug 2015 18:23:06 +0000
treeherdermozilla-beta@6dd5a4f5f745 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgijs, sylvestre
bugs1173738
milestone41.0a2
Bug 1173738 - Update URL and search bar borders on Windows 10. r=gijs a=sylvestre
browser/themes/windows/browser-aero.css
browser/themes/windows/browser.css
--- a/browser/themes/windows/browser-aero.css
+++ b/browser/themes/windows/browser-aero.css
@@ -42,28 +42,16 @@
 
   #appcontent ~ .sidebar-splitter {
     -moz-border-start: 1px solid #A9B7C9;
     -moz-border-end: none;
     -moz-margin-start: 0;
     -moz-margin-end: -3px;
   }
 
-  #urlbar:not(:-moz-lwtheme),
-  .searchbar-textbox:not(:-moz-lwtheme) {
-    border-color: hsla(210,54%,20%,.25) hsla(210,54%,20%,.27) hsla(210,54%,20%,.3);
-    box-shadow: 0 1px 0 hsla(0,0%,0%,.01) inset,
-                0 1px 0 hsla(0,0%,100%,.1);
-  }
-
-  #urlbar:not(:-moz-lwtheme)[focused],
-  .searchbar-textbox:not(:-moz-lwtheme)[focused] {
-    border-color: Highlight;
-  }
-
   .menu-accel,
   .menu-iconic-accel {
     color: graytext;
   }
 
   .chatbar-button,
   chatbar > chatbox {
     border-color: #A9B7C9;
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -1173,44 +1173,82 @@ toolbarbutton[constrain-size="true"][cui
 .searchbar-textbox {
   -moz-appearance: none;
   margin: 0 3px;
   padding: 0;
   background-clip: padding-box;
   border: 1px solid ThreeDShadow;
 }
 
+#urlbar {
+  -moz-padding-end: 2px;
+}
+
 @media (-moz-os-version: windows-xp),
        (-moz-os-version: windows-vista),
        (-moz-os-version: windows-win7) {
   #urlbar,
   .searchbar-textbox {
     border-radius: 2px;
   }
 }
 
+@media (-moz-windows-default-theme) {
+  #urlbar,
+  .searchbar-textbox {
+    @navbarTextboxCustomBorder@
+  }
+
+  @media (-moz-os-version: windows-vista),
+         (-moz-os-version: windows-win7),
+         (-moz-os-version: windows-win8) {
+    #urlbar:not(:-moz-lwtheme),
+    .searchbar-textbox:not(:-moz-lwtheme) {
+      border-color: hsla(210,54%,20%,.25) hsla(210,54%,20%,.27) hsla(210,54%,20%,.3);
+      box-shadow: 0 1px 0 hsla(0,0%,0%,.01) inset,
+                  0 1px 0 hsla(0,0%,100%,.1);
+    }
+  }
+
+  @media (-moz-os-version: windows-win10) {
+    #urlbar:not(:-moz-lwtheme),
+    .searchbar-textbox:not(:-moz-lwtheme) {
+      border-color: hsl(0,0%,90%);
+      padding: 1px;
+      -moz-padding-end: 3px;
+    }
+
+    #urlbar:not(:-moz-lwtheme):hover,
+    .searchbar-textbox:not(:-moz-lwtheme):hover {
+      border-color: hsl(0,0%,80%);
+      box-shadow: 0 0 0 1px hsl(0,0%,80%) inset;
+    }
+
+    #urlbar:not(:-moz-lwtheme)[focused],
+    .searchbar-textbox:not(:-moz-lwtheme)[focused] {
+      box-shadow: 0 0 0 1px Highlight inset;
+    }
+  }
+
+  @media not all and (-moz-os-version: windows-xp) {
+    #urlbar:not(:-moz-lwtheme)[focused],
+    .searchbar-textbox:not(:-moz-lwtheme)[focused] {
+      border-color: Highlight;
+    }
+  }
+}
+
 @media (-moz-os-version: windows-win10) {
   #urlbar,
   .searchbar-textbox {
     font-size: 1.15em;
     min-height: 28px;
   }
 }
 
-#urlbar {
-  -moz-padding-end: 2px;
-}
-
-@media (-moz-windows-default-theme) {
-  #urlbar,
-  .searchbar-textbox {
-    @navbarTextboxCustomBorder@
-  }
-}
-
 #urlbar:-moz-lwtheme,
 .searchbar-textbox:-moz-lwtheme {
   background-color: rgba(255,255,255,.8);
   @navbarTextboxCustomBorder@
   color: black;
 }
 
 #urlbar:-moz-lwtheme:hover:not([focused]):not([readonly]),
@@ -1220,16 +1258,17 @@ toolbarbutton[constrain-size="true"][cui
 
 #urlbar:-moz-lwtheme[focused]:not([readonly]),
 .searchbar-textbox:-moz-lwtheme[focused] {
   background-color: white;
 }
 
 @conditionalForwardWithUrlbar@ > #urlbar {
   -moz-border-start: none;
+  -moz-padding-start: 0;
   margin-left: 0;
 }
 
 @conditionalForwardWithUrlbar@ > #urlbar:-moz-locale-dir(ltr) {
   border-top-left-radius: 0;
   border-bottom-left-radius: 0;
 }