Bug 1003196 - Add icons to more imip bar buttons. r=paenglab,a=philipp
authorMakeMyDay <makemyday@gmx-topmail.de>
Thu, 23 Apr 2015 13:40:09 +0200
changeset 25864 37812d78b3803d66ec0ab583d39c7460be8487f8
parent 25863 2a06e201836bd4de30274a8e8b5374a52787a6e4
child 25865 886ea0718ad9907dc492b5238a945b5fee0b1565
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)
reviewerspaenglab, philipp
bugs1003196
Bug 1003196 - Add icons to more imip bar buttons. r=paenglab,a=philipp
calendar/base/themes/windows/win-aero/lightning.css
calendar/base/themes/windows/win-classic/lightning.css
calendar/lightning/themes/common/lightning.css
calendar/lightning/themes/linux/lightning.css
calendar/lightning/themes/osx/lightning.css
--- a/calendar/base/themes/windows/win-aero/lightning.css
+++ b/calendar/base/themes/windows/win-aero/lightning.css
@@ -35,41 +35,51 @@
   list-style-image: url(chrome://calendar/skin/toolbar-small-aero.png);
 }
 
 #tabs-toolbar[brighttext] #calendar-tab-button,
 #tabs-toolbar[brighttext] #task-tab-button {
   list-style-image: url(chrome://lightning/skin/mode-switch-icons-inverted.png);
 }
 
