Bug 637176 - [Mac Default] Better bookmark/link toolbar styling. r=Mnyromyr.
authorstefanh@inbox.com
Wed, 09 Mar 2011 18:50:58 +0100
changeset 7291 e1e05d692fc4ff52c03cbbbd75e8dfd4303bb42b
parent 7290 9164f554c96f9468b709d4fe8f58694717ec16b6
child 7292 34dc4195f5fd2fb8b77b7fb4ba326996e9c216ff
push idunknown
push userunknown
push dateunknown
reviewersMnyromyr
bugs637176
Bug 637176 - [Mac Default] Better bookmark/link toolbar styling. r=Mnyromyr.
suite/themes/classic/jar.mn
suite/themes/classic/mac/communicator/bookmarks/bookmark-folder-active.png
suite/themes/classic/mac/communicator/bookmarks/bookmarks.css
suite/themes/classic/mac/communicator/bookmarks/bookmarksToolbar.css
suite/themes/classic/mac/communicator/bookmarks/livemark-folder-active.png
suite/themes/classic/mac/communicator/bookmarks/query-active.png
suite/themes/classic/mac/communicator/bookmarks/toolbarDropMarker.png
suite/themes/classic/mac/navigator/linkToolbar.css
suite/themes/classic/mac/navigator/navigator.css
--- a/suite/themes/classic/jar.mn
+++ b/suite/themes/classic/jar.mn
@@ -11,32 +11,30 @@ classic.jar:
 % style chrome://global/content/customizeToolbar.xul chrome://messenger/skin/addressbook/addressbook.css
 #ifdef XP_MACOSX
   skin/classic/communicator/aboutSessionRestore.css                     (mac/communicator/aboutSessionRestore.css)
   skin/classic/communicator/button.css                                  (mac/communicator/button.css)
   skin/classic/communicator/communicator.css                            (mac/communicator/communicator.css)
   skin/classic/communicator/helpOverlay.css                             (mac/communicator/helpOverlay.css)
   skin/classic/communicator/toolbar.css                                 (mac/communicator/toolbar.css)
   skin/classic/communicator/viewSourceOverlay.css                       (mac/communicator/viewSourceOverlay.css)
-  skin/classic/communicator/bookmarks/bookmark-folder-active.png        (mac/communicator/bookmarks/bookmark-folder-active.png)
   skin/classic/communicator/bookmarks/bookmarks.css                     (mac/communicator/bookmarks/bookmarks.css)
   skin/classic/communicator/bookmarks/bookmarksManager.css              (mac/communicator/bookmarks/bookmarksManager.css)
   skin/classic/communicator/bookmarks/bookmarksMenu.png                 (mac/communicator/bookmarks/bookmarksMenu.png)
   skin/classic/communicator/bookmarks/bookmarksToolbar.css              (mac/communicator/bookmarks/bookmarksToolbar.css)
   skin/classic/communicator/bookmarks/bookmarksToolbar.png              (mac/communicator/bookmarks/bookmarksToolbar.png)
   skin/classic/communicator/bookmarks/editBookmarkOverlay.css           (mac/communicator/bookmarks/editBookmarkOverlay.css)
   skin/classic/communicator/bookmarks/expander-closed.png               (mac/communicator/bookmarks/expander-closed.png)
   skin/classic/communicator/bookmarks/expander-closed-active.png        (mac/communicator/bookmarks/expander-closed-active.png)
   skin/classic/communicator/bookmarks/expander-open.png                 (mac/communicator/bookmarks/expander-open.png)
   skin/classic/communicator/bookmarks/expander-open-active.png          (mac/communicator/bookmarks/expander-open-active.png)
   skin/classic/communicator/bookmarks/livemark-folder.png               (mac/communicator/bookmarks/livemark-folder.png)
-  skin/classic/communicator/bookmarks/livemark-folder-active.png        (mac/communicator/bookmarks/livemark-folder-active.png)
   skin/classic/communicator/bookmarks/livemark-item.png                 (mac/communicator/bookmarks/livemark-item.png)
   skin/classic/communicator/bookmarks/query.png                         (mac/communicator/bookmarks/query.png)
