Bug 1408324 - Port bug 1405311 to Calendar: Remove :-moz-system-metric pseudo-class, replace with system metric media queries. r=philipp

calendar/base/themes/common/calendar-management.css

@@ -25,25 +25,27 @@ calendar-list-tree > tree > treechildren::-moz-tree-image(status-treecol, readfa
 }
 
 calendar-list-tree > tree {
-  border: none;
-  padding: 0;
-  margin: 4px 0;
-  -moz-border-top-colors: none;
-  -moz-border-right-colors: none;
-  -moz-border-bottom-colors: none;
-  -moz-border-left-colors: none;
-  -moz-appearance: none;
+    border: none;
+    padding: 0;
+    margin: 4px 0;
+    -moz-border-top-colors: none;
+    -moz-border-right-colors: none;
+    -moz-border-bottom-colors: none;
+    -moz-border-left-colors: none;
+    -moz-appearance: none;
 }
 
 calendar-list-tree > tree > treecols > treecol[hideheader="true"],
 calendar-list-tree > tree > treecols > treecol[hideheader="true"] {
-  font-size: 0px;
-  border: none;
-  padding: 0;
-  max-height: 0px;
-  height: 0px;
+    font-size: 0px;
+    border: none;
+    padding: 0;
+    max-height: 0px;
+    height: 0px;
 }
 
-calendar-list-tree > tree > treecols > treecol[anonid="scrollbar-spacer"]:-moz-system-metric(overlay-scrollbars) {
-  display: none;
+@media (-moz-overlay-scrollbars) {
+    calendar-list-tree > tree > treecols > treecol[anonid="scrollbar-spacer"] {
+      display: none;
+    }
 }

calendar/base/themes/common/calendar-views.css

@@ -949,7 +949,9 @@ tab[calview] > .tab-middle {
     display: -moz-box;
 }
 
-.multiday-headerscrollbarspacer:-moz-system-metric(overlay-scrollbars),
-.multiday-labelscrollbarspacer:-moz-system-metric(overlay-scrollbars) {
-    display: none;
+@media (-moz-overlay-scrollbars) {
+    .multiday-headerscrollbarspacer,
+    .multiday-labelscrollbarspacer {
+        display: none;
+    }
 }

calendar/base/themes/osx/calendar-management.css

@@ -8,9 +8,10 @@ calendar-list-tree > tree > treechildren::-moz-tree-image(checkbox-treecol) {
     list-style-image: url(chrome://calendar/skin/checkbox-images.png);
 }
 
-calendar-list-tree:-moz-system-metric(mac-graphite-theme)
-> tree > treechildren::-moz-tree-image(checkbox-treecol) {
-    list-style-image: url(chrome://calendar/skin/checkbox-images-graphite.png);
+@media (-moz-mac-graphite-theme) {
+    calendar-list-tree > tree > treechildren::-moz-tree-image(checkbox-treecol) {
+        list-style-image: url(chrome://calendar/skin/checkbox-images-graphite.png);
+    }
 }
 
 calendar-list-tree > tree > treechildren::-moz-tree-image(checkbox-treecol) {
@@ -30,26 +31,28 @@ calendar-list-tree > tree > treechildren::-moz-tree-cell(checkbox-treecol) {
 }
 
 calendar-list-tree treechildren::-moz-tree-row(selected) {
-  background: url(chrome://calendar/skin/sidebar-item.png) 0 0 repeat-x #90A0C0;
+    background: url(chrome://calendar/skin/sidebar-item.png) 0 0 repeat-x #90A0C0;
 }
 
 calendar-list-tree treechildren::-moz-tree-row(selected, focus) {
-  background-position: 0 -18px;
+    background-position: 0 -18px;
 }
 
-calendar-list-tree:-moz-system-metric(mac-graphite-theme) treechildren::-moz-tree-row(selected) {
-  background-position: 0 -36px;
-}
+@media (-moz-mac-graphite-theme) {
+    calendar-list-tree treechildren::-moz-tree-row(selected) {
+        background-position: 0 -36px;
+    }
 
-calendar-list-tree:-moz-system-metric(mac-graphite-theme) treechildren::-moz-tree-row(selected, focus) {
-  background-position: 0 -54px;
+    calendar-list-tree treechildren::-moz-tree-row(selected, focus) {
+        background-position: 0 -54px;
+    }
 }
 
 calendar-list-tree treechildren:-moz-window-inactive::-moz-tree-row(selected) {
-  background-position: 0 -72px;
+    background-position: 0 -72px;
 }
 
 calendar-list-tree treechildren::-moz-tree-cell-text(selected, focus),
 calendar-list-tree treechildren::-moz-tree-cell-text(selected) {
-  color: HighlightText;
+    color: HighlightText;
 }

calendar/base/themes/osx/calendar-task-tree.css

@@ -9,10 +9,11 @@
     list-style-image: url(chrome://calendar/skin/checkbox-images.png);
 }
 
-.calendar-task-tree:-moz-system-metric(mac-graphite-theme)
-> treechildren::-moz-tree-image(calendar-task-tree-col-completed),
-.calendar-task-tree-col-completed:-moz-system-metric(mac-graphite-theme) {
-    list-style-image: url(chrome://calendar/skin/checkbox-images-graphite.png);
+@media (-moz-mac-graphite-theme) {
+    .calendar-task-tree > treechildren::-moz-tree-image(calendar-task-tree-col-completed),
+    .calendar-task-tree-col-completed {
+        list-style-image: url(chrome://calendar/skin/checkbox-images-graphite.png);
+    }
 }
 
 .calendar-task-tree > treechildren::-moz-tree-image(calendar-task-tree-col-completed, completed),