From 26478fa91e05c7c8ac946224384a7dc84c6f3c0c Mon Sep 17 00:00:00 2001 From: "gavin%gavinsharp.com" Date: Fri, 30 Dec 2005 04:54:06 +0000 Subject: [PATCH] Bug 314663: #urlbar style rules don't belong in toolkit's autocomplete.css, r=mconnor git-svn-id: svn://10.0.0.236/trunk@186741 18797224-902f-48f8-a5cc-f745e15eee43 --- .../themes/winstripe/browser/browser.css | 17 +++++++++++++++++ .../browser/themes/winstripe/browser/jar.mn | 2 +- .../themes/gnomestripe/global/autocomplete.css | 18 ------------------ 3 files changed, 18 insertions(+), 19 deletions(-) diff --git a/mozilla/browser/themes/winstripe/browser/browser.css b/mozilla/browser/themes/winstripe/browser/browser.css index 5c9ff64fdd4..31bbda8edd1 100644 --- a/mozilla/browser/themes/winstripe/browser/browser.css +++ b/mozilla/browser/themes/winstripe/browser/browser.css @@ -924,6 +924,23 @@ toolbar[mode="text"] > #window-controls > toolbarbutton > .toolbarbutton-text { list-style-image: url("chrome://browser/skin/Security-broken.png"); } +%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; diff --git a/mozilla/browser/themes/winstripe/browser/jar.mn b/mozilla/browser/themes/winstripe/browser/jar.mn index 46056645de4..5161caec075 100644 --- a/mozilla/browser/themes/winstripe/browser/jar.mn +++ b/mozilla/browser/themes/winstripe/browser/jar.mn @@ -1,6 +1,6 @@ classic.jar: % skin browser classic/1.0 %skin/classic/browser/ - skin/classic/browser/browser.css +* skin/classic/browser/browser.css (browser.css) skin/classic/browser/browser.xml skin/classic/browser/Go.png skin/classic/browser/Go-rtl.png diff --git a/mozilla/toolkit/themes/gnomestripe/global/autocomplete.css b/mozilla/toolkit/themes/gnomestripe/global/autocomplete.css index 70437215772..b5b369206f3 100644 --- a/mozilla/toolkit/themes/gnomestripe/global/autocomplete.css +++ b/mozilla/toolkit/themes/gnomestripe/global/autocomplete.css @@ -170,21 +170,3 @@ toolbarpaletteitem > toolbaritem > textbox > hbox > hbox > html|*.textbox-input toolbarpaletteitem > toolbaritem > * > textbox > hbox > hbox > html|*.textbox-input { visibility: hidden; } - -/* ::::: browser urlbar styles :::::: */ - -#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; -} -