Bug 1322261 - New icon for "Save and Close" toolbar button. r=MakeMyDay a=philipp
authorRichard Marti <richard.marti@gmail.com>
Fri, 30 Dec 2016 10:06:12 +0100
changeset 26892 829bed2c00042014f38a23959356dbd6bbc40f0a
parent 26891 363756557c31d4e9e62f499d40c2fd054097ab16
child 26893 14abe8730f9bfa7b27a1e53bea40216b7edebe2c
push id1834
push userclokep@gmail.com
push dateMon, 23 Jan 2017 21:48:40 +0000
treeherdercomm-beta@293cffe83e59 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersMakeMyDay, philipp
bugs1322261
Bug 1322261 - New icon for "Save and Close" toolbar button. r=MakeMyDay a=philipp
calendar/base/themes/common/calendar-toolbar-osxlion.svg
calendar/base/themes/common/calendar-toolbar.svg
calendar/base/themes/linux/dialogs/calendar-event-dialog.css
calendar/base/themes/osx/dialogs/calendar-event-dialog.css
calendar/base/themes/windows/dialogs/calendar-event-dialog.css
--- a/calendar/base/themes/common/calendar-toolbar-osxlion.svg
+++ b/calendar/base/themes/common/calendar-toolbar-osxlion.svg
@@ -47,16 +47,17 @@
   <path id="today" class="normal" d="m 1.5,2.5 0,14 15,0 0,-14 -2,0 0,2 -2,0 0,-3.5 0,3.5 -2,0 0,-2 -3,0 0,2 -2,0 0,-3.5 0,3.5 -2,0 0,-2 z m 0,3 15,0 0,11 -15,0 z m 6,2 3,0 0,4 2,0 -3.5,3 -3.5,-3 2,0 z"/>
   <path id="print" class="normal" d="m 4.5,2.5 0,4 -1.5,0 c -0.8,0 -1.5,1.1 -1.5,2 l 0,3 c 0,1 1.4,2 2.5,2 l 1.5,0 0,-1 7,0 0,1 1.5,0 c 1,0 2.5,-1 2.5,-2 l 0,-3 c 0,-0.8 -0.6,-2 -1.5,-2 l -1.5,0 0,-4 z m 0,0 9,0 0,6 -9,0 z m 0,6 2,0 0,2 -2,0 z m 0,5.4 0,1.6 m -2.5,0 14,0 m -2.5,0 0,-1.6"/>
   <path id="find" class="normal" d="M 8,2.5 C 5,2.5 2.5,5 2.5,8 c 0,3 2.5,5.5 5.5,5.5 3,0 5.5,-2.4 5.5,-5.5 C 13.5,5 11,2.5 8,2.5 Z m 0,2 c 2,0 3.5,1.5 3.5,3.5 0,2 -1.5,3.5 -3.5,3.5 C 6,11.5 4.5,10 4.5,8 4.5,6 6,4.5 8,4.5 Z m 4.5,7 -1,1 3,3 1,-1 z"/>
   <path id="category" class="normal" d="M 4 2.5 C 3.3 2.5 2.5 3.3 2.5 4 L 2.5 8 L 10 15.5 L 15.5 10 L 8 2.5 L 4 2.5 z M 6 4 A 2 2 0 0 1 8 6 A 2 2 0 0 1 6 8 A 2 2 0 0 1 4 6 A 2 2 0 0 1 6 4 z"/>
   <path id="complete" class="normal" d="M 1.5,10.5 3,8.5 6.7,11.7 C 9,7.8 12.6,5.6 16.5,3.5 l 0,1 c -4,3.1 -7,6.7 -9,11.2 z"/>
   <path id="priority" class="normal" d="m 7.5,2.5 3,0 0,8 -3,0 z M 10.5,14 A 1.5,1.5 0 0 1 9,15.5 1.5,1.5 0 0 1 7.5,14 1.5,1.5 0 0 1 9,12.5 1.5,1.5 0 0 1 10.5,14 Z"/>
   <path id="pane" class="normal" d="m 1.5,2.5 0,14 15,0 0,-14 -2,0 0,2 -2,0 0,-3.5 0,3.5 -2,0 0,-2 -3,0 0,2 -2,0 0,-3.5 0,3.5 -2,0 0,-2 z m 0,3 15,0 0,11 -15,0 z"/>
   <path id="save" class="normal" d="m 2.5,2.5 0,13 2,0 0,-6 8,0 0,6 3,0 0,-13 z m 2,0 9,0 0,5 -9,0 z m 2,9 4,0 0,4 -4,0 z"/>
