Bug 399937 - Free Gnomestripe. r=mconnor, a=blocking
authorrflint@ryanflint.com
Wed, 14 Nov 2007 22:55:11 -0800
changeset 8017 c74ed29b6b9a9eb1e0687ee465eb456c1d165cc3
parent 8016 8b9654311631d8ae1d6555afacea71c6d31c7baa
child 8018 50d0a3e80d8204381457ccc59c4bdcfe83d59f67
push idunknown
push userunknown
push dateunknown
reviewersmconnor, blocking
bugs399937
milestone1.9b2pre
Bug 399937 - Free Gnomestripe. r=mconnor, a=blocking
browser/themes/Makefile.in
browser/themes/winstripe/browser/browser.css
browser/themes/winstripe/browser/searchbar.css
--- a/browser/themes/Makefile.in
+++ b/browser/themes/Makefile.in
@@ -40,19 +40,23 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 #
 # Theme Selection
 #
-# Windows, GNOME/Linux    Winstripe
+# Windows                 Winstripe
+# GNOME/Linux             Gnomestripe
 # MacOS X                 Pinstripe
 #
 
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 DIRS = pinstripe
+endif
+ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT)))
+DIRS = gnomestripe
 else
 DIRS = winstripe
 endif
 
 include $(topsrcdir)/config/rules.mk
--- a/browser/themes/winstripe/browser/browser.css
+++ b/browser/themes/winstripe/browser/browser.css
@@ -1711,33 +1711,16 @@ toolbar[mode="text"] > #window-controls 
 }
 
 #urlbar[level="high"] > .autocomplete-textbox-container,
 #urlbar[level="low"] > .autocomplete-textbox-container {
   background-color: #F5F6BE; /* #F7F898; */
   color: #000000;
 }
 
-%ifdef MOZ_WIDGET_GTK2
-#urlbar > .autocomplete-textbox-container {
-  -moz-binding: url(chrome://browser/skin/browser.xml#autocomplete-security-wrapper);
-}
-
-#autocomplete-security-wrapper {
-  -moz-box-align: center;
-}
-
-#urlbar[level="high"] #autocomplete-security-wrapper,
-#urlbar[level="low"] #autocomplete-security-wrapper,
-#urlbar[level="broken"] #autocomplete-security-wrapper {
-  background-color: #F5F6BE; /* #F7F898; */
-  color: #000000;
-}
-%endif
-
 #feed-button, #feed-button > .button-box,
 #feed-button:hover:active > .button-box {
   padding: 0px;
   margin: 0px;
   border: 0px; 
   background-color: transparent;
 }
 
@@ -1833,30 +1816,26 @@ toolbarbutton.bookmark-item[dragover="tr
 /* Location bar visuals*/
 
 #urlbar .autocomplete-textbox-container {
   -moz-box-align: stretch;
 }
 
 #identity-box {
   background-color: -moz-dialog;
-%ifdef MOZ_WIDGET_GTK2
-  -moz-border-end: 1px solid ThreeDShadow;
-%else
   -moz-appearance: toolbox;
   outline: 1px solid ThreeDShadow;
 }
 
 #identity-box.verifiedIdentity {
   outline-color: highlight;
 }
 
 #identity-box:hover {
   outline-color: ThreeDDarkShadow;
-%endif
 }
 
 #identity-icon-label {
   padding: 0 2px;
   margin: 0;
 }
 
 .unknownIdentity > #identity-icon-label {
--- a/browser/themes/winstripe/browser/searchbar.css
+++ b/browser/themes/winstripe/browser/searchbar.css
@@ -1,14 +1,8 @@
-%ifdef MOZ_WIDGET_GTK2
-#searchbar {
-  -moz-margin-start: 3px;
-}
-%endif
-
 .searchbar-box {
   -moz-padding-end: 5px;
 }
 
 .searchbar-textbox {
   min-height: 22px;
   width: 4em;
   min-width: 4em;