From e29df3f99a8d9be55e7560b86ca2bc82c31512c2 Mon Sep 17 00:00:00 2001 From: "gavin%gavinsharp.com" Date: Tue, 29 Apr 2008 19:09:28 +0000 Subject: [PATCH] Bug 406894: Icons in the location bar and search bar need hover and depressed states (web feed, star, location bar, bookmarks), patch by Kai Liu , r=me, a=damon --- browser/themes/winstripe/browser/browser.css | 38 +++++++++++++++---- browser/themes/winstripe/browser/jar.mn | 4 -- .../browser/places/pageStarred-aero.png | 0 .../winstripe/browser/places/pageStarred.png | 0 .../browser/places/starPage-aero.png | 0 .../winstripe/browser/places/starPage.png | 0 6 files changed, 31 insertions(+), 11 deletions(-) delete mode 100644 browser/themes/winstripe/browser/places/pageStarred-aero.png delete mode 100644 browser/themes/winstripe/browser/places/pageStarred.png delete mode 100644 browser/themes/winstripe/browser/places/starPage-aero.png delete mode 100644 browser/themes/winstripe/browser/places/starPage.png diff --git a/browser/themes/winstripe/browser/browser.css b/browser/themes/winstripe/browser/browser.css index 7dd0aba0f67..23cf9140d4d 100644 --- a/browser/themes/winstripe/browser/browser.css +++ b/browser/themes/winstripe/browser/browser.css @@ -1154,7 +1154,8 @@ statusbarpanel#statusbar-display { .ac-result-type-bookmark, .autocomplete-treebody::-moz-tree-image(bookmark, treecolAutoCompleteImage) { - list-style-image: url("chrome://browser/skin/places/pageStarred.png"); + list-style-image: url("chrome://browser/skin/places/editBookmark.png"); + -moz-image-region: rect(0px 16px 16px 0px); width: 16px; height: 16px; } @@ -1204,7 +1205,7 @@ statusbarpanel#statusbar-display { /* ::::: go button ::::: */ #go-button { - padding: 3px 2px 2px 2px; + padding: 0 2px; list-style-image: url("chrome://browser/skin/Go-arrow.png"); -moz-image-region: rect(0px 16px 16px 0px); } @@ -1219,12 +1220,21 @@ statusbarpanel#statusbar-display { /* star button */ #star-button { - padding: 1px; - list-style-image: url("chrome://browser/skin/places/starPage.png"); + padding: 0 2px; + list-style-image: url("chrome://browser/skin/places/bookmark.png"); + -moz-image-region: rect(0px 16px 16px 0px); +} + +#star-button:hover { + -moz-image-region: rect(0px 32px 16px 16px); +} + +#star-button:hover:active { + -moz-image-region: rect(0px 48px 16px 32px); } #star-button[starred="true"] { - list-style-image: url("chrome://browser/skin/places/pageStarred.png"); + list-style-image: url("chrome://browser/skin/places/editBookmark.png"); } /* bookmarking panel */ @@ -1715,11 +1725,25 @@ toolbar[mode="text"] > #window-controls > toolbarbutton > .toolbarbutton-text { -moz-binding: url("chrome://global/content/bindings/button.xml#menu"); -moz-appearance: none; min-width: 0px; - margin-right: 1px !important; + padding: 0 2px !important; } #feed-button[feeds] { - list-style-image: url("chrome://browser/skin/feeds/feedIcon16.png"); + list-style-image: url("chrome://browser/skin/feeds/feed-icons-16.png"); + -moz-image-region: rect(0px 16px 16px 0px); +} + +#feed-button[feeds]:hover { + -moz-image-region: rect(0px 32px 16px 16px); +} + +#feed-button[feeds][open="true"], +#feed-button[feeds]:hover:active { + -moz-image-region: rect(0px 48px 16px 32px); +} + +#feed-button:not([feeds]) { + visibility: collapse; } /* ::::: About Popup Blocking dialog ::::: */ diff --git a/browser/themes/winstripe/browser/jar.mn b/browser/themes/winstripe/browser/jar.mn index fc656050bd5..edf6ee5667a 100644 --- a/browser/themes/winstripe/browser/jar.mn +++ b/browser/themes/winstripe/browser/jar.mn @@ -55,8 +55,6 @@ classic.jar: skin/classic/browser/places/editBookmarkOverlay.css (places/editBookmarkOverlay.css) skin/classic/browser/places/libraryNavigation.png (places/libraryNavigation.png) skin/classic/browser/places/libraryToolbar.png (places/libraryToolbar.png) - skin/classic/browser/places/starPage.png (places/starPage.png) - skin/classic/browser/places/pageStarred.png (places/pageStarred.png) skin/classic/browser/places/starred48.png (places/starred48.png) skin/classic/browser/places/unstarred48.png (places/unstarred48.png) skin/classic/browser/places/tag.png (places/tag.png) @@ -145,8 +143,6 @@ classic.jar: skin/classic/aero/browser/places/editBookmarkOverlay.css (places/editBookmarkOverlay.css) skin/classic/aero/browser/places/libraryNavigation.png (places/libraryNavigation-aero.png) skin/classic/aero/browser/places/libraryToolbar.png (places/libraryToolbar-aero.png) - skin/classic/aero/browser/places/starPage.png (places/starPage-aero.png) - skin/classic/aero/browser/places/pageStarred.png (places/pageStarred-aero.png) skin/classic/aero/browser/places/starred48.png (places/starred48-aero.png) skin/classic/aero/browser/places/unstarred48.png (places/unstarred48.png) skin/classic/aero/browser/places/tag.png (places/tag-aero.png) diff --git a/browser/themes/winstripe/browser/places/pageStarred-aero.png b/browser/themes/winstripe/browser/places/pageStarred-aero.png deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/browser/themes/winstripe/browser/places/pageStarred.png b/browser/themes/winstripe/browser/places/pageStarred.png deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/browser/themes/winstripe/browser/places/starPage-aero.png b/browser/themes/winstripe/browser/places/starPage-aero.png deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/browser/themes/winstripe/browser/places/starPage.png b/browser/themes/winstripe/browser/places/starPage.png deleted file mode 100644 index e69de29bb2d..00000000000