-  skin/classic/communicator/bookmarks/query-active.png                  (mac/communicator/bookmarks/query-active.png)
+  skin/classic/communicator/bookmarks/toolbarDropMarker.png             (mac/communicator/bookmarks/toolbarDropMarker.png)
   skin/classic/communicator/downloads/downloadButtons.png               (mac/communicator/downloads/downloadButtons.png)
   skin/classic/communicator/downloads/progressBg.png                    (mac/communicator/downloads/progressBg.png)
   skin/classic/communicator/downloads/downloadmanager.css               (mac/communicator/downloads/downloadmanager.css)
   skin/classic/communicator/sidebar/sidebar.css                         (mac/communicator/sidebar/sidebar.css)
   skin/classic/communicator/icons/communicatoricons.png                 (mac/communicator/icons/communicatoricons.png)
   skin/classic/communicator/icons/communicatoricons-small.png           (mac/communicator/icons/communicatoricons-small.png)
   skin/classic/communicator/icons/geolocation-16.png                    (mac/communicator/icons/geolocation-16.png)
   skin/classic/communicator/icons/geolocation-64.png                    (mac/communicator/icons/geolocation-64.png)
@@ -60,16 +58,17 @@ classic.jar:
   skin/classic/communicator/bookmarks/bookmarksManager.css              (communicator/bookmarks/bookmarksManager.css)
   skin/classic/communicator/bookmarks/bookmarksMenu.png                 (communicator/bookmarks/bookmarksMenu.png)
   skin/classic/communicator/bookmarks/bookmarksToolbar.css              (communicator/bookmarks/bookmarksToolbar.css)
   skin/classic/communicator/bookmarks/bookmarksToolbar.png              (communicator/bookmarks/bookmarksToolbar.png)
   skin/classic/communicator/bookmarks/editBookmarkOverlay.css           (communicator/bookmarks/editBookmarkOverlay.css)
   skin/classic/communicator/bookmarks/livemark-folder.png               (communicator/bookmarks/livemark-folder.png)
   skin/classic/communicator/bookmarks/livemark-item.png                 (communicator/bookmarks/livemark-item.png)
   skin/classic/communicator/bookmarks/query.png                         (communicator/bookmarks/query.png)
+  skin/classic/communicator/bookmarks/toolbarDropMarker.png             (communicator/bookmarks/toolbarDropMarker.png)
   skin/classic/communicator/downloads/downloadButtons.png               (communicator/downloads/downloadButtons.png)
   skin/classic/communicator/downloads/downloadmanager.css               (communicator/downloads/downloadmanager.css)
   skin/classic/communicator/sidebar/sidebar.css                         (communicator/sidebar/sidebar.css)
   skin/classic/communicator/icons/communicatoricons.png                 (communicator/icons/communicatoricons.png)
   skin/classic/communicator/icons/communicatoricons-small.png           (communicator/icons/communicatoricons-small.png)
   skin/classic/communicator/icons/geolocation-16.png                    (communicator/icons/geolocation-16.png)
   skin/classic/communicator/icons/geolocation-64.png                    (communicator/icons/geolocation-64.png)
   skin/classic/communicator/icons/loading.gif                           (communicator/icons/loading.gif)
@@ -81,17 +80,16 @@ classic.jar:
   skin/classic/communicator/preferences.css                             (communicator/preferences.css)
   skin/classic/communicator/prefpanels.css                              (communicator/prefpanels.css)
   skin/classic/communicator/smileys.css                                 (communicator/smileys.css)
   skin/classic/communicator/tasksOverlay.css                            (communicator/tasksOverlay.css)
   skin/classic/communicator/bookmarks/allBookmarks.png                  (communicator/bookmarks/allBookmarks.png)
   skin/classic/communicator/bookmarks/bookmark.png                      (communicator/bookmarks/bookmark.png)
   skin/classic/communicator/bookmarks/bookmark-item-dis.png             (communicator/bookmarks/bookmark-item-dis.png)
   skin/classic/communicator/bookmarks/bookmark-item.png                 (communicator/bookmarks/bookmark-item.png)
