Bug 1387003 - Adding container icons from test pilot experiment. r?jaws draft
authorJonathan Kingston <jkt@mozilla.com>
Thu, 03 Aug 2017 13:05:17 +0100
changeset 620519 8f81a9349cd622d0886e9505b6548a0175ec6cbe
parent 620112 d942ef54fdf726840a698d2ddcaf989d2c00edbc
child 640717 9e01b0c66cc2b379f1ce600ba78ebfbac896662b
push id72060
push userjkingston@mozilla.com
push dateThu, 03 Aug 2017 14:27:45 +0000
reviewersjaws
bugs1387003
milestone57.0a1
Bug 1387003 - Adding container icons from test pilot experiment. r?jaws MozReview-Commit-ID: FYScQpSh11m
browser/base/content/usercontext-chill.svg
browser/base/content/usercontext-food.svg
browser/base/content/usercontext-fruit.svg
browser/base/content/usercontext-gift.svg
browser/base/content/usercontext-pet.svg
browser/base/content/usercontext-tree.svg
browser/base/content/usercontext-vacation.svg
browser/base/jar.mn
browser/components/contextualidentity/content/usercontext.css
browser/components/preferences/containers.js
browser/locales/en-US/chrome/browser/preferences-old/containers.properties
browser/locales/en-US/chrome/browser/preferences/containers.properties
browser/themes/shared/preferences/containers.css
new file mode 100644
--- /dev/null
+++ b/browser/base/content/usercontext-chill.svg
@@ -0,0 +1,14 @@
+<!-- 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="32" height="32" viewBox="0 0 32 32">
+  <path fill="context-fill" d="M9.1,18.5l-5.7,5.9C3.2,23.8,3,23.3,3,22.6c0-2.5,2-4.4,4.4-4.4C7.8,18.1,8.5,18.3,9.1,18.5 M26.5,18.5l-5.7,5.9
+  c-0.2-0.5-0.4-1.1-0.4-1.8c0-2.5,2-4.4,4.4-4.4C25.4,18.1,26,18.3,26.5,18.5 M24.7,2L24.7,2c-0.7,0-1.4,0.7-1.4,1.4s0.7,1.4,1.4,1.4
+  c2.5,0,4.4,2,4.4,4.4v7.6c-1.6-1.2-3.6-1.8-5.5-1.4c-2.1,0.4-3.9,1.6-5,3.4c-1.6-1.2-3.9-1.2-5.5,0c-1.1-1.8-2.8-3-5-3.4
+  c-2-0.4-3.9,0.2-5.5,1.4V9.2c0-2.5,2-4.4,4.4-4.4c0.5,0,0.9-0.4,1.2-0.7c0.2-0.4,0.2-0.9,0-1.4C8.2,2.3,7.6,2,7.1,2
+  C3.2,2,0,5.2,0,9.2v13.5C0,26.7,3.2,30,7.1,30l0,0c3.9,0,7.1-3.2,7.1-7.3c0-0.2,0-0.4,0-0.5c0.2-0.9,0.9-1.4,1.8-1.4
+  s1.6,0.5,1.8,1.4v0.2c0,0.2,0,0.2,0,0.4c0,2,0.7,3.7,2.1,5c1.4,1.4,3,2.1,5,2.1l0,0c2,0,3.6-0.7,5-2.1c1.4-1.2,2.1-3.2,2.1-5V9.2
+  C32,5.2,28.8,2,24.7,2"/>
+</svg>
+
new file mode 100644
--- /dev/null
+++ b/browser/base/content/usercontext-food.svg
@@ -0,0 +1,10 @@
+<!-- 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="32" height="32" viewBox="0 0 32 32">
+  <path fill="context-fill" d="M14.1,0.9v5.3h-1.4V0.9c0-1.1-1.4-1.1-1.4,0v5.3h-1.2V0.9c0-1.1-1.4-1.1-1.4,0v5.3H7.2V0.9c0-1.2-1.6-1.1-1.6,0
+  v10.4c0,1.8,1.2,3,2.8,3v15.2c0,1.6,1.1,2.5,2.1,2.5s2.1-0.9,2.1-2.5V14.3c1.6,0,2.8-1.4,2.8-2.8V0.9C15.6-0.4,14.1-0.2,14.1,0.9z
+   M19.8,3.7v25.8c0,3.2,4.2,3.2,4.2,0V17.1h2.3V3.7C26.5-1.2,19.8-1.2,19.8,3.7z"/>
+</svg>
+
new file mode 100644
--- /dev/null
+++ b/browser/base/content/usercontext-fruit.svg
@@ -0,0 +1,10 @@
+<!-- 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="32" height="32" viewBox="0 0 32 32">
+  <path fill="context-fill" d="M16.5,8c-2.1-0.9-3.9-1.2-6.6-0.9C4.6,8,1.8,12.6,1.8,18c0,5.9,4.8,14,9.8,14c1.6,0,3.9-1.2,4.4-1.2
+  c0.5,0,2.8,1.2,4.4,1.2c5,0,9.8-8.4,9.8-14c0-5.9-3.2-10.8-9.8-10.8C19,7.1,17.8,7.5,16.5,8z M11.7,0c1.1,0.2,3.2,0.9,4.1,2.3
+  c0.9,1.4,0.5,3.6,0.2,4.6c-1.2-0.2-3.2-0.7-4.1-2.3C11,3.2,11.4,1.1,11.7,0L11.7,0z"/>
+</svg>
+
new file mode 100644
--- /dev/null
+++ b/browser/base/content/usercontext-gift.svg
@@ -0,0 +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/. -->
+<svg xmlns="http://www.w3.org/2000/svg"
+     width="32" height="32" viewBox="0 0 32 32">
+  <path fill="context-fill" d="M30.3,8.1h-4.5V8c0.7-0.7,1.3-1.9,1.3-3.2c0-2.6-2.1-4.7-4.9-4.7c-1.5,0-4.5,1.5-6.4,3.4C14,1.6,11,0.1,9.5,0.1
+  c-2.6,0-4.9,2.1-4.9,4.7C4.7,6.1,5.2,7.2,6,8H1.7C0.6,8,0,8.7,0,9.6v4.5c0,0.2,0.2,0.4,0.4,0.4h13.8V9.6h3.2v4.9h14.2
+  c0.2,0,0.4-0.2,0.4-0.4V9.6C32,8.7,31.4,8.1,30.3,8.1z M9.5,6.5C8.6,6.5,8,5.9,8,4.8s0.6-1.5,1.5-1.5s3.7,1.9,4.7,2.8
+  C13.7,6.3,9.5,6.5,9.5,6.5z M22.3,6.5c0,0-4.1-0.2-4.7-0.4c0.9-1.1,3.7-2.8,4.7-2.8S24,3.8,24,4.8S23.2,6.5,22.3,6.5z M1.7,17.7
+  h12.7v14.2H1.7V17.7z M17.6,17.7h12.7v14.2H17.6V17.7z"/>
+</svg>
+
new file mode 100644
--- /dev/null
+++ b/browser/base/content/usercontext-pet.svg
@@ -0,0 +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/. -->
+<svg xmlns="http://www.w3.org/2000/svg"
+     width="32" height="32" viewBox="0 0 32 32">
+  <path fill="context-fill" d="M28.5,8.1c0-1.1-1-1.9-2.1-2.4V3.7c-0.2-0.2-0.3-0.3-0.6-0.3c-0.6,0-1.1,0.8-1.3,2.1c-0.2,0-0.3,0-0.5,0l0,0
+  c0-0.2,0-0.3-0.2-0.5c-0.3-1.1-0.8-1.9-1.3-2.6C22,2.6,21.7,3.2,21.7,4L22,6.3c-0.3,0.2-0.6,0.3-1,0.6l-3.5,3.7l0,0
+  c0,0-6.3-0.8-10.9,0.2c-0.6,0-1,0.2-1.1,0.3c-0.5,0.2-0.8,0.3-1.1,0.6c-1.1-0.8-2.2-2.1-3.2-4c0-0.3-0.5-0.5-0.8-0.5s-0.5,0.6-0.3,1
+  c0.8,2.1,2.1,3.5,3.4,4.5c-0.5,0.5-0.8,1-1,1.6c0,0-0.3,2.2-0.3,5.5l1.4,8c0,1,0.8,1.8,1.9,1.8c1,0,1.9-0.8,1.9-1.8V23l0.5-1.3h8.8
+  l0.8,1.3v4.7c0,1,0.8,1.8,1.9,1.8c1,0,1.6-0.6,1.8-1.4l0,0l1.9-9l0,0l2.1-6.4h3c3.4,0,3.7-2.9,3.7-2.9L28.5,8.1z"/>
+</svg>
+
new file mode 100644
--- /dev/null
+++ b/browser/base/content/usercontext-tree.svg
@@ -0,0 +1,10 @@
+<!-- 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="32" height="32" viewBox="0 0 32 32">
+  <path fill="context-fill" d="M0.7,18c0,4.9,3.6,8.8,8.1,9.5v4.3c0.2,0,3.2,0,3.2,0v-4.3c1.8-0.4,3.6-1.1,4.9-2.5c0.2-0.2,0.2-0.2,0.2-0.5
+  c-0.2-0.4-0.2-1.1-0.2-1.6c0-2,0.2-4.9,1.6-7.9c0,0,0.9-1.6,0.7-1.8C18,7.2,14.4,0,10.4,0C5,0,0.7,12.6,0.7,18z M18.3,22.8
+  c0,3.1,2.2,5.6,4.9,6.3V32h3.2v-2.9c2.7-0.7,4.9-3.2,4.9-6.3c0-3.6-2.9-12.9-6.5-12.9S18.3,19.2,18.3,22.8z"/>
+</svg>
+
new file mode 100644
--- /dev/null
+++ b/browser/base/content/usercontext-vacation.svg
@@ -0,0 +1,20 @@
+<!-- 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="32" height="32" viewBox="0 0 32 32">
+  <path fill="context-fill" d="M3.6,27l-2.5-1.8L0.8,25c-0.7-0.4-0.7-1.2-0.4-2c0.4-0.5,1.1-0.7,1.6-0.5l3.6,1.2c0-0.4,0.2-0.9,0.4-1.4
+  c0.2-0.7,0.5-1.6,1.1-2.3c0.2-0.4,0.5-0.7,0.7-1.2c0.2-0.4,0.5-0.9,0.9-1.2c0.4-0.9,1.1-1.6,1.8-2.5c0.7-0.9,1.4-1.6,2.3-2.5
+  c0.4-0.4,0.9-0.7,1.2-1.2c0.4-0.2,0.9-0.7,1.2-1.1c0.2-0.2,0.2-0.2,0.4-0.4L3.1,7.3c-0.2,0-0.2,0-0.4,0l-2,0.9
+  C0.2,8.3-0.3,7.6,0.2,7.1l2-2C2.4,5,2.4,5,2.5,5h17.9c0.5-0.5,1.2-1.1,1.8-1.6c0.7-0.7,1.4-1.2,2.1-1.8c0.4-0.4,0.7-0.5,1.1-0.7
+  c0.4-0.2,0.7-0.4,1.1-0.5c0.5,0,0.9-0.2,1.2-0.2s0.7,0,1.1,0s0.7,0,1.1,0c0.4,0,0.5,0,0.7,0.2c0.5,0,0.7,0.2,0.7,0.2
+  c0.2,0,0.2,0.2,0.4,0.4c0,0,0,0.4,0.2,0.7c0,0.2,0,0.5,0.2,0.7c0,0.4,0,0.7,0,1.1s0,0.7,0,1.1c0,0.4,0,0.9-0.2,1.2
+  c-0.2,0.4-0.4,0.7-0.5,1.1c-0.2,0.4-0.5,0.7-0.7,1.1c-0.5,0.7-1.1,1.4-1.8,2.1c-0.4,0.4-0.7,0.7-1.1,1.1v17.8c0,0.2,0,0.4-0.2,0.4
+  l-2,2c-0.5,0.5-1.2,0-1.1-0.5l0.7-2c0-0.2,0-0.2,0-0.4L22.8,16c-0.4,0.4-0.7,0.7-0.9,0.9c-0.4,0.4-0.7,0.9-1.2,1.2
+  c-0.4,0.4-0.7,0.9-1.2,1.2c-0.7,0.9-1.6,1.6-2.5,2.3c-0.9,0.7-1.6,1.4-2.5,2c-0.4,0.4-0.9,0.5-1.2,0.9c-0.4,0.2-0.7,0.5-1.2,0.7
+  c-0.7,0.4-1.6,0.7-2.3,1.1c-0.4,0.2-0.7,0.2-1.2,0.4L9.6,30c0.4,0.7,0,1.4-0.7,1.8c-0.5,0.2-1.2,0-1.6-0.5l-0.2-0.4l-1.8-2.3
+  c-0.2,0-0.2,0-0.4,0.2c-0.4,0-0.5,0.2-0.7,0.2s-0.2,0-0.4,0c-0.2,0-0.2,0-0.4,0c-0.2,0-0.4,0-0.5,0c-0.2,0-0.2,0-0.2,0s0,0,0-0.2
+  c0-0.2,0-0.2,0-0.5c0-0.2,0-0.2,0-0.4c0-0.2,0-0.2,0-0.4C3.4,27.5,3.4,27.3,3.6,27L3.6,27z M5.7,28.4L5.7,28.4L5.7,28.4L5.7,28.4z"
+  />
+</svg>
+
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
@@ -138,16 +138,23 @@ browser.jar:
         content/browser/tabbrowser.xml                (content/tabbrowser.xml)
 *       content/browser/urlbarBindings.xml            (content/urlbarBindings.xml)
         content/browser/utilityOverlay.js             (content/utilityOverlay.js)
         content/browser/usercontext-briefcase.svg     (content/usercontext-briefcase.svg)
         content/browser/usercontext-cart.svg          (content/usercontext-cart.svg)
         content/browser/usercontext-circle.svg        (content/usercontext-circle.svg)
         content/browser/usercontext-dollar.svg        (content/usercontext-dollar.svg)
         content/browser/usercontext-fingerprint.svg   (content/usercontext-fingerprint.svg)
