Bug 1612166 - Remove duplicated calendar icons. r=darktrojan
authorPaul Morris <paul@thunderbird.net>
Wed, 12 Feb 2020 11:08:32 -0500
changeset 28760 171779b184e0be3f5b397bd985d4a3d1a371ac58
parent 28759 0dc699fa42c68a8fb115a9fb61509fd3d7f4bb25
child 28761 51f53932665f8a208b5f1b8e3a045ea622bc57df
push id17023
push usergeoff@darktrojan.net
push dateThu, 13 Feb 2020 22:14:36 +0000
treeherdercomm-central@027b7fafc431 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdarktrojan
bugs1612166
Bug 1612166 - Remove duplicated calendar icons. r=darktrojan Use the mail versions instead. The complete.svg file does not appear to be duplicated, so removing it from allowed-dupes.mn as well.
calendar/base/themes/common/calendar-task-view.css
calendar/base/themes/common/icons/calendar-tab.svg
calendar/base/themes/common/icons/category.svg
calendar/base/themes/common/jar.inc.mn
calendar/lightning/themes/common/lightning-toolbar.css
calendar/lightning/themes/common/lightning.css
mail/installer/allowed-dupes.mn
--- a/calendar/base/themes/common/calendar-task-view.css
+++ b/calendar/base/themes/common/calendar-task-view.css
@@ -200,17 +200,17 @@
     box-shadow: 0 0 rgba(255, 255, 255, .4) inset;
 }
 
 #calendar-add-task-button > .toolbarbutton-text {
     padding-inline-start: 5px;
 }
 
 #task-actions-category {
-    list-style-image: url(chrome://calendar-common/skin/icons/category.svg);
+    list-style-image: url(chrome://messenger/skin/icons/tag.svg);
 }
 
 #task-actions-markcompleted {
     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);
deleted file mode 100644
--- a/calendar/base/themes/common/icons/calendar-tab.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="M3 5h10V2.17c1.165.413 2 1.524 2 2.83v7a3 3 0 0 1-3 3H4a3 3 0 0 1-3-3V5c0-1.306.835-2.417 2-2.83V5zm0 1v6a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1V6H3zm3-4h4v2H6V2zM4.5 0a.5.5 0 0 1 .5.5v3a.5.5 0 0 1-1 0v-3a.5.5 0 0 1 .5-.5zm7 0a.5.5 0 0 1 .5.5v3a.5.5 0 1 1-1 0v-3a.5.5 0 0 1 .5-.5zM4 7h2v2H4V7zm6 0h2v2h-2V7zm-6 3h2v2H4v-2zm3 0h2v2H7v-2zm0-3h2v2H7V7z"/>
-</svg>
deleted file mode 100644
--- a/calendar/base/themes/common/icons/category.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="M7.379 14.207l-5.5-5.5A3 3 0 0 1 1 6.586V1h5.586a3 3 0 0 1 2.121.879l5.5 5.5a3 3 0 0 1 0 4.242l-2.586 2.586a3 3 0 0 1-4.242 0zm1.414-1.414a1 1 0 0 0 1.414 0l2.586-2.586a1 1 0 0 0 0-1.414l-5.5-5.5A1 1 0 0 0 6.586 3H3v3.586a1 1 0 0 0 .293.707l5.5 5.5zM5 6a1 1 0 1 1 0-2 1 1 0 0 1 0 2z"/>
-</svg>
--- a/calendar/base/themes/common/jar.inc.mn
+++ b/calendar/base/themes/common/jar.inc.mn
@@ -35,20 +35,18 @@
     skin/common/link-image-bottom.svg                           (../common/dialogs/images/link-image-bottom.svg)
     skin/common/link-image-top.svg                              (../common/dialogs/images/link-image-top.svg)
     skin/common/statusbar-priority.svg                          (../common/dialogs/images/statusbar-priority.svg)
     skin/common/icons/alarm-no.svg                              (../common/icons/alarm-no.svg)
     skin/common/icons/alarm.svg                                 (../common/icons/alarm.svg)
     ../icons/default/calendar-alarm-dialog.png                  (../common/icons/calendar-alarm-dialog.png)
     ../icons/default/calendar-event-dialog.png                  (../common/icons/calendar-event-dialog.png)
     ../icons/default/calendar-event-summary-dialog.png          (../common/icons/calendar-event-summary-dialog.png)