+  <path id="save-close" class="normal" d="m 4.5,2.5 4.5,0 4.5,0 z m -2,0 0,8.2 3,-3.2 0.2,0 2.1,2 1.4,0 2,-2 -6.7,0 0,-5 z m 11,0 0,2.7 0.4,-0.4 1.6,0 0,-2.3 z M 15,7 8.5,13.2 5.5,10.4 4,12 l 4.5,4.5 8,-8 z m 0.5,5.3 -3,3 0,0.2 3,0 z m -13,1 0,2.2 2,0 0,-0.2 z"/>
   <path id="address" class="normal" d="m 2.5,15.5 13,0 c 0,-3.4 -2.2,-3 -5,-3 l 0,-1 C 12.5,10.4 12.7,9.4 13,8 13,7.7 13.5,7.4 13.5,7 13.5,6.6 13.1,6.3 13,6 12.8,5.6 12.9,3.7 12,3 10.4,1.8 7.56,1.8 6,3 5,3.7 5.1,5.6 5,6 4.8,6.3 4.5,6.6 4.5,7 c 0,0.3 0.4,0.6 0.5,1 0.2,1.5 0.5,2.3 2.5,3.5 l 0,1 c -2.5,0 -5,-0.5 -5,3 z"/>
   <path id="security" class="normal" d="m 9,2.5 c -3,0 -5,1 -5.5,5 l 0,1 -1,0 0,7 13,0 0,-7 -1,0 0,-1 c 0,-4 -3,-5 -5,-5 z m 0,2 c 3,0 3.5,1 3.5,4 l -7,0 c 0,-3 1,-4 3.5,-4 z"/>
   <path id="attach" class="normal" d="m 13.5,2.5 0,10.5 -4,3.5 -4,-3.5 0,-11.5 6,0 0,10 -2,2 -2,-2 0,-8 2,0 0,6.5" style="fill:none; stroke-opacity:1"/>
   <path id="status" class="normal" d="M 16.5,9 A 7.5,7.5 0 0 1 9,16.5 7.5,7.5 0 0 1 1.5,9 7.5,7.5 0 0 1 9,1.5 7.5,7.5 0 0 1 16.5,9 Z M 12.5,9 A 3.5,3.5 0 0 1 9,12.5 3.5,3.5 0 0 1 5.5,9 3.5,3.5 0 0 1 9,5.5 3.5,3.5 0 0 1 12.5,9 Z" style="fill-opacity:0.5"/>
   <path id="freebusy" class="normal" d="M 9,1.5 C 4.8,1.5 1.5,4.8 1.5,9 1.5,13.1 5.2,16.3 9,16.5 13,16.7 16.5,13.2 16.5,9 16.5,4.8 13.1,1.5 9,1.5 Z m 0,0 c 0.7,0 1.5,0 2.5,0.5 l 0,4.5 4,0 0,5 -6,0 0,5 C 4.5,16.3 1.5,12.5 1.5,9 1.5,5.3 4.2,1.6 9,1.5 Z m -0.5,2 1,0 0,5 4,0 0,1 -5,0 z"/>
   <path id="timezones" class="normal" d="M 9,1.5 C 4.8,1.5 1.5,4.8 1.5,9 1.5,13.1 5.2,16.3 9,16.5 13,16.7 16.5,13.2 16.5,9 16.5,4.8 13.1,1.5 9,1.5 Z M 7,3.8 6.3,4.6 6.3,5.7 7.1,6.8 7.8,8.2 9.4,8.3 10.4,6.1 9.8,3.8 11.3,1.9 c 1.5,0.5 3,1.5 3.8,3 l -3.4,2.5 1.6,-0.1 1.3,2 -0.3,1.8 -0.8,1.4 0.7,1.8 c -0.5,0.7 -1.5,1.3 -2.6,1.7 L 9.7,14 11.2,11.1 9.7,9.9 8.3,9 6.8,10.2 5.9,12.2 6,14 7,16 C 4.7,15.4 3.3,14 2.3,12.2 L 3.5,10.4 3.4,8.9 4.3,8 3.7,7.1 3.7,5.4 2.8,4.7 C 4,3 5.8,1.8 7.8,1.6 Z"/>
   <path id="decline" class="normal" d="M 2.5,5 5,2.5 l 4,4 4,-4 2.5,2.5 -4,4 4,4 -2.5,2.5 -4,-4 -4,4 -2.5,-2.5 4,-4 z"/>
   <path id="tentative" class="normal" d="m 8.2,6.5 -2.7,0 c 0,-1.4 0.5,-4 3.5,-4 2.3,0 4.4,1 4.5,4 0,2.8 -3,2.5 -3,5 l -3,0 C 7.4,8 10.3,8.5 10.2,6.5 10,5.5 9.3,5.5 9,5.5 c 0,0 -0.8,0 -0.8,1 z m -0.7,7 3,0 0,2 -3,0 z"/>
