diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul index 9ff8f46e0c33..d66c8a84c9d2 100644 --- a/browser/base/content/browser.xul +++ b/browser/base/content/browser.xul @@ -51,10 +51,6 @@ -#ifdef MOZ_PLACES_BOOKMARKS - -#endif - diff --git a/browser/themes/pinstripe/browser/browser.css b/browser/themes/pinstripe/browser/browser.css index 4237ce1fb966..603d48e7043d 100755 --- a/browser/themes/pinstripe/browser/browser.css +++ b/browser/themes/pinstripe/browser/browser.css @@ -158,25 +158,24 @@ toolbarbutton.bookmark-item .toolbarbutton-text { padding-top: 1px; } -/* Image locations for these toolbar icons are overridden in places/browser-places.css in Places-enabled builds. - Those styles can be merged into these once the pre-Places bookmark system is no longer needed. */ +%ifndef MOZ_PLACES_BOOKMARKS .bookmark-item > .toolbarbutton-menu-dropmarker { -list-style-image: url("chrome://browser/skin/bookmarks/folderarrow.png"); -height: 16px !important; -padding: 5px 5px 4px 3px; + list-style-image: url("chrome://browser/skin/bookmarks/folderarrow.png"); + height: 16px !important; + padding: 5px 5px 4px 3px; } .bookmark-item:hover > .toolbarbutton-menu-dropmarker, .bookmark-item[open] > .toolbarbutton-menu-dropmarker { -list-style-image: url("chrome://browser/skin/bookmarks/folderarrow-hover.png"); + list-style-image: url("chrome://browser/skin/bookmarks/folderarrow-hover.png"); } .bookmark-item[livemark] > .toolbarbutton-menu-dropmarker { -list-style-image: url("chrome://browser/skin/bookmarks/livemark-folder.png"); -padding: 4px 4px 3px 2px; + list-style-image: url("chrome://browser/skin/bookmarks/livemark-folder.png"); + padding: 4px 4px 3px 2px; } .bookmark-item[livemark]:hover > .toolbarbutton-menu-dropmarker, .bookmark-item[livemark][open] > .toolbarbutton-menu-dropmarker { -list-style-image: url("chrome://browser/skin/bookmarks/livemark-folder-hover.png"); + list-style-image: url("chrome://browser/skin/bookmarks/livemark-folder-hover.png"); } .bookmark-item[livemark] { @@ -184,8 +183,41 @@ list-style-image: url("chrome://browser/skin/bookmarks/livemark-folder-hover.png } .bookmark-item[livemark] .menuitem-iconic { -list-style-image: url("chrome://browser/skin/bookmarks/livemark-item.png"); + list-style-image: url("chrome://browser/skin/bookmarks/livemark-item.png"); } +%else +.bookmark-item > .toolbarbutton-menu-dropmarker { + list-style-image: url("chrome://browser/skin/places/folderDropArrow.png"); + height: 16px !important; + padding: 5px 5px 4px 3px; +} + +.bookmark-item:hover > .toolbarbutton-menu-dropmarker, .bookmark-item[open] > .toolbarbutton-menu-dropmarker { + list-style-image: url("chrome://browser/skin/places/folderDropHoverArrow.png"); +} + +.bookmark-item[livemark] > .toolbarbutton-menu-dropmarker { + list-style-image: url("chrome://browser/skin/places/livemarkFolder.png"); + padding: 4px 4px 3px 2px; +} + +.bookmark-item[livemark]:hover > .toolbarbutton-menu-dropmarker, .bookmark-item[livemark][open] > .toolbarbutton-menu-dropmarker { + list-style-image: url("chrome://browser/skin/places/livemarkFolderHover.png"); +} + +.bookmark-item[livemark] { + list-style-image: url("chrome://browser/skin/page-livemarks.png"); +} + +.bookmark-item[livemark] .menuitem-iconic { + list-style-image: url("chrome://browser/skin/places/livemarkItem.png"); +} + +.bookmark-item menuitem[openInTabs], +.bookmark-item menuitem[siteURI] { + list-style-image: none; +} +%endif .toolbarpaletteitem-box[type="bookmarks-toolbar"][place="palette"] { background: url("chrome://browser/skin/bookmarks/Toolbar-bookmarks.png") no-repeat; diff --git a/browser/themes/pinstripe/browser/jar.mn b/browser/themes/pinstripe/browser/jar.mn index 02bb8349a807..7187939b64bd 100644 --- a/browser/themes/pinstripe/browser/jar.mn +++ b/browser/themes/pinstripe/browser/jar.mn @@ -39,7 +39,6 @@ classic.jar: skin/classic/browser/places/livemarkItem.png (places/livemarkItem.png) #endif #ifdef MOZ_PLACES_BOOKMARKS - skin/classic/browser/places/browser-places.css (places/browser-places.css) skin/classic/browser/places/bookmarksMenu.png (places/bookmarksMenu.png) skin/classic/browser/places/bookmarksToolbar.png (places/bookmarksToolbar.png) skin/classic/browser/places/toolbarDropMarker.png (places/toolbarDropMarker.png) diff --git a/browser/themes/pinstripe/browser/places/browser-places.css b/browser/themes/pinstripe/browser/places/browser-places.css deleted file mode 100644 index fd4a45acc0ac..000000000000 --- a/browser/themes/pinstripe/browser/places/browser-places.css +++ /dev/null @@ -1,42 +0,0 @@ -/* Tell the bookmarks toolbar where to find the new icons. - - These settings complement and override settings in browser.css. - They should be merged into chrome://browser/skin/browser.css - when the pre-Places bookmark system is no longer needed. */ - -.bookmark-item > .toolbarbutton-menu-dropmarker { - list-style-image: url("chrome://browser/skin/places/folderDropArrow.png") !important; -} - -.bookmark-item:hover > .toolbarbutton-menu-dropmarker, .bookmark-item[open] > .toolbarbutton-menu-dropmarker { - list-style-image: url("chrome://browser/skin/places/folderDropHoverArrow.png") !important; -} - -.bookmark-item[livemark] > .toolbarbutton-menu-dropmarker { - list-style-image: url("chrome://browser/skin/places/livemarkFolder.png") !important; -} - -.bookmark-item[livemark]:hover > .toolbarbutton-menu-dropmarker, .bookmark-item[livemark][open] > .toolbarbutton-menu-dropmarker { - list-style-image: url("chrome://browser/skin/places/livemarkFolderHover.png") !important; -} - -.bookmark-item[livemark] .menuitem-iconic { - list-style-image: url("chrome://browser/skin/places/livemarkItem.png") !important; -} - -#page-proxy-button { - list-style-image: url("chrome://browser/skin/bookmarks/bookmark-item.png") !important; -} - -.bookmark-item[container] { - list-style-image: url("chrome://global/skin/tree/folder.png") !important; -} - -.bookmark-item { - list-style-image: url("chrome://browser/skin/bookmarks/bookmark-item.png") !important; -} - -.bookmark-item menuitem[openInTabs], -.bookmark-item menuitem[siteURI] { - list-style-image: none; -}