Bug 1249987 - Fix the ExtractEventButton- and ExtractTaskButton icons. r=MakeMyDay, a=Fallen THUNDERBIRD451b1_2016042214_RELBRANCH
authorRichard Marti <richard.marti@gmail.com>
Sun, 21 Feb 2016 18:33:42 +0100
branchTHUNDERBIRD451b1_2016042214_RELBRANCH
changeset 26897 39f62c6e246c823bcdca8bd4590e79f069e2fde5
parent 26896 277184c1623587711e6b69b833bd26b4a798d72f
child 26898 c14d5d0bfbc4b967285547b097fba047b977126f
push id1850
push userclokep@gmail.com
push dateWed, 08 Mar 2017 19:29:12 +0000
treeherdercomm-esr52@028df196b2d9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersMakeMyDay, Fallen
bugs1249987
Bug 1249987 - Fix the ExtractEventButton- and ExtractTaskButton icons. r=MakeMyDay, a=Fallen
calendar/lightning/jar.mn
calendar/lightning/themes/common/lightning-toolbar.css
calendar/lightning/themes/linux/lightning-toolbar.css
calendar/lightning/themes/windows/lightning-toolbar.css
--- a/calendar/lightning/jar.mn
+++ b/calendar/lightning/jar.mn
@@ -107,9 +107,8 @@ calendar.jar:
     content/calendar/publish.js                            (/calendar/resources/content/publish.js)
     content/calendar/publishDialog.js                      (/calendar/resources/content/publishDialog.js)
     content/calendar/publishDialog.xul                     (/calendar/resources/content/publishDialog.xul)
     content/calendar/sound.wav                             (/calendar/resources/content/sound.wav)
     ../skin/lightning-common/datetimepickers.css           (/calendar/resources/skin/datetimepickers.css)
     ../skin/lightning-common/dialogOverlay.css             (/calendar/resources/skin/dialogOverlay.css)
     ../skin/lightning-common/imip.css                      (themes/common/imip.css)
     ../skin/lightning-common/lightning.css                 (themes/common/lightning.css)
-    ../skin/lightning-common/lightning-toolbar.css         (themes/common/lightning-toolbar.css)
deleted file mode 100644
--- a/calendar/lightning/themes/common/lightning-toolbar.css
+++ /dev/null
@@ -1,49 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * 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/. */
-
-#hdrExtractEventButton {
-  list-style-image: url("chrome://calendar/skin/toolbar-small.png");
-  -moz-image-region: rect(0px, 16px, 16px, 0px);
-}
-
-#hdrExtractTaskButton {
-  list-style-image: url("chrome://calendar/skin/toolbar-small.png");
-  -moz-image-region: rect(0px, 256px, 16px, 240px);
-}
-
-#extractEventButton {
-  list-style-image: url("chrome://calendar/skin/toolbar-large.png");
-  -moz-image-region: rect(0px, 24px, 24px, 0px);
-}
-
-#extractTaskButton {
-  list-style-image: url("chrome://calendar/skin/toolbar-large.png");
-  -moz-image-region: rect(0px, 384px, 24px, 360px);
-}
-
-#extractEventButton[disabled] {
-  -moz-image-region: rect(48px, 24px, 72px, 0px);
-}
-
-#extractTaskButton[disabled] {
-  -moz-image-region: rect(48px, 384px, 72px, 360px);
-}
-
-toolbar[iconsize="small"] #extractEventButton {
-  list-style-image: url("chrome://calendar/skin/toolbar-small.png");
-  -moz-image-region: rect(0px, 16px, 16px, 0px);
-}
-
-toolbar[iconsize="small"] #extractTaskButton {
-  list-style-image: url("chrome://calendar/skin/toolbar-small.png");
-  -moz-image-region: rect(0px, 256px, 16px, 240px);
-}
-
-toolbar[iconsize="small"] #extractEventButton[disabled] {
-  -moz-image-region: rect(32px, 16px, 48px, 0px);
-}
-
-toolbar[iconsize="small"] #extractTaskButton[disabled] {
-  -moz-image-region: rect(32px, 256px, 48px, 240px);
-}
--- a/calendar/lightning/themes/linux/lightning-toolbar.css
+++ b/calendar/lightning/themes/linux/lightning-toolbar.css
@@ -1,14 +1,12 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
-@import url(chrome://lightning-common/skin/lightning-toolbar.css);
-
 /* Lightning "Calendar" Toolbarbutton */
 
 #lightning-button-calendar {
   list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#calendar-tab);
 }
 
 #lightning-button-tasks {
   list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#task-tab);
--- a/calendar/lightning/themes/windows/lightning-toolbar.css
+++ b/calendar/lightning/themes/windows/lightning-toolbar.css
@@ -203,16 +203,62 @@
 
   toolbar[iconsize="small"] #calendar-unifinder-button {
     -moz-image-region: rect(0px 352px 16px 336px);
   }
 
   toolbar[iconsize="small"] #calendar-unifinder-button[disabled] {
     -moz-image-region: rect(32px 352px 48px 336px);
   }
+
+  #hdrExtractEventButton {
+    list-style-image: url("chrome://calendar/skin/toolbar-small.png");
+    -moz-image-region: rect(0px, 16px, 16px, 0px);
+  }
+
+  #hdrExtractTaskButton {
+    list-style-image: url("chrome://calendar/skin/toolbar-small.png");
+    -moz-image-region: rect(0px, 256px, 16px, 240px);
+  }
+
+  #extractEventButton {
+    list-style-image: url("chrome://calendar/skin/toolbar-large.png");
+    -moz-image-region: rect(0px, 24px, 24px, 0px);
+  }
+
+  #extractTaskButton {
+    list-style-image: url("chrome://calendar/skin/toolbar-large.png");
+    -moz-image-region: rect(0px, 384px, 24px, 360px);
+  }
+
+  #extractEventButton[disabled] {
+    -moz-image-region: rect(48px, 24px, 72px, 0px);
+  }
+
+  #extractTaskButton[disabled] {
+    -moz-image-region: rect(48px, 384px, 72px, 360px);
+  }
+
+  toolbar[iconsize="small"] #extractEventButton {
+    list-style-image: url("chrome://calendar/skin/toolbar-small.png");
+    -moz-image-region: rect(0px, 16px, 16px, 0px);
+  }
+
+  toolbar[iconsize="small"] #extractTaskButton {
+    list-style-image: url("chrome://calendar/skin/toolbar-small.png");
+    -moz-image-region: rect(0px, 256px, 16px, 240px);
+  }
+
+  toolbar[iconsize="small"] #extractEventButton[disabled] {
+    -moz-image-region: rect(32px, 16px, 48px, 0px);
+  }
+
+  toolbar[iconsize="small"] #extractTaskButton[disabled] {
+    -moz-image-region: rect(32px, 256px, 48px, 240px);
+  }
 }
 
 @media not all and (-moz-os-version: windows-xp) {
   #lightning-button-calendar {
     list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#calendar-tab);
   }
 
   #lightning-button-tasks {