-  skin/classic/communicator/bookmarks/toolbarDropMarker.png             (communicator/bookmarks/toolbarDropMarker.png)
   skin/classic/communicator/bookmarks/unsortedBookmarks.png             (communicator/bookmarks/unsortedBookmarks.png)
   skin/classic/communicator/brand/throbber-anim.png                     (communicator/brand/throbber-anim.png)
   skin/classic/communicator/brand/throbber-single.png                   (communicator/brand/throbber-single.png)
   skin/classic/communicator/brand/throbber16-anim.png                   (communicator/brand/throbber16-anim.png)
   skin/classic/communicator/brand/throbber16-single.png                 (communicator/brand/throbber16-single.png)
   skin/classic/communicator/dataman/dataman.css                         (communicator/dataman/dataman.css)
   skin/classic/communicator/dataman/datamanIcon-16.png                  (communicator/dataman/datamanIcon-16.png)
   skin/classic/communicator/directory/directory.css                     (communicator/directory/directory.css)
@@ -392,40 +390,40 @@ classic.jar:
   skin/classic/navigator/icons/navigatoricons.png                       (mac/navigator/icons/navigatoricons.png)
   skin/classic/navigator/icons/navigatoricons-small.png                 (mac/navigator/icons/navigatoricons-small.png)
   skin/classic/navigator/icons/restore.png                              (mac/navigator/icons/restore.png)
 #else
   skin/classic/navigator/navigator.css                                  (navigator/navigator.css)
   skin/classic/navigator/linkToolbar.css                                (navigator/linkToolbar.css)
   skin/classic/navigator/pageInfo.css                                   (navigator/pageInfo.css)
   skin/classic/navigator/tabbrowser.css                                 (navigator/tabbrowser.css)
+  skin/classic/navigator/btn1/first-disabled.gif                        (navigator/btn1/first-disabled.gif)
+  skin/classic/navigator/btn1/first-hover.gif                           (navigator/btn1/first-hover.gif)
+  skin/classic/navigator/btn1/last-disabled.gif                         (navigator/btn1/last-disabled.gif)
+  skin/classic/navigator/btn1/last-hover.gif                            (navigator/btn1/last-hover.gif)
+  skin/classic/navigator/btn1/next-disabled.gif                         (navigator/btn1/next-disabled.gif)
+  skin/classic/navigator/btn1/next-hover.gif                            (navigator/btn1/next-hover.gif)
+  skin/classic/navigator/btn1/previous-disabled.gif                     (navigator/btn1/previous-disabled.gif)
+  skin/classic/navigator/btn1/previous-hover.gif                        (navigator/btn1/previous-hover.gif)
+  skin/classic/navigator/btn1/top-disabled.gif                          (navigator/btn1/top-disabled.gif)
+  skin/classic/navigator/btn1/top-hover.gif                             (navigator/btn1/top-hover.gif)
+  skin/classic/navigator/btn1/up-disabled.gif                           (navigator/btn1/up-disabled.gif)
+  skin/classic/navigator/btn1/up-hover.gif                              (navigator/btn1/up-hover.gif)
   skin/classic/navigator/icons/close.gif                                (navigator/icons/close.gif)
   skin/classic/navigator/icons/minimize.gif                             (navigator/icons/minimize.gif)
   skin/classic/navigator/icons/navigatoricons.png                       (navigator/icons/navigatoricons.png)
   skin/classic/navigator/icons/navigatoricons-small.png                 (navigator/icons/navigatoricons-small.png)
   skin/classic/navigator/icons/restore.gif                              (navigator/icons/restore.gif)
   skin/classic/navigator/icons/tab-arrow-left.gif                       (navigator/icons/tab-arrow-left.gif)
   skin/classic/navigator/icons/tab-arrow-right.gif                      (navigator/icons/tab-arrow-right.gif)
 #endif
   skin/classic/navigator/btn1/feeds.png                                 (navigator/btn1/feeds.png)
   skin/classic/navigator/btn1/first.gif                                 (navigator/btn1/first.gif)
