Bug 589259 - top outside corners of navigation toolbar need border radius. r=mano

browser/themes/winstripe/browser/browser-aero.css

@@ -3,6 +3,7 @@
 %undef WINSTRIPE_AERO
 
 %define customToolbarColor hsl(214,44%,87%)
+%define glassToolbarBorderColor rgb(40%,40%,40%)
 
 @media all and (-moz-windows-default-theme) {
   #navigator-toolbox > toolbar:not(:-moz-lwtheme) {
@@ -89,9 +90,24 @@
     text-shadow: 0 0 .5em white, 0 0 .5em white, 0 1px 0 rgba(255,255,255,.4);
   }
 
-  #main-window[sizemode="normal"] #navigator-toolbox[tabsontop="true"] > toolbar:not(#toolbar-menubar):not(#TabsToolbar) {
-    border-left: 1px solid ThreeDShadow;
-    border-right: 1px solid ThreeDShadow;
+  #main-window[sizemode="normal"] #navigator-toolbox[tabsontop="true"] > toolbar:not(#toolbar-menubar):not(#TabsToolbar):not(:-moz-lwtheme) {
+    border-left: 1px solid @glassToolbarBorderColor@;
+    border-right: 1px solid @glassToolbarBorderColor@;
+  }
+  #navigator-toolbox,
+  #navigator-toolbox > toolbar {
+    border-color: @glassToolbarBorderColor@ !important;
+  }
+
+  #main-window[sizemode="normal"] #navigator-toolbox[tabsontop="true"] > #nav-bar:not(:-moz-lwtheme),
+  #main-window[sizemode="normal"] #navigator-toolbox[tabsontop="true"]:not([customizing]) > #nav-bar[collapsed="true"] + toolbar:not(:-moz-lwtheme),
+  #main-window[sizemode="normal"] #navigator-toolbox[tabsontop="true"]:not([customizing]) > #nav-bar[collapsed="true"] + #customToolbars + #PersonalToolbar:not(:-moz-lwtheme) {
+    border-top-left-radius: 3.5px;
+    border-top-right-radius: 3.5px;
+  }
+  #main-window[sizemode="normal"] #TabsToolbar[tabsontop="true"]:not(:-moz-lwtheme) {
+    padding-left: 4px;
+    padding-right: 4px;
   }
 
   /* Make the window draggable by glassed toolbars (bug 555081) */

browser/themes/winstripe/browser/browser.css

@@ -1435,10 +1435,6 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
   min-height: 7.3mozmm;
 }
 
-.tabbrowser-tabs:not([overflow="true"]) {
-  -moz-margin-start: 3px;
-}
-
 /* Tabs */
 .tabbrowser-tab,
 .tabs-newtab-button {