From fcdb5fcdd4123c035c61e6db8a039355c5ca1788 Mon Sep 17 00:00:00 2001 From: "stefanh@inbox.com" Date: Sun, 30 Oct 2016 18:16:17 +0100 Subject: [PATCH] Bug 1313848 - Avoid unnecessary twisty style rules in places.css and organizer.css by using the 'closed' property. r=Gijs. --- browser/themes/osx/places/organizer.css | 30 ++++++------------------- browser/themes/osx/places/places.css | 30 ++++++------------------- 2 files changed, 14 insertions(+), 46 deletions(-) diff --git a/browser/themes/osx/places/organizer.css b/browser/themes/osx/places/organizer.css index 760edda3c02e..4e3682d4c33b 100644 --- a/browser/themes/osx/places/organizer.css +++ b/browser/themes/osx/places/organizer.css @@ -49,7 +49,7 @@ list-style-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-collapsed"); } -#placesList > treechildren::-moz-tree-twisty(selected) { +#placesList > treechildren::-moz-tree-twisty(closed, selected) { list-style-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-collapsed-inverted"); } @@ -61,22 +61,14 @@ list-style-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-expanded-inverted"); } -#placesList > treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty { +#placesList > treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(closed) { list-style-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-collapsed-rtl"); } -#placesList > treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(selected) { +#placesList > treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(closed, selected) { list-style-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-collapsed-inverted-rtl"); } -#placesList > treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(open) { - list-style-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-expanded"); -} - -#placesList > treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(open, selected) { - list-style-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-expanded-inverted"); -} - @media (-moz-mac-yosemite-theme) { #placesList > treechildren::-moz-tree-cell-text(selected) { color: -moz-dialogtext; @@ -87,11 +79,11 @@ color: #fff; } - #placesList > treechildren::-moz-tree-twisty(selected) { + #placesList > treechildren::-moz-tree-twisty(closed, selected) { list-style-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-collapsed"); } - #placesList > treechildren::-moz-tree-twisty(selected, focus) { + #placesList > treechildren::-moz-tree-twisty(closed, selected, focus) { list-style-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-collapsed-inverted"); } @@ -103,21 +95,13 @@ list-style-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-expanded-inverted"); } - #placesList > treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(selected) { + #placesList > treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(closed, selected) { list-style-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-collapsed-rtl"); } - #placesList > treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(selected, focus) { + #placesList > treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(closed, selected, focus) { list-style-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-collapsed-inverted-rtl"); } - - #placesList > treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(open, selected) { - list-style-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-expanded"); - } - - #placesList > treechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(open, selected, focus) { - list-style-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-expanded-inverted"); - } } #placesToolbar { diff --git a/browser/themes/osx/places/places.css b/browser/themes/osx/places/places.css index 7ba5a64aa4c3..5eaad2791a24 100644 --- a/browser/themes/osx/places/places.css +++ b/browser/themes/osx/places/places.css @@ -67,7 +67,7 @@ list-style-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-collapsed"); } -.sidebar-placesTreechildren::-moz-tree-twisty(selected) { +.sidebar-placesTreechildren::-moz-tree-twisty(closed, selected) { list-style-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-collapsed-inverted"); } @@ -79,22 +79,14 @@ list-style-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-expanded-inverted"); } -.sidebar-placesTreechildren:-moz-locale-dir(rtl)::-moz-tree-twisty { +.sidebar-placesTreechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(closed) { list-style-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-collapsed-rtl"); } -.sidebar-placesTreechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(selected) { +.sidebar-placesTreechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(closed, selected) { list-style-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-collapsed-inverted-rtl"); } -.sidebar-placesTreechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(open) { - list-style-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-expanded"); -} - -.sidebar-placesTreechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(open, selected) { - list-style-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-expanded-inverted"); -} - @media (-moz-mac-yosemite-theme) { .sidebar-placesTreechildren::-moz-tree-cell-text(selected) { color: -moz-dialogtext; @@ -105,11 +97,11 @@ color: #fff; } - .sidebar-placesTreechildren::-moz-tree-twisty(selected) { + .sidebar-placesTreechildren::-moz-tree-twisty(closed, selected) { list-style-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-collapsed"); } - .sidebar-placesTreechildren::-moz-tree-twisty(selected, focus) { + .sidebar-placesTreechildren::-moz-tree-twisty(closed, selected, focus) { list-style-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-collapsed-inverted"); } @@ -121,21 +113,13 @@ list-style-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-expanded-inverted"); } - .sidebar-placesTreechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(selected) { + .sidebar-placesTreechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(closed, selected) { list-style-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-collapsed-rtl"); } - .sidebar-placesTreechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(selected, focus) { + .sidebar-placesTreechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(closed, selected, focus) { list-style-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-collapsed-inverted-rtl") } - - .sidebar-placesTreechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(open, selected) { - list-style-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-expanded"); - } - - .sidebar-placesTreechildren:-moz-locale-dir(rtl)::-moz-tree-twisty(open, selected, focus) { - list-style-image: url("chrome://global/skin/tree/arrow-disclosure.svg#arrow-disclosure-expanded-inverted"); - } } #viewButton {