-  skin/classic/navigator/btn1/first-disabled.gif                        (navigator/btn1/first-disabled.gif)
-  skin/classic/navigator/btn1/first-hover.gif                           (navigator/btn1/first-hover.gif)
   skin/classic/navigator/btn1/last.gif                                  (navigator/btn1/last.gif)
-  skin/classic/navigator/btn1/last-disabled.gif                         (navigator/btn1/last-disabled.gif)
-  skin/classic/navigator/btn1/last-hover.gif                            (navigator/btn1/last-hover.gif)
   skin/classic/navigator/btn1/next.gif                                  (navigator/btn1/next.gif)
-  skin/classic/navigator/btn1/next-disabled.gif                         (navigator/btn1/next-disabled.gif)
-  skin/classic/navigator/btn1/next-hover.gif                            (navigator/btn1/next-hover.gif)
   skin/classic/navigator/btn1/previous.gif                              (navigator/btn1/previous.gif)
-  skin/classic/navigator/btn1/previous-disabled.gif                     (navigator/btn1/previous-disabled.gif)
-  skin/classic/navigator/btn1/previous-hover.gif                        (navigator/btn1/previous-hover.gif)
   skin/classic/navigator/btn1/top.gif                                   (navigator/btn1/top.gif)
-  skin/classic/navigator/btn1/top-disabled.gif                          (navigator/btn1/top-disabled.gif)
-  skin/classic/navigator/btn1/top-hover.gif                             (navigator/btn1/top-hover.gif)
   skin/classic/navigator/btn1/up.gif                                    (navigator/btn1/up.gif)
-  skin/classic/navigator/btn1/up-disabled.gif                           (navigator/btn1/up-disabled.gif)
-  skin/classic/navigator/btn1/up-hover.gif                              (navigator/btn1/up-hover.gif)
   skin/classic/navigator/icons/chevron.gif                              (navigator/icons/chevron.gif)
   skin/classic/navigator/icons/identity.png                             (navigator/icons/identity.png)
   skin/classic/navigator/icons/popup-blocked.png                        (navigator/icons/popup-blocked.png)
   skin/classic/navigator/icons/tab-drag-indicator.gif                   (navigator/icons/tab-drag-indicator.gif)
   skin/classic/navigator/icons/tab-new.gif                              (navigator/icons/tab-new.gif)
deleted file mode 100644
index 56ebca4cec819860eaecf674acdb646eafff00fa..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/suite/themes/classic/mac/communicator/bookmarks/bookmarks.css
+++ b/suite/themes/classic/mac/communicator/bookmarks/bookmarks.css
@@ -79,21 +79,16 @@ treechildren::-moz-tree-image(Name, quer
   list-style-image: url("chrome://communicator/skin/history/calendar.png");
 }
 
 .bookmark-item[container][livemark],
 treechildren::-moz-tree-image(title, container, livemark) {
   list-style-image: url("chrome://communicator/skin/bookmarks/livemark-folder.png");
 }
 
-#PlacesToolbarItems > .bookmark-item[container][livemark]:hover:active,
-#PlacesToolbarItems > .bookmark-item[container][livemark][open="true"] {
-  list-style-image: url("chrome://communicator/skin/bookmarks/livemark-folder-active.png");
-}
-
 .bookmark-item[container][livemark] .bookmark-item,
 treechildren::-moz-tree-image(title, livemarkItem) {
   list-style-image: url("chrome://communicator/skin/bookmarks/livemark-item.png");
 }
 
 treechildren::-moz-tree-image(container, OrganizerQuery_AllBookmarks) {
   list-style-image: url("chrome://communicator/skin/bookmarks/allBookmarks.png");
 }
@@ -115,21 +110,16 @@ treechildren::-moz-tree-image(container,
 }
 
 /* query-nodes should be styled even if they're not expandable */
 .bookmark-item[query],
 treechildren::-moz-tree-image(title, query) {
   list-style-image: url("chrome://communicator/skin/bookmarks/query.png");
 }
 
