Bug 393718 - "Style searchbar splitter nicely" [p=dao@mozilla.com (Dão Gottwald) r=Mano ui-r=faaborg a=blocking-firefox3+]

browser/base/content/browser.js

@@ -2016,7 +2016,7 @@ function UpdateUrlbarSearchSplitterState()
       splitter.id = "urlbar-search-splitter";
       splitter.setAttribute("resizebefore", "flex");
       splitter.setAttribute("resizeafter", "flex");
-      splitter.className = "toolbar-splitter chromeclass-toolbar-additional";
+      splitter.className = "chromeclass-toolbar-additional";
     }
     urlbar.parentNode.insertBefore(splitter, ibefore);
   } else if (splitter)

browser/themes/gnomestripe/browser/browser.css

@@ -768,6 +768,21 @@ toolbar[iconsize="small"] #paste-button[disabled="true"] {
   visibility: collapse;
 }
 
+#urlbar-search-splitter {
+  -moz-appearance: none;
+  width: 8px;
+  -moz-margin-start: -4px;
+}
+
+/*XXX The first two selectors are there because adjacent selectors aren't
+      working reliably (bug 229915). */
+#search-container + #urlbar-container > #urlbar ,
+#urlbar-container + #search-container > #searchbar > .searchbar-textbox ,
+#urlbar-search-splitter + #urlbar-container > #urlbar ,
+#urlbar-search-splitter + #search-container > #searchbar > .searchbar-textbox {
+  -moz-margin-start: 0;
+}
+
 #wrapper-urlbar-container #urlbar {
   -moz-user-input: disabled;
   cursor: -moz-grab;

browser/themes/pinstripe/browser/browser.css

@@ -864,6 +864,21 @@ toolbar[iconsize="small"] #paste-button:hover:active {
   background: url("chrome://browser/skin/Secure-background.gif") #FFFED8 repeat-x;
 }
 
+#urlbar-search-splitter {
+  min-width: 8px;
+  -moz-margin-start: -4px;
+  background: transparent;
+}
+
+/*XXX The first two selectors are there because adjacent selectors aren't
+      working reliably (bug 229915). */
+#search-container + #urlbar-container > #urlbar ,
+#urlbar-container + #search-container > #searchbar > .searchbar-textbox ,
+#urlbar-search-splitter + #urlbar-container > #urlbar ,
+#urlbar-search-splitter + #search-container > #searchbar > .searchbar-textbox {
+  -moz-margin-start: 0;
+}
+
 #wrapper-urlbar-container #urlbar {
   -moz-user-input: disabled;
   cursor: -moz-grab;

browser/themes/winstripe/browser/browser.css

@@ -854,6 +854,22 @@ toolbar[iconsize="small"] #paste-button:not([disabled="true"]):hover:active {
   visibility: collapse;
 }
 
+#urlbar-search-splitter {
+  min-width: 8px;
+  -moz-margin-start: -4px;
+  border: none;
+  background: transparent;
+}
+
+/*XXX The first two selectors are there because adjacent selectors aren't
+      working reliably (bug 229915). */
+#search-container + #urlbar-container > #urlbar ,
+#urlbar-container + #search-container > #searchbar > .searchbar-textbox ,
+#urlbar-search-splitter + #urlbar-container > #urlbar ,
+#urlbar-search-splitter + #search-container > #searchbar > .searchbar-textbox {
+  -moz-margin-start: 0;
+}
+
 #wrapper-urlbar-container #urlbar {
   -moz-user-input: disabled;
   cursor: -moz-grab;

toolkit/themes/winstripe/global/splitter.css

@@ -56,13 +56,6 @@ splitter {
   background-color: ThreeDFace;
 }
 
-.toolbar-splitter {
-  min-width: 3px;
-  margin: 3px 0;
-  border: none;
-  -moz-border-start: 2px dotted ThreeDShadow;
-}
-
 /* ::::: splitter (horizontal) ::::: */
 
 splitter[orient="vertical"] {