Bug 1488605 - Make twisty in folder pane dark when treechildren are selected (Mac only bug). r=ntim
authorRichard Marti <richard.marti@gmail.com>
Wed, 05 Sep 2018 18:29:33 +0200
changeset 33079 0116db9a1764ef43ddf1bd1212538a2bafb95f2b
parent 33078 ed7240d36fb533b18059d841c60c6f2ab72a73f9
child 33080 b677435939daa037d254fa226eab82afb9ec3d40
push id387
push userclokep@gmail.com
push dateMon, 10 Dec 2018 21:30:47 +0000
reviewersntim
bugs1488605
Bug 1488605 - Make twisty in folder pane dark when treechildren are selected (Mac only bug). r=ntim
mail/themes/osx/mail/mailWindow1.css
mail/themes/osx/mail/messenger.css
--- a/mail/themes/osx/mail/mailWindow1.css
+++ b/mail/themes/osx/mail/mailWindow1.css
@@ -11,27 +11,16 @@
 @import url("chrome://messenger/skin/");
 @import url("chrome://messenger/skin/primaryToolbar.css");
 @import url("chrome://messenger/skin/folderMenus.css");
 @import url("chrome://messenger/skin/folderPane.css");
 @import url("chrome://messenger/skin/tagColors.css");
 @import url("chrome://messenger/skin/messageIcons.css");
 @import url("chrome://messenger/skin/shared/mailWindow1.css");
 
-/* ::::::::: Global override :::::::::: */
-
-treechildren::-moz-tree-twisty {
-  margin-top: 0px !important;
-  margin-bottom: 0px !important;
-  margin-inline-start: 0px !important;
-  margin-inline-end: -4px !important;
-}
-
-/* :::::::::::::::::::::::::::::::::::: */
-
 #tabmail:-moz-lwtheme {
   text-shadow: inherit;
 }
 
 #messengerBox:-moz-lwtheme {
   text-shadow: none;
 }
 
@@ -64,34 +53,36 @@ treechildren::-moz-tree-twisty {
   background: transparent;
 }
 
 #folderTree treechildren::-moz-tree-row(selected) {
   -moz-appearance: -moz-mac-source-list-selection;
   -moz-font-smoothing-background-color: -moz-mac-source-list-selection;
 }
 
-@media not all and (-moz-mac-yosemite-theme) {
+@media (-moz-mac-yosemite-theme: 0) {
   #folderTree treechildren::-moz-tree-row(selected, focus) {
     -moz-appearance: -moz-mac-active-source-list-selection;
     -moz-font-smoothing-background-color: -moz-mac-active-source-list-selection;
   }
 
+  #folderTree treechildren::-moz-tree-twisty(selected),
   #folderTree treechildren::-moz-tree-cell-text(selected) {
     color: white;
   }
 }
 
 @media (-moz-mac-yosemite-theme) {
   #folderTree treechildren::-moz-tree-cell-text {
     font-family: 'Helvetica Neue';
     font-size: 9.5pt;
     font-weight: 300;
   }
 
+  #folderTree treechildren::-moz-tree-twisty(selected, focus),
   #folderTree treechildren::-moz-tree-cell-text(selected, focus) {
     color: #282828;
   }
 }
 
 treechildren::-moz-tree-cell-text(imapdeleted) {
   text-decoration: line-through;
 }
--- a/mail/themes/osx/mail/messenger.css
+++ b/mail/themes/osx/mail/messenger.css
@@ -526,17 +526,17 @@ toolbar[mode="icons"] .toolbarbutton-1 >
 
 tabmail > tabbox {
   margin: 0;
 }
 
 /* ::::: Trees ::::: */
 
 treechildren::-moz-tree-row {
-  min-height: 18px;
+  min-height: 19px;
 }
 
 treechildren::-moz-tree-cell-text {
   padding-inline-start: 2px;
 }
 
 /* ::::: Notifications ::::: */