+        content/browser/usercontext-gift.svg          (content/usercontext-gift.svg)
+        content/browser/usercontext-vacation.svg      (content/usercontext-vacation.svg)
+        content/browser/usercontext-food.svg          (content/usercontext-food.svg)
+        content/browser/usercontext-fruit.svg         (content/usercontext-fruit.svg)
+        content/browser/usercontext-pet.svg           (content/usercontext-pet.svg)
+        content/browser/usercontext-tree.svg          (content/usercontext-tree.svg)
+        content/browser/usercontext-chill.svg         (content/usercontext-chill.svg)
         content/browser/web-panels.js                 (content/web-panels.js)
 *       content/browser/web-panels.xul                (content/web-panels.xul)
         content/browser/webext-panels.js              (content/webext-panels.js)
 *       content/browser/webext-panels.xul             (content/webext-panels.xul)
 *       content/browser/baseMenuOverlay.xul           (content/baseMenuOverlay.xul)
         content/browser/nsContextMenu.js              (content/nsContextMenu.js)
 # XXX: We should exclude this one as well (bug 71895)
 *       content/browser/hiddenWindow.xul              (content/hiddenWindow.xul)
--- a/browser/components/contextualidentity/content/usercontext.css
+++ b/browser/components/contextualidentity/content/usercontext.css
@@ -1,46 +1,46 @@
 [data-identity-color="blue"] {
-  --identity-tab-color: #0996f8;
-  --identity-icon-color: #00a7e0;
+  --identity-tab-color: #37adff;
+  --identity-icon-color: #37adff;
 }
 
 [data-identity-color="turquoise"] {
-  --identity-tab-color: #01bdad;
-  --identity-icon-color: #01bdad;
+  --identity-tab-color: #00c79a;
+  --identity-icon-color: #00c79a;
 }
 
 [data-identity-color="green"] {
-  --identity-tab-color: #57bd35;
-  --identity-icon-color:  #7dc14c;
+  --identity-tab-color: #51cd00;
+  --identity-icon-color: #51cd00;
 }
 
 [data-identity-color="yellow"] {
   --identity-tab-color: #ffcb00;
   --identity-icon-color: #ffcb00;
 }
 
 [data-identity-color="orange"] {
-  --identity-tab-color: #ff9216;
-  --identity-icon-color: #ff9216;
+  --identity-tab-color: #ff9f00;
+  --identity-icon-color: #ff9f00;
 }
 
 [data-identity-color="red"] {
-  --identity-tab-color: #d92215;
-  --identity-icon-color: #d92215;
+  --identity-tab-color: #ff613d;
+  --identity-icon-color: #ff613d;
 }
 
 [data-identity-color="pink"] {
-  --identity-tab-color: #ea385e;
-  --identity-icon-color: #ee5195;
+  --identity-tab-color: #ff4bda;
+  --identity-icon-color: #ff4bda;
 }
 
 [data-identity-color="purple"] {
-  --identity-tab-color: #7a2f7a;
-  --identity-icon-color: #7a2f7a;
+  --identity-tab-color: #af51f5;
+  --identity-icon-color: #af51f5;
 }
 
 [data-identity-icon="fingerprint"] {
   --identity-icon: url("chrome://browser/content/usercontext-fingerprint.svg");
 }
 
 [data-identity-icon="briefcase"] {
   --identity-icon: url("chrome://browser/content/usercontext-briefcase.svg");
@@ -53,16 +53,44 @@
 [data-identity-icon="cart"] {
   --identity-icon: url("chrome://browser/content/usercontext-cart.svg");
 }
 
 [data-identity-icon="circle"] {
   --identity-icon: url("chrome://browser/content/usercontext-circle.svg");
 }
 
+[data-identity-icon="vacation"] {
+  --identity-icon: url("chrome://browser/content/usercontext-vacation.svg");
+}
+
+[data-identity-icon="gift"] {
+  --identity-icon: url("chrome://browser/content/usercontext-gift.svg");
+}
+
+[data-identity-icon="food"] {
+  --identity-icon: url("chrome://browser/content/usercontext-food.svg");
+}
+
+[data-identity-icon="fruit"] {
+  --identity-icon: url("chrome://browser/content/usercontext-fruit.svg");
+}
+
+[data-identity-icon="pet"] {
+  --identity-icon: url("chrome://browser/content/usercontext-pet.svg");
+}
+
+[data-identity-icon="tree"] {
+  --identity-icon: url("chrome://browser/content/usercontext-tree.svg");
+}
+
+[data-identity-icon="chill"] {
+  --identity-icon: url("chrome://browser/content/usercontext-chill.svg");
+}
+
 #userContext-indicator {
   height: 16px;
   width: 16px;
 }
 
 #userContext-label {
   margin-inline-end: 3px;
   color: var(--identity-tab-color);