--- a/calendar/base/themes/common/calendar-toolbar.svg
+++ b/calendar/base/themes/common/calendar-toolbar.svg
@@ -115,18 +115,21 @@
   <path id="complete-inverted" class="inverted" d="M 1.5,10.5 3,7.5 6.7,10.7 C 9,6.8 12.6,4.6 16.5,2.5 l 0,2 c -4,3.1 -7,6.7 -9,11.2 z"/>
   <path id="priority" class="normal" d="m 7.5,2.5 3,0 0,8 -3,0 z M 10.5,14 A 1.5,1.5 0 0 1 9,15.5 1.5,1.5 0 0 1 7.5,14 1.5,1.5 0 0 1 9,12.5 1.5,1.5 0 0 1 10.5,14 Z"/>
   <path id="priority-flat" class="normal" d="m 7,3 4,0 -1,7.9 -2,0 z m 3.5,11 c 0,0.8 -0.6,1.5 -1.5,1.5 -0.8,0 -1.5,-0.6 -1.5,-1.5 0,-0.8 0.6,-1.5 1.5,-1.5 0.8,0 1.5,0.6 1.5,1.5 z"/>
   <path id="priority-inverted" class="inverted" d="m 7.5,2.5 3,0 0,8 -3,0 z m 0,10 3,0 0,3 -3,0 z"/>
   <path id="pane" class="normal" d="m 1.5,2.5 0,14 15,0 0,-14 -2,0 0,2 -2,0 0,-3.5 0,3.5 -2,0 0,-2 -3,0 0,2 -2,0 0,-3.5 0,3.5 -2,0 0,-2 z m 0,3 15,0 0,11 -15,0 z"/>
   <path id="pane-flat" class="normal" d="M 2,3 2,16 16,16 16,3 14,3 14,5 13,5 13,2 12,2 12,5 11,5 11,3 7,3 7,5 6,5 6,2 5,2 5,5 4,5 4,3 Z m 1,3 12,0 0,9 -12,0 z"/>
   <path id="pane-inverted" class="inverted" d="m 0.5,2.5 0,15 17,0 0,-15 -4,0 0,1 -3,0 0,-1 -3,0 0,1 -3,0 0,-1 z m 2,3 13,0 0,10 -13,0 z m 2,-5 0,3 3,0 0,-3 z m 6,0 0,3 3,0 0,-3 z"/>
   <path id="save" class="normal" d="m 2.5,2.5 0,13 2,0 0,-6 8,0 0,6 3,0 0,-13 z m 2,0 9,0 0,5 -9,0 z m 2,9 4,0 0,4 -4,0 z"/>