-    skin/common/icons/calendar-tab.svg                          (../common/icons/calendar-tab.svg)
     ../icons/default/calendar-task-dialog.png                   (../common/icons/calendar-task-dialog.png)
     ../icons/default/calendar-task-summary-dialog.png           (../common/icons/calendar-task-summary-dialog.png)
-    skin/common/icons/category.svg                              (../common/icons/category.svg)
     skin/common/icons/complete.svg                              (../common/icons/complete.svg)
     skin/common/icons/confidential.svg                          (../common/icons/confidential.svg)
     skin/common/icons/decline.svg                               (../common/icons/decline.svg)
     skin/common/icons/edit.svg                                  (../common/icons/edit.svg)
     skin/common/icons/email.svg                                 (../common/icons/email.svg)
     skin/common/icons/event.svg                                 (../common/icons/event.svg)
     skin/common/icons/find.svg                                  (../common/icons/find.svg)
     skin/common/icons/freebusy.svg                              (../common/icons/freebusy.svg)
--- a/calendar/lightning/themes/common/lightning-toolbar.css
+++ b/calendar/lightning/themes/common/lightning-toolbar.css
@@ -1,15 +1,15 @@
 /* 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/. */
 
 /* Lightning "Calendar" Toolbarbutton */
 #lightning-button-calendar {
-    list-style-image: url(chrome://calendar-common/skin/icons/calendar-tab.svg);
+    list-style-image: url(chrome://messenger/skin/shared/in-content/calendar.svg);
 }
 
 /* Lightning "Tasks" Toolbarbutton */
 #lightning-button-tasks {
     list-style-image: url(chrome://calendar-common/skin/icons/task-tab.svg);
 }
 
 /* Toolbar buttons */
--- a/calendar/lightning/themes/common/lightning.css
+++ b/calendar/lightning/themes/common/lightning.css
@@ -1,29 +1,29 @@
 /* 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/. */
 
 /* ::: new tab buttons ::: */
 #calendar-tab-button,
 #newMsgButton-calendar-menuitem {
-    list-style-image: url(chrome://calendar-common/skin/icons/calendar-tab.svg);
+    list-style-image: url(chrome://messenger/skin/shared/in-content/calendar.svg);
     -moz-image-region: auto;
 }
 
 #task-tab-button,
 #newMsgButton-task-menuitem {
     list-style-image: url(chrome://calendar-common/skin/icons/task-tab.svg);
     -moz-image-region: auto;
 }
 
 /* ::: tab icons ::: */
 .icon-holder[type="calendar"],
 .tabmail-tab[type="calendar"] {
-    list-style-image: url(chrome://calendar-common/skin/icons/calendar-tab.svg);
+    list-style-image: url(chrome://messenger/skin/shared/in-content/calendar.svg);
     -moz-image-region: auto;
 }
 
 .icon-holder[type="tasks"],
 .tabmail-tab[type="tasks"] {
     list-style-image: url(chrome://calendar-common/skin/icons/task-tab.svg);
     -moz-image-region: auto;
 }
--- a/mail/installer/allowed-dupes.mn
+++ b/mail/installer/allowed-dupes.mn
@@ -10,18 +10,16 @@ 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/new-mail-alert.png
 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
 chrome/messenger/skin/classic/messenger/messages/simple/Incoming/NextContext.html
 chrome/messenger/skin/classic/messenger/messages/bubbles/Bitmaps/plus.png
 chrome/messenger/skin/classic/messenger/messages/mail/Bitmaps/plus.png
@@ -38,19 +36,16 @@ 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/calendar-tab.svg
-chrome/calendar/skin/common/icons/category.svg
-chrome/calendar/skin/common/icons/complete.svg
 
 # Variants of paths in mozilla/browser/installer/allowed-dupes.mn:
 # bug 658850
 @MOZ_APP_NAME@
 @MOZ_APP_NAME@-bin
 # devtools reduction is bug 1311178
 chrome/devtools/content/dom/content/dom-view.css
 chrome/devtools/content/dom/index.html