-#PlacesToolbarItems > .bookmark-item[query]:hover:active,
-#PlacesToolbarItems > .bookmark-item[query][open="true"] {
-  list-style-image: url("chrome://communicator/skin/bookmarks/query-active.png");
-}
-
 .bookmark-item[query][tagContainer],
 treechildren::-moz-tree-image(title, query, tagContainer),
 treechildren::-moz-tree-image(query, OrganizerQuery_Tags) {
   list-style-image: url("chrome://mozapps/skin/places/tagContainerIcon.png");
 }
 
 treechildren::-moz-tree-image(Name, separator),
 treechildren::-moz-tree-image(title, separator) {
--- a/suite/themes/classic/mac/communicator/bookmarks/bookmarksToolbar.css
+++ b/suite/themes/classic/mac/communicator/bookmarks/bookmarksToolbar.css
@@ -46,74 +46,66 @@
 
 /* ..... bookmark items ..... */
 
 toolbarbutton.bookmark-item {
   min-width: 0px;
   max-width: 13em;
 }
 
-toolbarbutton.bookmark-item[container="true"][open="true"]:not([disabled="true"]) {
-  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-active.png");
+.bookmark-item > .toolbarbutton-icon {
+  background-image: url("chrome://global/skin/filters.svg"); /* Preload filter */
+  width: 16px;
+  height: 16px;
 }
 
-toolbarbutton.bookmark-item[disabled="true"] > .toolbarbutton-icon ,
-toolbarbutton.bookmark-item[disabled="true"][container="true"] > .toolbarbutton-icon  {
-  opacity: 0.5 !important;
+.bookmark-item:not([disabled="true"]):hover:active > .toolbarbutton-icon,
+.bookmark-item[open] > .toolbarbutton-icon {
+  filter: url("chrome://global/skin/filters.svg#iconPressed");
 }
 
-.bookmark-item > .toolbarbutton-icon {
-  width: 16px;
-  height: 16px;
+toolbarbutton.bookmark-item[disabled="true"] > .toolbarbutton-icon {
+  opacity: 0.5 !important;
 }
 
 .bookmark-item > .toolbarbutton-menu-dropmarker {
   display: none;
 }
 
-/* ..... drag and drop styles ..... */
-
-toolbarbutton.bookmark-item[dragover-left="true"] {
-  -moz-border-left-colors: ThreeDDarkShadow;
-}
-
-toolbarbutton.bookmark-item[dragover-right="true"] {
-  -moz-border-right-colors: ThreeDDarkShadow;
-}
-
-toolbarbutton.bookmark-item[dragover-top="true"] {
-  -moz-appearance: none;
-  -moz-border-top-colors: ThreeDDarkShadow;
-  -moz-border-right-colors: ThreeDDarkShadow;
-  -moz-border-bottom-colors: ThreeDDarkShadow;
-  -moz-border-left-colors: ThreeDDarkShadow;
-}
-
 /* ::::: bookmark menus ::::: */
 
 .bookmark-group {
   list-style-image: url(chrome://communicator/skin/bookmarks/bookmark-group.png) !important;
 }
 
 .menuitem-iconic.bookmark-item[disabled="true"] {
   list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-item-dis.png");
 }
 
 .menu-iconic.bookmark-item[disabled="true"][container="true"] {
   opacity: 0.5;
 }
 
 /* ..... drag and drop styles ..... */
 
-menu.bookmark-item[dragover-top="true"],
-menuitem.bookmark-item[dragover-top="true"] {
-  border-top: 1px solid ThreeDDarkShadow !important;
-} 
-
-menu.bookmark-item[dragover-bottom="true"],
-menuitem.bookmark-item[dragover-bottom="true"] {
-  border-bottom: 1px solid ThreeDDarkShadow !important;
+#PlacesToolbarDropIndicator {
+  list-style-image: url("chrome://communicator/skin/bookmarks/toolbarDropMarker.png");
 }
 
-menu.bookmark-item[dragover="true"] {
+.bookmark-item[dragover-into="true"] {
   background: Highlight !important;
   color: HighlightText !important;
 }
+
+/* rules for menupopup drop indicators */
+.menupopup-drop-indicator-bar {
+  position: relative;
+  /* these two margins must together compensate the indicator's height */
+  margin-top: -1px;
+  margin-bottom: -1px;
+}
+
+.menupopup-drop-indicator {
+  list-style-image: none;
+  height: 2px;
+  -moz-margin-end: -4em;
+  background-color: Highlight;
+}
deleted file mode 100644
index 598a0f8695273fea17e857d5aed2c7292f2f66c2..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 8f7ef561628f1b5b7781b3bfcd64346a0cb4bb5c..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
new file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..354734f8f1862d1ca6bd68760e12dfc2bdc9f221
GIT binary patch
literal 295
zc%17D@N?(olHy`uVBq!ia0vp^EI=&8!3HF2>gs<0DaPU;cPEB*=VV?2Ic!PZ?k)`f
zL2$v|<&%LToCO|{#S9GG!XV7ZFl&wkP;i&0i(`ny<zx}_9zLOqA7-69aN@v^U$2gd
zh$)(Gm;BRZwulD^>g(&~p8N9m?AqY}|No`@`2St}@b>cW`bGvokkNLodcCCCds}88
z;06)vdjyS{MK*vW|NQ^Ye=I#A$$|NcU_xR75Tv9eB_#al7x?k#%bj>OH#asANMn6I
zD|gYYx?M6%MKV5X=KRu`qolR0=S&XBa-KVjUYVWISu>|xBJ#%E`kIO#Pv2hkjbtcV
Xr1$e?>q9f3FBm*s{an^LB{Ts5ysvIY
--- a/suite/themes/classic/mac/navigator/linkToolbar.css
+++ b/suite/themes/classic/mac/navigator/linkToolbar.css
@@ -56,84 +56,40 @@
   background-image: none;
 }
 
 #linktoolbar > .bookmark-item {
   text-shadow: none;
 }
 
 #linktoolbar > .bookmark-item:not([disabled="true"]):hover:active,
-#linktoolbar > .bookmark-item[container="true"]:not([disabled="true"]):hover:active {
+#linktoolbar > .bookmark-item[open] {
   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.7);
 }
 
-/**
- * Link toolbar items
- **/
-
-#link-top
-{
-  list-style-image    : url("chrome://navigator/skin/btn1/top.gif");
-}
-
-#link-top:not([disabled="true"]):hover:active
-{
-  list-style-image    : url("chrome://navigator/skin/btn1/top-hover.gif");
+#link-top {
+  list-style-image: url("chrome://navigator/skin/btn1/top.gif");
 }
 
-#link-up
-{
-  list-style-image    : url("chrome://navigator/skin/btn1/up.gif");
-}
-
-#link-up:not([disabled="true"]):hover:active
-{
-  list-style-image    : url("chrome://navigator/skin/btn1/up-hover.gif");
-}
-
-#link-first
-{
-  list-style-image    : url("chrome://navigator/skin/btn1/first.gif");
+#link-up {
+  list-style-image: url("chrome://navigator/skin/btn1/up.gif");
 }
 
-#link-first:not([disabled="true"]):hover:active
-{
-  list-style-image    : url("chrome://navigator/skin/btn1/first-hover.gif");
-}
-
-#link-prev
-{
-  list-style-image    : url("chrome://navigator/skin/btn1/previous.gif");
-}
-
-#link-prev:not([disabled="true"]):hover:active
-{
-  list-style-image    : url("chrome://navigator/skin/btn1/previous-hover.gif");
+#link-first {
+  list-style-image: url("chrome://navigator/skin/btn1/first.gif");
 }
 
-#link-next
-{
-  list-style-image    : url("chrome://navigator/skin/btn1/next.gif");
+#link-prev {
+  list-style-image: url("chrome://navigator/skin/btn1/previous.gif");
 }
 
-#link-next:not([disabled="true"]):hover:active
-{
-  list-style-image    : url("chrome://navigator/skin/btn1/next-hover.gif");
+#link-next {
+  list-style-image: url("chrome://navigator/skin/btn1/next.gif");
 }
 
-#link-last
-{
-  list-style-image    : url("chrome://navigator/skin/btn1/last.gif");
-}
-
-#link-last:not([disabled="true"]):hover:active
-{
-  list-style-image    : url("chrome://navigator/skin/btn1/last-hover.gif");
+#link-last {
+  list-style-image: url("chrome://navigator/skin/btn1/last.gif");
 }
 
 #link-feed {
   list-style-image: url("chrome://navigator/skin/btn1/feeds.png") !important;
   -moz-image-region: rect(0px 32px 16px 16px);
 }
-
-#link-feed[open="true"] {
-  -moz-image-region: rect(48px 32px 64px 16px);
-}
--- a/suite/themes/classic/mac/navigator/navigator.css
+++ b/suite/themes/classic/mac/navigator/navigator.css
@@ -516,66 +516,70 @@ toolbar[mode="icons"] #search-button > .
 #invalid-form-popup {
   -moz-appearance: tooltip;
   padding: 2px 3px 0px 3px;
   max-width: 40em;
   color: InfoText;
   font-weight: bold;
 }
 
+/* Set default text-shadow that we will override if this is in the PT. */
+#personal-bookmarks {
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.4);
+}
+
 /* ::::: personal toolbar ::::: */
 
 #PersonalToolbar {
   -moz-appearance: none;
   background-color: #d5d5d5;
   background-image: url("chrome://communicator/skin/toolbar/toolbar-gradient22.png");
   background-repeat: repeat-x;
   border-bottom: 1px solid rgb(159, 159, 159);
 }
 
 #PersonalToolbar:-moz-lwtheme {
   background-color: transparent;
   background-image: none;
 }
 