-  <path id="save-flat" class="normal" d="M 3 3 L 3 15 L 15 15 L 15 3 L 3 3 z M 5 4 L 13 4 L 13 8 L 5 8 L 5 4 z M 5 10 L 11 10 L 11 14 L 5 14 L 5 10 z M 6 11 L 6 13 L 7 13 L 7 11 L 6 11 z"/>
-  <path id="save-inverted" class="inverted" d="m 2.5,2.5 0,13 2.1,0 0,-5 6.9,0 0,5 4,0 0,-13 z m 2,0 9,0 0,5 -9,0 z m 0.1,8 6.9,0 0,5 -6.9,0 z"/>
+  <path id="save-flat" class="normal" d="M 2,2 2,16 16,16 16,2 Z M 4,3 14,3 14,8 4,8 Z m 0,7 7,0 0,5 -7,0 z m 1,1 0,3 2,0 0,-3 z"/>
+  <path id="save-inverted" class="inverted" d="m 2.5,2.5 0,13 2.1,0 0,-5 6.9,0 0,5 4,0 0,-13 z m 2,2 9,0 0,3 -9,0 z m 0.1,6 6.9,0 0,5 -6.9,0 z"/>
+  <path id="save-close" class="normal" d="m 4.5,2.5 4.5,0 4.5,0 z m -2,0 0,8.2 3,-3.2 0.2,0 2.1,2 1.4,0 2,-2 -6.7,0 0,-5 z m 11,0 0,2.7 0.4,-0.4 1.6,0 0,-2.3 z M 15,7 8.5,13.2 5.5,10.4 4,12 l 4.5,4.5 8,-8 z m 0.5,5.3 -3,3 0,0.2 3,0 z m -13,1 0,2.2 2,0 0,-0.2 z"/>
+  <path id="save-close-flat" class="normal" d="M 2,2 2,16 16,16 16,2 Z M 4,3 14,3 14,7 4,7 Z M 4.5,11.5 6,10 8,12 12.5,8 14,9.7 8,15 Z"/>
+  <path id="save-close-inverted" class="inverted" d="m 2.5,2.5 0,13 13,0 0,-13 z m 2,1.9 9,0 0,3.1 -9,0 z m 0.7,7.3 0.7,-0.6 1.7,1.6 4.4,-3.1 0.6,0.8 -5.1,3.6 z"/>
   <path id="address" class="normal" d="m 2.5,15.5 13,0 c 0,-3.4 -2.2,-3 -5,-3 l 0,-1 C 12.5,10.4 12.7,9.4 13,8 13,7.7 13.5,7.4 13.5,7 13.5,6.6 13.1,6.3 13,6 12.8,5.6 12.9,3.7 12,3 10.4,1.8 7.56,1.8 6,3 5,3.7 5.1,5.6 5,6 4.8,6.3 4.5,6.6 4.5,7 c 0,0.3 0.4,0.6 0.5,1 0.2,1.5 0.5,2.3 2.5,3.5 l 0,1 c -2.5,0 -5,-0.5 -5,3 z"/>
   <path id="address-flat" class="normal" d="m 3,15 12,0 c 0,-3 -1.2,-3 -4,-3 l 0,-1 C 13,9.9 12.7,9.4 13,8 13,7.7 13.5,7.4 13.5,7 13.5,6.6 13.1,6.3 13,6 12.8,5.6 12.9,3.7 12,3 10.4,1.8 7.56,1.8 6,3 5,3.7 5.1,5.6 5,6 4.8,6.3 4.5,6.6 4.5,7 4.5,7.3 4.9,7.6 5,8 5.2,9.5 5,9.8 7,11 l 0,1 c -2.5,0 -4,0 -4,3 z"/>
   <path id="address-inverted" class="inverted" d="m 2.5,15.5 13,0 c 0,-3.4 -2.2,-3 -5,-3 l 0,-1 C 12.5,10.4 12.7,9.4 13,8 13,7.7 13.5,7.4 13.5,7 13.5,6.6 13.1,6.3 13,6 12.8,5.6 12.9,3.7 12,3 10.4,1.8 7.56,1.8 6,3 5,3.7 5.1,5.6 5,6 4.8,6.3 4.5,6.6 4.5,7 c 0,0.3 0.4,0.6 0.5,1 0.2,1.5 0.5,2.3 2.5,3.5 l 0,1 c -2.5,0 -5,-0.5 -5,3 z"/>
   <path id="security" class="normal" d="m 9,2.5 c -3,0 -5,1 -5.5,5 l 0,1 -1,0 0,7 13,0 0,-7 -1,0 0,-1 c 0,-4 -3,-5 -5,-5 z m 0,2 c 3,0 3.5,1 3.5,4 l -7,0 c 0,-3 1,-4 3.5,-4 z"/>
   <path id="security-flat" class="normal" d="M 9,3 C 6.25,3 4,4 4,7.5 L 4,9 3,9 3,15 15,15 15,9 14,9 14,7.5 C 14,4 11.5,3 9,3 Z m 0,2 c 3,0 3,1 3,4 L 6,9 C 6,6 6,5 9,5 Z"/>
   <path id="security-inverted" class="inverted" d="m 9,2.5 c -2.75,0 -5.5,0.75 -5.5,5 l 0,1 -1,0 0,7 13,0 0,-7 -1,0 0,-1 c 0,-4 -3,-5 -5.5,-5 z m 0,3 c 2.5,0 2.5,1 2.5,3 l -5,0 c 0,-2 0,-3 2.5,-3 z"/>
   <path id="attach" class="normal" d="m 13.5,2.5 0,10.5 -4,3.5 -4,-3.5 0,-11.5 6,0 0,10 -2,2 -2,-2 0,-8 2,0 0,6.5" style="fill:none; stroke-opacity:1"/>
   <path id="attach-inverted" class="inverted" d="m 11.5,3 2,0 0,10 L 9,16.5 4.5,13 l 0,-11.5 7,0 z m 0,0.5 0,8.5 -2.5,2 -2.5,-2 0,-8.5 3,0 0,7.5 L 9,11.4 8.5,11 8.5,4"/>
