Bug 1612168 - Use messenger icons for calendar where we can. r=darktrojan
authorPaul Morris <paul@thunderbird.net>
Sun, 09 Feb 2020 21:51:08 +0200
changeset 37265 bde1bbc31f16874cdb70906fbf1e916a72766d67
parent 37264 5d2047317bdb1a062a31a14d919890f59312a559
child 37266 25e74f6bf106447c569c5fec01c50a2f223be1bd
push id2552
push userclokep@gmail.com
push dateMon, 10 Feb 2020 21:24:16 +0000
treeherdercomm-beta@f95a6f4408a3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdarktrojan
bugs1612168
Bug 1612168 - Use messenger icons for calendar where we can. r=darktrojan
calendar/base/jar.mn
calendar/base/themes/common/calendar-task-view.css
calendar/base/themes/common/dialogs/calendar-event-dialog.css
calendar/base/themes/common/icons/address.svg
calendar/base/themes/common/icons/attach.svg
calendar/base/themes/common/icons/delete.svg
calendar/base/themes/common/icons/print.svg
calendar/base/themes/common/icons/save.svg
calendar/base/themes/common/icons/security.svg
calendar/lightning/themes/common/lightning-toolbar.css
calendar/lightning/themes/common/lightning.css
mail/installer/allowed-dupes.mn
--- a/calendar/base/jar.mn
+++ b/calendar/base/jar.mn
@@ -119,48 +119,42 @@ calendar.jar:
     skin/common/calendar-event-dialog-attendees.png             (themes/common/dialogs/images/calendar-event-dialog-attendees.png)
     skin/common/calendar-invitations-dialog-button-images.png   (themes/common/dialogs/images/calendar-invitations-dialog-button-images.png)
     skin/common/calendar-invitations-dialog-list-images.png     (themes/common/dialogs/images/calendar-invitations-dialog-list-images.png)
     skin/common/chain-lock.svg                                  (themes/common/dialogs/images/chain-lock.svg)
     skin/common/chain-unlock.svg                                (themes/common/dialogs/images/chain-unlock.svg)
     skin/common/link-image-bottom.svg                           (themes/common/dialogs/images/link-image-bottom.svg)
     skin/common/link-image-top.svg                              (themes/common/dialogs/images/link-image-top.svg)
     skin/common/statusbar-priority.svg                          (themes/common/dialogs/images/statusbar-priority.svg)
-    skin/common/icons/address.svg                               (themes/common/icons/address.svg)
     skin/common/icons/alarm-no.svg                              (themes/common/icons/alarm-no.svg)
     skin/common/icons/alarm.svg                                 (themes/common/icons/alarm.svg)
-    skin/common/icons/attach.svg                                (themes/common/icons/attach.svg)
     ../icons/default/calendar-alarm-dialog.png                  (themes/common/icons/calendar-alarm-dialog.png)
     ../icons/default/calendar-event-dialog.png                  (themes/common/icons/calendar-event-dialog.png)
     ../icons/default/calendar-event-summary-dialog.png          (themes/common/icons/calendar-event-summary-dialog.png)
     skin/common/icons/calendar-tab.svg                          (themes/common/icons/calendar-tab.svg)
     ../icons/default/calendar-task-dialog.png                   (themes/common/icons/calendar-task-dialog.png)
     ../icons/default/calendar-task-summary-dialog.png           (themes/common/icons/calendar-task-summary-dialog.png)
     skin/common/icons/category.svg                              (themes/common/icons/category.svg)
     skin/common/icons/complete.svg                              (themes/common/icons/complete.svg)
     skin/common/icons/confidential.svg                          (themes/common/icons/confidential.svg)
     skin/common/icons/decline.svg                               (themes/common/icons/decline.svg)
-    skin/common/icons/delete.svg                                (themes/common/icons/delete.svg)
     skin/common/icons/edit.svg                                  (themes/common/icons/edit.svg)
     skin/common/icons/email.svg                                 (themes/common/icons/email.svg)
     skin/common/icons/event.svg                                 (themes/common/icons/event.svg)
     skin/common/icons/find.svg                                  (themes/common/icons/find.svg)
     skin/common/icons/freebusy.svg                              (themes/common/icons/freebusy.svg)
     skin/common/icons/icon32.svg                                (themes/common/icons/icon32.svg)
     skin/common/icons/imip-bar.svg                              (themes/common/icons/imip-bar.svg)
     skin/common/icons/locked.svg                                (themes/common/icons/locked.svg)
     skin/common/icons/newevent.svg                              (themes/common/icons/newevent.svg)
     skin/common/icons/newtask.svg                               (themes/common/icons/newtask.svg)
     skin/common/icons/pane.svg                                  (themes/common/icons/pane.svg)