--- a/browser/components/preferences/containers.js
+++ b/browser/components/preferences/containers.js
@@ -10,17 +10,24 @@ const containersBundle = Services.string
 const HTMLNS = "http://www.w3.org/1999/xhtml";
 
 let gContainersManager = {
   icons: [
     "fingerprint",
     "briefcase",
     "dollar",
     "cart",
-    "circle"
+    "circle",
+    "gift",
+    "vacation",
+    "food",
+    "fruit",
+    "pet",
+    "tree",
+    "chill"
   ],
 
   colors: [
     "blue",
     "turquoise",
     "green",
     "yellow",
     "orange",
--- a/browser/locales/en-US/chrome/browser/preferences-old/containers.properties
+++ b/browser/locales/en-US/chrome/browser/preferences-old/containers.properties
@@ -17,8 +17,15 @@ containers.purple.label = Purple
 containers.fingerprint.label = Fingerprint
 containers.briefcase.label = Briefcase
 # LOCALIZATION NOTE (containers.dollar.label)
 # String represents a money sign but currently uses a dollar sign so don't change to local currency
 # See Bug 1291672
 containers.dollar.label = Dollar sign
 containers.cart.label = Shopping cart
 containers.circle.label = Dot
+containers.vacation.label = Vacation
+containers.gift.label = Gift
+containers.food.label = Food
+containers.fruit.label = Fruit
+containers.pet.label = Pet
+containers.tree.label = Tree
+containers.chill.label = Chill
--- a/browser/locales/en-US/chrome/browser/preferences/containers.properties
+++ b/browser/locales/en-US/chrome/browser/preferences/containers.properties
@@ -17,8 +17,15 @@ containers.purple.label = Purple
 containers.fingerprint.label = Fingerprint
 containers.briefcase.label = Briefcase
 # LOCALIZATION NOTE (containers.dollar.label)
 # String represents a money sign but currently uses a dollar sign so don't change to local currency
 # See Bug 1291672
 containers.dollar.label = Dollar sign
 containers.cart.label = Shopping cart
 containers.circle.label = Dot
+containers.vacation.label = Vacation
+containers.gift.label = Gift
+containers.food.label = Food
+containers.fruit.label = Fruit
+containers.pet.label = Pet
+containers.tree.label = Tree
+containers.chill.label = Chill
--- a/browser/themes/shared/preferences/containers.css
+++ b/browser/themes/shared/preferences/containers.css
@@ -23,17 +23,17 @@
   -moz-user-select: none;
   outline: 2px solid transparent;
   outline-offset: 4px;
   -moz-outline-radius: 100%;
   min-block-size: 24px;
   min-inline-size: 24px;
   border-radius: 50%;
   padding: 2px;
-  margin: 10px;
+  margin: 9px;
 }
 
 .icon-buttons > radio > [data-identity-icon] {
   fill: #4d4d4d;
 }
 
 .radio-buttons > radio {
   padding-inline-start: 2px;