+/* ::: imip button icons ::: */
+.imipAcceptRecurrencesButton,
 .imipAcceptButton {
   list-style-image: url(chrome://lightning/skin/imip-aero.png);
   -moz-image-region: rect(0px 16px 16px 0px);
 }
 
+.imipDeclineRecurrencesButton,
 .imipDeclineButton {
   list-style-image: url(chrome://lightning/skin/imip-aero.png);
   -moz-image-region: rect(0px 32px 16px 16px);
 }
 
+.imipTentativeRecurrencesButton,
 .imipTentativeButton {
   list-style-image: url(chrome://lightning/skin/imip-aero.png);
-  -moz-image-region: rect(0px 48px 16px 32px);
+  -moz-image-region: rect(1px 48px 17px 32px);
+}
+
+.imipDetailsButton {
+  list-style-image: url(chrome://calendar/skin/toolbar-aero.png);
+  -moz-image-region: rect(1px 143px 17px 126px);
 }
 
-/* These buttons may also deserve an icon:
-   .imipDetailsButton
-       (-> open the event or summary dialog)
-   .imipMoreButton
-       (-> dropdown button to offer more options to the user)
-   .imipAddButton
-       (-> add an event to the calendar)
-   .imipUpdateButton
-       (-> ipdate an event in the calendar)
-   .imipDeleteButton
-       (-> delete an event from the calendar)
-   .imipReconfirmButton
-       (-> re-confirm the own participation status on organizer's request)
-   .imipAcceptRecurrencesButton
-   .imipDeclineRecurrencesButton
-   .imipTentativeRecurrencesButton
-       (-> the same functionality as above, but for recurring events)
-*/
+.imipAddButton {
+  list-style-image: url(chrome://calendar/skin/toolbar-aero.png);
+  -moz-image-region: rect(2px 35px 18px 17px);
+}
+
+.imipUpdateButton {
+  list-style-image: url(chrome://calendar/skin/toolbar-aero.png);
+  -moz-image-region: rect(1px 17px 17px 1px);
+}
+
+.imipDeleteButton {
+  list-style-image: url(chrome://calendar/skin/toolbar-aero.png);
+  -moz-image-region: rect(1px 107px 17px 91px);
+}
+
+.imipReconfirmButton {
+  list-style-image: url(chrome://calendar/skin/tasks-actions-aero.png);
+  -moz-image-region: rect(1px 53px 17px 37px);
+}
--- a/calendar/base/themes/windows/win-classic/lightning.css
+++ b/calendar/base/themes/windows/win-classic/lightning.css
@@ -32,41 +32,50 @@
 
 .icon-holder[type="tasks"],
 .tabmail-tab[type="tasks"] {
   list-style-image: url(chrome://lightning-common/skin/mode-switch-icons.png);
   -moz-image-region: rect(0px 80px 16px 64px);
 }
 
 /* ::: imip button icons ::: */
+.imipAcceptRecurrencesButton,
 .imipAcceptButton {
   list-style-image: url(chrome://lightning/skin/imip.png);
   -moz-image-region: rect(0px 16px 16px 0px);
 }
 
+.imipDeclineRecurrencesButton,
 .imipDeclineButton {
   list-style-image: url(chrome://lightning/skin/imip.png);
   -moz-image-region: rect(0px 32px 16px 16px);
 }
 
+.imipTentativeRecurrencesButton,
 .imipTentativeButton {
   list-style-image: url(chrome://lightning/skin/imip.png);
   -moz-image-region: rect(0px 48px 16px 32px);
 }
 
-/* These buttons may also deserve an icon:
-   .imipDetailsButton
-       (-> open the event or summary dialog)
-   .imipMoreButton
-       (-> dropdown button to offer more options to the user)
-   .imipAddButton
-       (-> add an event to the calendar)
-   .imipUpdateButton
-       (-> ipdate an event in the calendar)
-   .imipDeleteButton
-       (-> delete an event from the calendar)
-   .imipReconfirmButton
-       (-> re-confirm the own participation status on organizer's request)
-   .imipAcceptRecurrencesButton
-   .imipDeclineRecurrencesButton
-   .imipTentativeRecurrencesButton
-       (-> the same functionality as above, but for recurring events)
-*/
+.imipDetailsButton {
+  list-style-image: url(chrome://calendar/skin/toolbar-small.png);
+  -moz-image-region: rect(0px 352px 16px 336px);
+}
+
+.imipAddButton {
+  list-style-image: url(chrome://calendar/skin/toolbar-small.png);
+  -moz-image-region: rect(0px 16px 16px 0px);
+}
+
+.imipUpdateButton {
+  list-style-image: url(chrome://calendar/skin/toolbar-small.png);
+  -moz-image-region: rect(0px 432px 16px 416px);
+}
+
+.imipDeleteButton {
+  list-style-image: url(chrome://calendar/skin/toolbar-small.png);
+  -moz-image-region: rect(0px 48px 16px 32px);
+}
+
+.imipReconfirmButton {
+  list-style-image: url(chrome://calendar/skin/toolbar-small.png);
+  -moz-image-region: rect(0px 400px 16px 385px);
+}
--- a/calendar/lightning/themes/common/lightning.css
+++ b/calendar/lightning/themes/common/lightning.css
@@ -1,8 +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/. */
 
 /* avoids contributing to the min width when Lightning is not selected */
 #calendarTabPanel:not([selected]) {
   visibility: collapse;
 }
+
+.imipMoreButton >.toolbarbutton-icon {
+  display: none;
+}
--- a/calendar/lightning/themes/linux/lightning.css
+++ b/calendar/lightning/themes/linux/lightning.css
@@ -194,41 +194,51 @@ radio[pane=paneLightning] {
 #calendar-status-todaypane-button[checked="true"] > .toolbarbutton-icon-end {
   list-style-image: url(chrome://global/skin/icons/expand.png);
 }
 
 #calMinimonthBox {
     margin-top: 3px;
 }
 
+/* ::: imip button icons ::: */
+.imipAcceptRecurrencesButton,
 .imipAcceptButton {
   list-style-image: url(chrome://lightning/skin/imip.png);
   -moz-image-region: rect(0px 16px 16px 0px);
 }
 
+.imipDeclineRecurrencesButton,
 .imipDeclineButton {
   list-style-image: url(chrome://lightning/skin/imip.png);
   -moz-image-region: rect(0px 32px 16px 16px);
 }
 
+.imipTentativeRecurrencesButton,
 .imipTentativeButton {
   list-style-image: url(chrome://lightning/skin/imip.png);
   -moz-image-region: rect(0px 48px 16px 32px);
 }
 
-/* These buttons may also deserve an icon:
-   .imipDetailsButton
-       (-> open the event or summary dialog)
-   .imipMoreButton
-       (-> dropdown button to offer more options to the user)
-   .imipAddButton
-       (-> add an event to the calendar)
-   .imipUpdateButton
-       (-> ipdate an event in the calendar)
-   .imipDeleteButton
-       (-> delete an event from the calendar)
-   .imipReconfirmButton
-       (-> re-confirm the own participation status on organizer's request)
-   .imipAcceptRecurrencesButton
-   .imipDeclineRecurrencesButton
-   .imipTentativeRecurrencesButton
-       (-> the same functionality as above, but for recurring events)
-*/
+.imipDetailsButton {
+  list-style-image: url(chrome://calendar/skin/toolbar-small.png);
+  -moz-image-region: rect(0px 352px 16px 336px);
+}
+
+.imipAddButton {
+  list-style-image: url(chrome://calendar/skin/toolbar-small.png);
+  -moz-image-region: rect(0px 16px 16px 0px);
+}
+
+.imipUpdateButton {
+  list-style-image: url(chrome://calendar/skin/toolbar-small.png);
+  -moz-image-region: rect(0px 432px 16px 416px);
+}
+
+.imipDeleteButton {
+  list-style-image: url(chrome://calendar/skin/toolbar-small.png);
+  -moz-image-region: rect(0px 48px 16px 32px);
+}
+
+.imipReconfirmButton {
+  list-style-image: url(chrome://calendar/skin/toolbar-small.png);
+  -moz-image-region: rect(0px 400px 16px 385px);
+}
--- a/calendar/lightning/themes/osx/lightning.css
+++ b/calendar/lightning/themes/osx/lightning.css
@@ -200,56 +200,86 @@ radio[pane=paneLightning] {
   position: relative;
 }
 
 #ltnSidebar {
   -moz-border-end: 1px solid #8B8B8B;
   -moz-margin-end: -3px !important;
 }
 
+/* ::: imip button icons ::: */
+.imipAcceptRecurrencesButton,
 .imipAcceptButton {
   list-style-image: url(chrome://lightning/skin/imip.png);
   -moz-image-region: rect(0px 16px 16px 0px);
 }
 
+.imipAcceptRecurrencesButton:active,
 .imipAcceptButton:active {
   -moz-image-region: rect(16px 16px 32px 0px);
 }
 
+.imipDeclineRecurrencesButton,
 .imipDeclineButton {
   list-style-image: url(chrome://lightning/skin/imip.png);
   -moz-image-region: rect(0px 32px 16px 16px);
 }
 
+.imipDeclineRecurrencesButton:active,
 .imipDeclineButton:active {
   -moz-image-region: rect(16px 32px 32px 16px);
 }
 
+.imipTentativeRecurrencesButton,
 .imipTentativeButton {
   list-style-image: url(chrome://lightning/skin/imip.png);
   -moz-image-region: rect(0px 48px 16px 32px);
 }
 
+.imipTentativeRecurrencesButton:active,
 .imipTentativeButton:active {
   -moz-image-region: rect(16px 48px 32px 32px);
 }
 
-/* Are the separate icons for :active state of the imipButtons
-   above still required with the button redesign?
+.imipDetailsButton {
+  list-style-image: url(chrome://calendar/skin/toolbar.png);
+  -moz-image-region: rect(1px 143px 17px 126px);
+}
+
+.imipDetailsButton:active {
+  -moz-image-region: rect(19px 143px 35px 126px);
+}
+
+.imipAddButton {
+  list-style-image: url(chrome://calendar/skin/toolbar.png);
+  -moz-image-region: rect(2px 35px 18px 17px);
+}
+
+.imipAddButton:active {
+  -moz-image-region: rect(20px 35px 36px 17px);
+}
 
-   These buttons may also deserve an icon:
-   .imipDetailsButton
-       (-> open the event or summary dialog)
-   .imipMoreButton
-       (-> dropdown button to offer more options to the user)
-   .imipAddButton
-       (-> add an event to the calendar)
-   .imipUpdateButton
-       (-> ipdate an event in the calendar)
-   .imipDeleteButton
-       (-> delete an event from the calendar)
-   .imipReconfirmButton
-       (-> re-confirm the own participation status on organizer's request)
-   .imipAcceptRecurrencesButton
-   .imipDeclineRecurrencesButton
-   .imipTentativeRecurrencesButton
-       (-> the same functionality as above, but for recurring events)
-*/
+.imipUpdateButton {
+  list-style-image: url(chrome://calendar/skin/toolbar.png);
+  -moz-image-region: rect(1px 17px 17px 1px);
+}
+
+.imipUpdateButton:active {
+  -moz-image-region: rect(19px 17px 35px 1px);
+}
+
+.imipDeleteButton {
+  list-style-image: url(chrome://calendar/skin/toolbar.png);
+  -moz-image-region: rect(1px 107px 17px 91px);
+}
+
+.imipDeleteButton:active {
+  -moz-image-region: rect(19px 107px 35px 91px);
+}
+
+.imipReconfirmButton {
+  list-style-image: url(chrome://calendar/skin/tasks-actions.png);
+  -moz-image-region: rect(1px 53px 17px 37px);
+}
+
+.imipReconfirmButton:active {
+  /*currently no separate image available*/
+}