-    skin/common/icons/print.svg                                 (themes/common/icons/print.svg)
     skin/common/icons/priority.svg                              (themes/common/icons/priority.svg)
     skin/common/icons/private.svg                               (themes/common/icons/private.svg)
     skin/common/icons/save-close.svg                            (themes/common/icons/save-close.svg)
-    skin/common/icons/save.svg                                  (themes/common/icons/save.svg)
-    skin/common/icons/security.svg                              (themes/common/icons/security.svg)
     skin/common/icons/status.svg                                (themes/common/icons/status.svg)
     skin/common/icons/synchronize.svg                           (themes/common/icons/synchronize.svg)
     skin/common/icons/task-tab.svg                              (themes/common/icons/task-tab.svg)
     skin/common/icons/task.svg                                  (themes/common/icons/task.svg)
     skin/common/icons/tentative.svg                             (themes/common/icons/tentative.svg)
     skin/common/icons/timezones.svg                             (themes/common/icons/timezones.svg)
     skin/common/icons/today.svg                                 (themes/common/icons/today.svg)
     skin/common/icons/warn.svg                                  (themes/common/icons/warn.svg)
--- a/calendar/base/themes/common/calendar-task-view.css
+++ b/calendar/base/themes/common/calendar-task-view.css
@@ -212,17 +212,17 @@
     list-style-image: url(chrome://calendar-common/skin/icons/complete.svg);
 }
 
 #task-actions-priority {
     list-style-image: url(chrome://calendar-common/skin/icons/priority.svg);
 }
 
 #calendar-delete-task-button {