-#PersonalToolbar > #home-button,
-#PersonalToolbar > .bookmark-item,
-#PlacesToolbar > .bookmark-item,
-#PlacesToolbarItems > .bookmark-item {
+/* No text-shadow when we're in the PT. */
+#PersonalToolbar > toolbarbutton,
+#PersonalToolbar > #personal-bookmarks {
   text-shadow: none;
 }
 
-#PersonalToolbar > #home-button:hover:active,
-#PersonalToolbar > .bookmark-item:hover:active,
-#PersonalToolbar > .bookmark-item[container="true"][open="true"],
+/* text-shadow styling depends on where the items are, so use inheritance. */
+#PlacesToolbar > .bookmark-item,
+#PlacesToolbarItems > .bookmark-item {
+  text-shadow: inherit;
+}
+
+#PersonalToolbar > toolbarbutton:hover:active,
+#PersonalToolbar > toolbarbutton[open],
 #PlacesToolbarItems > .bookmark-item:hover:active,
-#PlacesToolbarItems > .bookmark-item[container="true"][open="true"] {
+#PlacesToolbarItems > .bookmark-item[open] {
   text-shadow: 0 1px 1px rgba(0, 0, 0, 0.7) !important;
 }
 
-#PersonalToolbar > #home-button > .toolbarbutton-text,
+#PersonalToolbar > toolbarbutton > .toolbarbutton-text,
 .bookmark-item > .toolbarbutton-text {
   margin: 0 3px 0 2px;
 }
 
-#PersonalToolbar > #home-button > .toolbarbutton-icon,
+#PersonalToolbar > toolbarbutton > .toolbarbutton-icon,
 .bookmark-item > .toolbarbutton-icon {
   padding: 0;
 }
 
 #bookmarks-button {
   list-style-image: url("chrome://global/skin/tree/folder.png");
   padding: 0;
 }
 
-#bookmarks-button[open="true"],
-.bookmark-item[container="true"]:not([disabled="true"]):hover:active {
-  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-active.png");
-}
-
 toolbarbutton.chevron {
   list-style-image: url("chrome://navigator/skin/icons/chevron.gif");
   height: 16px;
   width: 16px;
 }
 
 toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
   display: none;