diff --git a/browser/themes/osx/jar.mn b/browser/themes/osx/jar.mn index 330154b4b7e9..fd9b6127d8fa 100644 --- a/browser/themes/osx/jar.mn +++ b/browser/themes/osx/jar.mn @@ -87,7 +87,7 @@ browser.jar: skin/classic/browser/places/autocomplete-star.png (places/autocomplete-star.png) skin/classic/browser/places/autocomplete-star@2x.png (places/autocomplete-star@2x.png) * skin/classic/browser/places/places.css (places/places.css) -* skin/classic/browser/places/organizer.css (places/organizer.css) + skin/classic/browser/places/organizer.css (places/organizer.css) skin/classic/browser/places/query.png (places/query.png) skin/classic/browser/places/query@2x.png (places/query@2x.png) skin/classic/browser/places/bookmarksMenu.png (places/bookmarksMenu.png) diff --git a/browser/themes/osx/places/organizer.css b/browser/themes/osx/places/organizer.css index 3479eb64174f..57cfaf43c934 100644 --- a/browser/themes/osx/places/organizer.css +++ b/browser/themes/osx/places/organizer.css @@ -2,8 +2,6 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -%include ../shared.inc - /* Places Organizer Sidebars */ #placesList > treechildren::-moz-tree-row { @@ -19,27 +17,11 @@ } #placesList > treechildren::-moz-tree-row(selected) { - background: @sidebarItemBackground@; - border-top: @sidebarItemBorderTop@; - border-bottom: @sidebarItemBorderBottom@; + -moz-appearance: -moz-mac-source-list-selection; } #placesList > treechildren::-moz-tree-row(selected,focus) { - background: @sidebarItemFocusedBackground@; - border-top: @sidebarItemFocusedBorderTop@; - border-bottom: @sidebarItemFocusedBorderBottom@; -} - -#placesList:-moz-system-metric(mac-graphite-theme) > treechildren::-moz-tree-row(selected) { - background: @sidebarItemGraphiteBackground@; - border-top: @sidebarItemGraphiteBorderTop@; - border-bottom: @sidebarItemGraphiteBorderBottom@; -} - -#placesList:-moz-system-metric(mac-graphite-theme) > treechildren::-moz-tree-row(selected,focus) { - background: @sidebarItemGraphiteFocusedBackground@; - border-top: @sidebarItemGraphiteFocusedBorderTop@; - border-bottom: @sidebarItemGraphiteFocusedBorderBottom@; + -moz-appearance: -moz-mac-active-source-list-selection; } #placesList > treechildren::-moz-tree-row(History), @@ -80,30 +62,6 @@ } @media (-moz-mac-yosemite-theme) { - #placesList > treechildren::-moz-tree-row(selected) { - background: @sidebarItemBackgroundYosemite@; - border-top: none; - border-bottom: none; - } - - #placesList > treechildren::-moz-tree-row(selected,focus) { - background: @sidebarItemFocusedBackgroundYosemite@; - border-top: none; - border-bottom: none; - } - - #placesList > treechildren:-moz-system-metric(mac-graphite-theme)::-moz-tree-row(selected) { - background: @sidebarItemGraphiteBackgroundYosemite@; - border-top: none; - border-bottom: none; - } - - #placesList > treechildren:-moz-system-metric(mac-graphite-theme)::-moz-tree-row(selected,focus) { - background: @sidebarItemGraphiteFocusedBackgroundYosemite@; - border-top: none; - border-bottom: none; - } - #placesList > treechildren::-moz-tree-cell-text(selected) { color: -moz-dialogtext; font-weight: 500; diff --git a/browser/themes/osx/places/places.css b/browser/themes/osx/places/places.css index d7afccce516c..14daecb23bf0 100644 --- a/browser/themes/osx/places/places.css +++ b/browser/themes/osx/places/places.css @@ -17,47 +17,35 @@ .sidebar-placesTree, .sidebar-placesTreechildren::-moz-tree-row { - background-color: transparent; - border-color: transparent; padding-bottom: 1px; - -moz-appearance: none; margin: 0; height: 24px; - border: none; font-size: 12px; } +.sidebar-placesTree { + -moz-appearance: -moz-mac-source-list; +} + +.sidebar-placesTreechildren { + border-top: 1px solid #bebebe; +} + .sidebar-placesTreechildren::-moz-tree-separator { border-top: 1px solid #505d6d; margin: 0 10px; } -.sidebar-placesTree { - border-top: 1px solid #bebebe; +.sidebar-placesTreechildren::-moz-tree-row { + background-color: transparent; } .sidebar-placesTreechildren::-moz-tree-row(selected) { - background: @sidebarItemBackground@; - border-top: @sidebarItemBorderTop@; - border-bottom: @sidebarItemBorderBottom@; + -moz-appearance: -moz-mac-source-list-selection; } .sidebar-placesTreechildren::-moz-tree-row(selected,focus) { - background: @sidebarItemFocusedBackground@; - border-top: @sidebarItemFocusedBorderTop@; - border-bottom: @sidebarItemFocusedBorderBottom@; -} - -.sidebar-placesTreechildren:-moz-system-metric(mac-graphite-theme)::-moz-tree-row(selected) { - background: @sidebarItemGraphiteBackground@; - border-top: @sidebarItemGraphiteBorderTop@; - border-bottom: @sidebarItemGraphiteBorderBottom@; -} - -.sidebar-placesTreechildren:-moz-system-metric(mac-graphite-theme)::-moz-tree-row(selected,focus) { - background: @sidebarItemGraphiteFocusedBackground@; - border-top: @sidebarItemGraphiteFocusedBorderTop@; - border-bottom: @sidebarItemGraphiteFocusedBorderBottom@; + -moz-appearance: -moz-mac-active-source-list-selection; } .sidebar-placesTreechildren::-moz-tree-cell-text { @@ -92,30 +80,6 @@ } @media (-moz-mac-yosemite-theme) { - .sidebar-placesTreechildren::-moz-tree-row(selected) { - background: @sidebarItemBackgroundYosemite@; - border-top: none; - border-bottom: none; - } - - .sidebar-placesTreechildren::-moz-tree-row(selected,focus) { - background: @sidebarItemFocusedBackgroundYosemite@; - border-top: none; - border-bottom: none; - } - - .sidebar-placesTreechildren:-moz-system-metric(mac-graphite-theme)::-moz-tree-row(selected) { - background: @sidebarItemGraphiteBackgroundYosemite@; - border-top: none; - border-bottom: none; - } - - .sidebar-placesTreechildren:-moz-system-metric(mac-graphite-theme)::-moz-tree-row(selected,focus) { - background: @sidebarItemGraphiteFocusedBackgroundYosemite@; - border-top: none; - border-bottom: none; - } - .sidebar-placesTreechildren::-moz-tree-cell-text(selected) { color: -moz-dialogtext; font-weight: 500; diff --git a/browser/themes/osx/syncedtabs/sidebar.css b/browser/themes/osx/syncedtabs/sidebar.css index 27e71c0ae4a0..b871bb8cb987 100644 --- a/browser/themes/osx/syncedtabs/sidebar.css +++ b/browser/themes/osx/syncedtabs/sidebar.css @@ -2,12 +2,12 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -%include ../shared.inc %include ../../shared/syncedtabs/sidebar.inc.css /* These styles are intended to mimic XUL trees and the XUL search box. */ -html { +.content-container { + -moz-appearance: -moz-mac-source-list; } .item { @@ -27,15 +27,11 @@ html { } .item.selected > .item-title-container { - background: @sidebarItemBackground@; - border-top: @sidebarItemBorderTop@; - border-bottom: @sidebarItemBorderBottom@; + -moz-appearance: -moz-mac-source-list-selection; } .item.selected:focus > .item-title-container { - background: @sidebarItemFocusedBackground@; - border-top: @sidebarItemFocusedBorderTop@; - border-bottom: @sidebarItemFocusedBorderBottom@; + -moz-appearance: -moz-mac-active-source-list-selection; } .item.client .item-twisty-container { @@ -57,38 +53,6 @@ html { } @media (-moz-mac-yosemite-theme) { - .item.selected > .item-title-container { - font-weight: 500; - } - - .item.selected > .item-title-container { - background-image: none; - background-color: @sidebarItemBackgroundYosemite@; - border-top: none; - border-bottom: none; - } - - .item.selected:focus > .item-title-container { - background-image: none; - background-color: @sidebarItemFocusedBackgroundYosemite@; - border-top: none; - border-bottom: none; - } - - .item.selected:-moz-system-metric(mac-graphite-theme) > .item-title-container { - background-image: none; - background-color: @sidebarItemGraphiteBackgroundYosemite@; - border-top: none; - border-bottom: none; - } - - .item.selected:focus:-moz-system-metric(mac-graphite-theme) > .item-title-container { - background-image: none; - background-color: @sidebarItemGraphiteFocusedBackgroundYosemite@; - border-top: none; - border-bottom: none; - } - .item.selected > .item-title-container { color: -moz-dialogtext; font-weight: 500; @@ -99,7 +63,6 @@ html { } } - .sidebar-search-container { border-bottom: 1px solid #bdbdbd; } diff --git a/toolkit/themes/osx/global/shared.inc b/toolkit/themes/osx/global/shared.inc index 57d66a58bc70..350fed172134 100644 --- a/toolkit/themes/osx/global/shared.inc +++ b/toolkit/themes/osx/global/shared.inc @@ -14,24 +14,6 @@ %define scopeBarSeparatorBorder 1px solid #888 %define scopeBarTitleColor #6D6D6D -%define sidebarItemBorderTop 1px solid #bcc5d5 -%define sidebarItemBorderBottom 1px solid #94a1b9 -%define sidebarItemBackground linear-gradient(#c3ccdf 1px, #bdc7db 2px, #9dabc5) -%define sidebarItemFocusedBorderTop 1px solid #61a6dd -%define sidebarItemFocusedBorderBottom 1px solid #387cc0 -%define sidebarItemFocusedBackground linear-gradient(#79bbe6 1px, #6eb2e3 2px, #3f8ad2) -%define sidebarItemGraphiteBorderTop 1px solid #a9b5c1 -%define sidebarItemGraphiteBorderBottom 1px solid #8594a4 -%define sidebarItemGraphiteBackground linear-gradient(#bfcad3 1px, #b6c2cc 2px, #94a1b1) -%define sidebarItemGraphiteFocusedBorderTop 1px solid #7c8c9d -%define sidebarItemGraphiteFocusedBorderBottom 1px solid #536c83 -%define sidebarItemGraphiteFocusedBackground linear-gradient(#9eacbb 1px, #8fa1b1 2px, #587087) - -%define sidebarItemBackgroundYosemite hsla(0,0%,0%,.1) -%define sidebarItemFocusedBackgroundYosemite #2d8cf9 -%define sidebarItemGraphiteBackgroundYosemite hsla(0,0%,0%,.1) -%define sidebarItemGraphiteFocusedBackgroundYosemite #86858c - %define toolbarbuttonCornerRadius 3px %define toolbarbuttonBackground linear-gradient(#FFF, #ADADAD) repeat-x %define toolbarbuttonPressedInnerShadow inset rgba(0, 0, 0, 0.3) 0 -6px 10px, inset #000 0 1px 3px, inset rgba(0, 0, 0, 0.2) 0 1px 3px