-    list-style-image: url(chrome://calendar-common/skin/icons/delete.svg);
+    list-style-image: url(chrome://messenger/skin/icons/delete.svg);
 }
 
 .input-container {
     display: flex;
     align-items: stretch;
 }
 
 .input-container html|input {
--- a/calendar/base/themes/common/dialogs/calendar-event-dialog.css
+++ b/calendar/base/themes/common/dialogs/calendar-event-dialog.css
@@ -37,48 +37,48 @@ window[systemcolors] > dialog {
   display: none;
 }
 
 /*--------------------------------------------------------------------
  *   Event dialog toolbar buttons
  *-------------------------------------------------------------------*/
 
 #button-save {
-  list-style-image: url(chrome://calendar-common/skin/icons/save.svg);
+  list-style-image: url(chrome://messenger/skin/icons/save.svg);
 }
 
 #button-save[mode="send"] {
   list-style-image: url("chrome://messenger/skin/icons/send.svg");
 }
 
 #saveandcloseButton,
 #button-saveandclose {
   list-style-image: url(chrome://calendar-common/skin/icons/save-close.svg);
 }
 
 #button-saveandclose[mode="send"] {
   list-style-image: url("chrome://messenger/skin/icons/send.svg");
 }
 
 #button-attendees {
-  list-style-image: url(chrome://calendar-common/skin/icons/address.svg);
+  list-style-image: url(chrome://messenger/skin/icons/address.svg);
 }
 
 #button-privacy {
-  list-style-image: url(chrome://calendar-common/skin/icons/security.svg);
+  list-style-image: url(chrome://messenger/skin/icons/security.svg);
 }
 
 #button-url {
-  list-style-image: url(chrome://calendar-common/skin/icons/attach.svg);
+  list-style-image: url(chrome://messenger/skin/icons/attach.svg);
 }
 
 #deleteButton,
 #button-delete.cal-event-toolbarbutton {
   /* !important to override the SM #button-delete states */
-  list-style-image: url(chrome://calendar-common/skin/icons/delete.svg) !important;
+  list-style-image: url(chrome://messenger/skin/icons/delete.svg) !important;
   -moz-image-region: auto !important;
 }
 
 #button-priority {
   list-style-image: url(chrome://calendar-common/skin/icons/priority.svg);
 }
 
 #button-status {
deleted file mode 100644
--- a/calendar/base/themes/common/icons/address.svg
+++ /dev/null
@@ -1,7 +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/. -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity">
-  <path d="M6.812 9.349a4 4 0 1 1 4.377 0A7.003 7.003 0 0 1 16 16H2a7.003 7.003 0 0 1 4.812-6.651zM9 8a2 2 0 1 0 0-4 2 2 0 0 0 0 4zm0 3a5.001 5.001 0 0 0-4.584 3h9.168A5.001 5.001 0 0 0 9 11z"/>
-  <path d="M4.049 6.7A4 4 0 0 1 9.7 1.049 5 5 0 0 0 4.049 6.7zM1.252 14H0c0-2.89 1.75-5.37 4.249-6.439.178.543.447 1.045.788 1.488A8.016 8.016 0 0 0 1.252 14z"/>
-</svg>
deleted file mode 100644
--- a/calendar/base/themes/common/icons/attach.svg
+++ /dev/null
@@ -1,6 +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/. -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity" viewBox="0 0 16 16">
-  <path d="M5 3v9a3 3 0 0 0 6 0V3.5a.5.5 0 1 1 1 0V12a4 4 0 1 1-8 0V3a3 3 0 1 1 6 0v8a2 2 0 1 1-4 0V5.5a.5.5 0 0 1 1 0V11a1 1 0 0 0 2 0V3a2 2 0 1 0-4 0z"/>
-</svg>
deleted file mode 100644
--- a/calendar/base/themes/common/icons/delete.svg
+++ /dev/null
@@ -1,7 +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/. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity" viewBox="0 0 16 16">
-  <path d="M6.5 12a.5.5 0 0 0 .5-.5v-6a.5.5 0 0 0-1 0v6a.5.5 0 0 0 .5.5zm2 0a.5.5 0 0 0 .5-.5v-6a.5.5 0 0 0-1 0v6a.5.5 0 0 0 .5.5zm2 0a.5.5 0 0 0 .5-.5v-6a.5.5 0 0 0-1 0v6a.5.5 0 0 0 .5.5z"/>
-  <path d="M14 2h-3.05a2.5 2.5 0 0 0-4.9 0H3a1 1 0 0 0 0 2v9a3 3 0 0 0 3 3h5a3 3 0 0 0 3-3V4a1 1 0 0 0 0-2zM8.5 1a1.489 1.489 0 0 1 1.391 1H7.109A1.489 1.489 0 0 1 8.5 1zM12 13a1 1 0 0 1-1 1H6a1 1 0 0 1-1-1V4h7z"/>
-</svg>
deleted file mode 100644
--- a/calendar/base/themes/common/icons/print.svg
+++ /dev/null
@@ -1,6 +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/. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity" viewBox="0 0 16 16">
-  <path d="M14 5h-1V1a1 1 0 0 0-1-1H4a1 1 0 0 0-1 1v4H2a2 2 0 0 0-2 2v5h3v3a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1v-3h3V7a2 2 0 0 0-2-2zM2.5 8a.5.5 0 1 1 .5-.5.5.5 0 0 1-.5.5zm9.5 7H4v-5h8zm0-10H4V1h8zm-6.5 7h4a.5.5 0 0 0 0-1h-4a.5.5 0 1 0 0 1zm0 2h5a.5.5 0 0 0 0-1h-5a.5.5 0 1 0 0 1z"/>
-</svg>
deleted file mode 100644
--- a/calendar/base/themes/common/icons/save.svg
+++ /dev/null
@@ -1,6 +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/. -->
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg" fill="context-fill" fill-opacity="context-fill-opacity" viewBox="0 0 16 16">
-  <path d="M9 3H3v10h10V5.828L10.172 3H3v3h5a1 1 0 0 0 1-1V3zM3 1h7.172a2 2 0 0 1 1.414.586l2.828 2.828A2 2 0 0 1 15 5.828V13a2 2 0 0 1-2 2H3a2 2 0 0 1-2-2V3a2 2 0 0 1 2-2zm5 11a2 2 0 1 1 0-4 2 2 0 0 1 0 4z"/>
-</svg>
deleted file mode 100644
--- a/calendar/base/themes/common/icons/security.svg
+++ /dev/null
@@ -1,6 +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/. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="context-fill" fill-opacity="context-fill-opacity" viewBox="0 0 16 16">
-  <path d="M12,7 L13,7 C13.5522847,7 14,7.44771525 14,8 L14,14 C14,14.5522847 13.5522847,15 13,15 L3,15 C2.44771525,15 2,14.5522847 2,14 L2,8 C2,7.44771525 2.44771525,7 3,7 L4,7 L4,5.00032973 C4,2.79202307 5.79321704,1 8,1 C10.2075938,1 12,2.79481161 12,5.00032973 L12,7 Z M10,7 L10,5.00032973 C10,3.89878113 9.10242341,3 8,3 C6.89748845,3 6,3.89689088 6,5.00032973 L6,7 L10,7 Z"/>
-</svg>
--- a/calendar/lightning/themes/common/lightning-toolbar.css
+++ b/calendar/lightning/themes/common/lightning-toolbar.css
@@ -32,23 +32,23 @@
 
 #calendar-edit-button,
 #task-edit-button {
     list-style-image: url(chrome://calendar-common/skin/icons/edit.svg);
 }
 
 #calendar-delete-button,
 #task-delete-button {
-    list-style-image: url(chrome://calendar-common/skin/icons/delete.svg);
+    list-style-image: url(chrome://messenger/skin/icons/delete.svg);
 }
 
 #calendar-goto-today-button {
     list-style-image: url(chrome://calendar-common/skin/icons/today.svg);
 }
 
 #calendar-print-button,
 #task-print-button {
-    list-style-image: url(chrome://calendar-common/skin/icons/print.svg);
+    list-style-image: url(chrome://messenger/skin/icons/print.svg);
 }
 
 #calendar-unifinder-button {
     list-style-image: url(chrome://calendar-common/skin/icons/find.svg);
 }
--- a/calendar/lightning/themes/common/lightning.css
+++ b/calendar/lightning/themes/common/lightning.css
@@ -149,17 +149,17 @@
 }
 
 .imipRescheduleButton,
 .imipUpdateButton {
     list-style-image: url(chrome://calendar-common/skin/icons/synchronize.svg);
 }
 
 .imipDeleteButton {
-    list-style-image: url(chrome://calendar-common/skin/icons/delete.svg);
+    list-style-image: url(chrome://messenger/skin/icons/delete.svg);
 }
 
 .imipReconfirmButton {
     list-style-image: url(chrome://calendar-common/skin/icons/priority.svg);
 }
 
 .imipAcceptLabel {
     font-weight: bold;
--- a/mail/installer/allowed-dupes.mn
+++ b/mail/installer/allowed-dupes.mn
@@ -8,23 +8,17 @@
 # browser (see bug 1451050 and bug 1476934)
 defaults/settings/pinning/pins.json
 defaults/settings/main/example.json
 
 # mail
 chrome/chat/content/chat/conv.html
 chrome/classic/skin/classic/messenger/icons/accounts.svg
 chrome/classic/skin/classic/messenger/icons/addon-install-confirm.svg
-chrome/classic/skin/classic/messenger/icons/address.svg
-chrome/classic/skin/classic/messenger/icons/attach.svg
-chrome/classic/skin/classic/messenger/icons/delete.svg
 chrome/classic/skin/classic/messenger/icons/new-mail-alert.png
-chrome/classic/skin/classic/messenger/icons/print.svg
-chrome/classic/skin/classic/messenger/icons/save.svg
-chrome/classic/skin/classic/messenger/icons/security.svg
 chrome/classic/skin/classic/messenger/icons/spelling.svg
 chrome/classic/skin/classic/messenger/icons/tag.svg
 chrome/classic/skin/classic/messenger/shared/in-content/calendar.svg
 chrome/messenger/content/branding/icon48.png
 chrome/messenger/content/branding/icon64.png
 chrome/messenger/content/messenger/extension.svg
 chrome/messenger/skin/classic/messenger/messages/simple/Variants/Normal.css
 chrome/messenger/skin/classic/messenger/messages/simple/Incoming/Context.html
@@ -44,25 +38,19 @@ chrome/devtools/skin/splitters.css
 chrome/icons/default/default48.png
 chrome/icons/default/default64.png
 
 # calendar
 components/calFilter.js
 chrome/calendar/content/calFilter.js
 components/calUtils.js
 chrome/calendar/content/calUtils.js
-chrome/calendar/skin/common/icons/address.svg
-chrome/calendar/skin/common/icons/attach.svg
 chrome/calendar/skin/common/icons/calendar-tab.svg
 chrome/calendar/skin/common/icons/category.svg
 chrome/calendar/skin/common/icons/complete.svg
-chrome/calendar/skin/common/icons/delete.svg
-chrome/calendar/skin/common/icons/print.svg
-chrome/calendar/skin/common/icons/save.svg
-chrome/calendar/skin/common/icons/security.svg
 chrome/calendar/skin/linux/calendar-event-dialog.css
 chrome/calendar/skin/windows/calendar-event-dialog.css
 chrome/calendar/skin/linux/calendar-invitations-dialog.css
 chrome/calendar/skin/windows/calendar-invitations-dialog.css
 chrome/calendar/skin/osx/calendar-subscriptions-dialog.css
 chrome/calendar/skin/windows/calendar-subscriptions-dialog.css
 chrome/calendar/skin/linux/calendar-daypicker.css
 chrome/calendar/skin/windows/calendar-daypicker.css