--- a/calendar/base/themes/linux/dialogs/calendar-event-dialog.css
+++ b/calendar/base/themes/linux/dialogs/calendar-event-dialog.css
@@ -18,17 +18,17 @@
  *   Event dialog toolbar buttons
  *-------------------------------------------------------------------*/
 
 #button-save {
   list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#save);
 }
 
 #button-saveandclose {
-  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#save);
+  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#save-close);
 }
 
 #button-attendees {
   list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#address);
 }
 
 #button-privacy {
   list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#security);
@@ -60,17 +60,17 @@
   list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#timezones);
 }
 
 toolbar[brighttext] #button-save {
   list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#save-inverted);
 }
 
 toolbar[brighttext] #button-saveandclose {
-  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#save-inverted);
+  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#save-close-inverted);
 }
 
 toolbar[brighttext] #button-attendees {
   list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#address-inverted);
 }
 
 toolbar[brighttext] #button-privacy {
   list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#security-inverted);
--- a/calendar/base/themes/osx/dialogs/calendar-event-dialog.css
+++ b/calendar/base/themes/osx/dialogs/calendar-event-dialog.css
@@ -19,17 +19,17 @@
  *-------------------------------------------------------------------*/
 
 @media not all and (-moz-mac-yosemite-theme) {
   #button-save {
     list-style-image: url(chrome://calendar-common/skin/calendar-toolbar-osxlion.svg#save);
   }
 
   #button-saveandclose {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar-osxlion.svg#save);
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar-osxlion.svg#save-close);
   }
 
   #button-attendees {
     list-style-image: url(chrome://calendar-common/skin/calendar-toolbar-osxlion.svg#address);
   }
 
   #button-privacy {
     list-style-image: url(chrome://calendar-common/skin/calendar-toolbar-osxlion.svg#security);
@@ -63,17 +63,17 @@
 }
 
 @media (-moz-mac-yosemite-theme) {
   #button-save {
     list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#save-flat);
   }
 
   #button-saveandclose {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#save-flat);
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#save-close-flat);
   }
 
   #button-attendees {
     list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#address-flat);
   }
 
   #button-privacy {
     list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#security-flat);
@@ -106,17 +106,17 @@
   }
 }
 
 toolbar[brighttext] #button-save {
   list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#save-inverted);
 }
 
 toolbar[brighttext] #button-saveandclose {
-  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#save-inverted);
+  list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#save-close-inverted);
 }
 
 toolbar[brighttext] #button-attendees {
   list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#address-inverted);
 }
 
 toolbar[brighttext] #button-privacy {
   list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#security-inverted);
--- a/calendar/base/themes/windows/dialogs/calendar-event-dialog.css
+++ b/calendar/base/themes/windows/dialogs/calendar-event-dialog.css
@@ -177,17 +177,17 @@
 }
 
 @media not all and (-moz-os-version: windows-xp) {
   #button-save {
     list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#save);
   }
 
   #button-saveandclose {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#save);
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#save-close);
   }
 
   #button-attendees {
     list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#address);
   }
 
   #button-privacy {
     list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#security);
@@ -219,17 +219,17 @@
     list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#timezones);
   }
 
   toolbar[brighttext] #button-save {
     list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#save-inverted);
   }
 
   toolbar[brighttext] #button-saveandclose {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#save-inverted);
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#save-close-inverted);
   }
 
   toolbar[brighttext] #button-attendees {
     list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#address-inverted);
   }
 
   toolbar[brighttext] #button-privacy {
     list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#security-inverted);
@@ -266,17 +266,17 @@
 
 @media (-moz-windows-default-theme) and (-moz-os-version: windows-win8),
        (-moz-windows-default-theme) and (-moz-os-version: windows-win10) {
   #button-save {
     list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#save-flat);
   }
 
   #button-saveandclose {
-    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#save-flat);
+    list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#save-close-flat);
   }
 
   #button-attendees {
     list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#address-flat);
   }
 
   #button-privacy {
     list-style-image: url(chrome://calendar-common/skin/calendar-toolbar.svg#security-flat);