Bug 931483 - Use better matching icons for extraction buttons on OSX and Win7+. r=Philipp AURORA_BASE_20131028
authorRichard Marti <richard.marti@gmail.com>
Mon, 28 Oct 2013 20:22:34 +0100
changeset 16771 c14732eb94f438bbc8e18ce0a11bf3e4374c9253
parent 16770 41f44f6f0b0cabfb39b449a7503610a528b371ee
child 16772 d8c2d33d88774b1f939e7f28cef0d963dac03588
push id1048
push userbugzilla@standard8.plus.com
push dateMon, 09 Dec 2013 20:31:40 +0000
treeherdercomm-beta@16699e4eae0e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersPhilipp
bugs931483
Bug 931483 - Use better matching icons for extraction buttons on OSX and Win7+. r=Philipp
calendar/base/themes/windows/win-aero/lightning-toolbar.css
calendar/lightning/themes/osx/lightning-toolbar.css
--- a/calendar/base/themes/windows/win-aero/lightning-toolbar.css
+++ b/calendar/base/themes/windows/win-aero/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/skin/common/lightning-toolbar.css);
-
 /* Lightning "Calendar" Toolbarbutton */
 #lightning-button-calendar {
   list-style-image: url(chrome://lightning/skin/mode-switch-icons-aero.png);
   -moz-image-region: rect(0px 16px 16px 0px);
 }
 
 /* Lightning "Tasks" Toolbarbutton */
 #lightning-button-tasks {
@@ -59,29 +57,51 @@
 #task-print-button {
   -moz-image-region: rect(1px 125px 17px 109px);
 }
 
 #calendar-unifinder-button {
   -moz-image-region: rect(1px 143px 17px 127px);
 }
 
+#extractEventButton,
+#hdrExtractEventButton {
+  list-style-image: url(chrome://calendar/skin/toolbar-aero.png);
+  -moz-image-region: rect(1px 35px 17px 19px);
+}
+
+#extractTaskButton,
+#hdrExtractTaskButton {
+  list-style-image: url(chrome://calendar/skin/toolbar-aero.png);
+  -moz-image-region: rect(1px 71px 17px 55px);
+}
+
+#extractTaskButton:-moz-lwtheme-brighttext,
+#extractEventButton:-moz-lwtheme-brighttext {
+  list-style-image: url(chrome://calendar/skin/toolbar-aero-inverted.png) !important;
+}
+
 .button-appmenu:-moz-lwtheme-brighttext {
   list-style-image: url(chrome://messenger/skin/icons/mail-toolbar-inverted.png);
 }
 
 @media (-moz-windows-compositor) {
   #calendar-toolbox {
     border-bottom-color: #AABCCF;
   }
 
   #tabbar-toolbar:not(:-moz-lwtheme-darktext) #lightning-button-calendar,
   #tabbar-toolbar:not(:-moz-lwtheme-darktext) #lightning-button-tasks {
     list-style-image: url(chrome://lightning/skin/mode-switch-icons-inverted.png);
   }
+
+  #tabbar-toolbar:not(:-moz-lwtheme-darktext) > #extractTaskButton,
+  #tabbar-toolbar:not(:-moz-lwtheme-darktext) > #extractEventButton {
+    list-style-image: url(chrome://calendar/skin/toolbar-aero-inverted.png);
+  }
 }
 
 #mail-bar3:-moz-lwtheme-brighttext #lightning-button-calendar,
 #mail-bar3:-moz-lwtheme-brighttext #lightning-button-tasks,
 #tabbar-toolbar:-moz-lwtheme-brighttext #lightning-button-calendar,
 #tabbar-toolbar:-moz-lwtheme-brighttext #lightning-button-tasks {
   list-style-image: url(chrome://lightning/skin/mode-switch-icons-inverted.png);
 }
--- a/calendar/lightning/themes/osx/lightning-toolbar.css
+++ b/calendar/lightning/themes/osx/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/skin/common/lightning-toolbar.css);
-
 /* Lightning "Calendar" Toolbarbutton */
 #lightning-button-calendar {
     list-style-image: url(chrome://lightning/skin/mode-switch-icons.png);
     -moz-image-region: rect(0px 98px 18px 80px);
 }
 
 #lightning-button-calendar:not([disabled]):active {
     -moz-image-region: rect(18px 98px 36px 80px);
@@ -103,8 +101,30 @@
 
 #calendar-unifinder-button:not([disabled]):active {
   -moz-image-region: rect(18px 144px 36px 126px);
 }
 
 #calendar-unifinder-button[checked="true"] {
   -moz-image-region: rect(36px 144px 54px 126px);
 }
+
+#extractEventButton,
+#hdrExtractEventButton {
+  list-style-image: url(chrome://calendar/skin/toolbar.png);
+  -moz-image-region: rect(0px 36px 18px 18px);
+}
+
+#extractEventButton:not([disabled]):active,
+#hdrExtractEventButton:not([disabled]):active {
+  -moz-image-region: rect(18px 36px 36px 18px);
+}
+
+#extractTaskButton,
+#hdrExtractTaskButton {
+  list-style-image: url(chrome://calendar/skin/toolbar.png);
+  -moz-image-region: rect(0px 72px 18px 54px);
+}
+
+#extractTaskButton:not([disabled]):active,
+#hdrExtractTaskButton:not([disabled]):active {
+  -moz-image-region: rect(18px 72px 36px 54px);
+}