Bug 1517098 - Use a lock icon to show the connection security in content tab's URL field. r=mkmelin
authorRichard Marti <richard.marti@gmail.com>
Tue, 01 Jan 2019 12:54:12 +0100
changeset 34096 ea538ce655fb3edfcd919a70c15822fda774299c
parent 34095 feba8def888f16fd0a453a0bd979c13333da09fe
child 34097 aa9c13717f77c473dcbb7f10e6af6e5f6c51a2ff
push id389
push userclokep@gmail.com
push dateMon, 18 Mar 2019 19:01:53 +0000
reviewersmkmelin
bugs1517098
Bug 1517098 - Use a lock icon to show the connection security in content tab's URL field. r=mkmelin
chat/themes/browserRequest.css
chat/themes/icons/insecure.png
chat/themes/icons/secure.png
chat/themes/jar.mn
mail/themes/shared/jar.inc.mn
mail/themes/shared/mail/icons/connection-insecure.svg
mail/themes/shared/mail/icons/connection-mixed.svg
mail/themes/shared/mail/icons/connection-secure.svg
mail/themes/shared/mail/tabmail.css
--- a/chat/themes/browserRequest.css
+++ b/chat/themes/browserRequest.css
@@ -8,29 +8,21 @@
 }
 #security-button {
   width: 20px;
   padding: 0;
   margin: 0;
 }
 #security-button[level="high"],
 #security-button[level="low"] {
-%ifdef MOZ_THUNDERBIRD
   background-image: url("chrome://messenger/skin/icons/secure.png");
-%else
-  background-image: url("chrome://chat/skin/icons/secure.png");
-%endif
 }
 
 #security-button[level="broken"] {
-%ifdef MOZ_THUNDERBIRD
   background-image: url("chrome://messenger/skin/icons/insecure.png");
-%else
-  background-image: url("chrome://chat/skin/icons/insecure.png");
-%endif
 }
 
 #header {
   padding: 5px;
   border-bottom: 1px solid black;
 }
 
 #header label {
deleted file mode 100644
index 1960f1f10d3e252abfb759ef231f0651e75c7e46..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 3481bb370443322d50277fec1b38fc2a3069033d..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/chat/themes/jar.mn
+++ b/chat/themes/jar.mn
@@ -12,21 +12,17 @@ chat.jar:
 	skin/classic/chat/offline.png
 	skin/classic/chat/typing-16.png
 	skin/classic/chat/typed-16.png
 	skin/classic/chat/unknown.png
 	skin/classic/chat/unknown-16.png
 	skin/classic/chat/chat-16.png
 	skin/classic/chat/chat-left-16.png
 	skin/classic/chat/conv.css
-*	skin/classic/chat/browserRequest.css
+	skin/classic/chat/browserRequest.css
 	skin/classic/chat/imtooltip.css
 	skin/classic/chat/status.css
 	skin/classic/chat/prpl-generic/icon32.png	(icons/prpl-generic-32.png)
 	skin/classic/chat/prpl-generic/icon48.png	(icons/prpl-generic-48.png)
 	skin/classic/chat/prpl-generic/icon.png		(icons/prpl-generic.png)
 	skin/classic/chat/prpl-unknown/icon32.png	(icons/prpl-unknown-32.png)
 	skin/classic/chat/prpl-unknown/icon48.png	(icons/prpl-unknown-48.png)
 	skin/classic/chat/prpl-unknown/icon.png		(icons/prpl-unknown.png)
-#ifndef MOZ_THUNDERBIRD
-	skin/classic/chat/icons/secure.png		(icons/secure.png)
-	skin/classic/chat/icons/insecure.png		(icons/insecure.png)
-#endif
--- a/mail/themes/shared/jar.inc.mn
+++ b/mail/themes/shared/jar.inc.mn
@@ -26,16 +26,19 @@
   skin/classic/messenger/icons/blacklist.svg                  (../shared/mail/icons/blacklist.svg)
   skin/classic/messenger/icons/cert-error.svg                 (../shared/mail/icons/cert-error.svg)
   skin/classic/messenger/icons/chat.svg                       (../shared/mail/icons/chat.svg)
   skin/classic/messenger/icons/columnpicker.svg               (../shared/mail/icons/columnpicker.svg)
   skin/classic/messenger/icons/copy.svg                       (../shared/mail/icons/copy.svg)
   skin/classic/messenger/icons/cut.svg                        (../shared/mail/icons/cut.svg)
   skin/classic/messenger/icons/correspondents.svg             (../shared/mail/icons/correspondents.svg)
   skin/classic/messenger/icons/compact.svg                    (../shared/mail/icons/compact.svg)
+  skin/classic/messenger/icons/connection-insecure.svg        (../shared/mail/icons/connection-insecure.svg)
+  skin/classic/messenger/icons/connection-mixed.svg           (../shared/mail/icons/connection-mixed.svg)
+  skin/classic/messenger/icons/connection-secure.svg          (../shared/mail/icons/connection-secure.svg)
   skin/classic/messenger/icons/conversation.svg               (../shared/mail/icons/conversation.svg)
   skin/classic/messenger/icons/delete.svg                     (../shared/mail/icons/delete.svg)
   skin/classic/messenger/icons/file.svg                       (../shared/mail/icons/file.svg)
   skin/classic/messenger/icons/file-item.svg                  (../shared/mail/icons/file-item.svg)
   skin/classic/messenger/icons/filter.svg                     (../shared/mail/icons/filter.svg)
   skin/classic/messenger/icons/flag-col.svg                   (../shared/mail/icons/flag-col.svg)
   skin/classic/messenger/icons/forward.svg                    (../shared/mail/icons/forward.svg)
   skin/classic/messenger/icons/getmsg.svg                     (../shared/mail/icons/getmsg.svg)
new file mode 100644
--- /dev/null
+++ b/mail/themes/shared/mail/icons/connection-insecure.svg
@@ -0,0 +1,7 @@
+<!-- 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" viewBox="0 0 16 16">
+  <path d="M12.5 6.984h-.484L4 15h8.5a1.5 1.5 0 0 0 1.5-1.5V8.484a1.5 1.5 0 0 0-1.5-1.5zm-6.5 0V5a2 2 0 0 1 4 0v1l1.892-1.892A4 4 0 0 0 4 5v1.984h-.5a1.5 1.5 0 0 0-1.5 1.5V13.5a1.483 1.483 0 0 0 .07.43l6.946-6.946z" fill="context-fill"/>
+  <path d="M2 15a1 1 0 0 1-.707-1.707l12-12a1 1 0 0 1 1.414 1.414l-12 12A1 1 0 0 1 2 15z" fill="#ff0039"/>
+</svg>
new file mode 100644
--- /dev/null
+++ b/mail/themes/shared/mail/icons/connection-mixed.svg
@@ -0,0 +1,9 @@
+<!-- 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" viewBox="0 0 16 16">
+  <path d="M8 1a4 4 0 0 0-4 4v1.984h-.5a1.5 1.5 0 0 0-1.5 1.5V13.5A1.5 1.5 0 0 0 3.5 15h2.535a2.274 2.274 0 0 1 .207-1.318L9.43 7.27a2.266 2.266 0 0 1 .2-.286H6V5a2 2 0 0 1 4 0v1.568A2.255 2.255 0 0 1 11.478 6a2.283 2.283 0 0 1 .522.073V5a4 4 0 0 0-4-4z" fill="context-fill"/>
+  <path d="M15.818 14.127l-3.189-6.411a1.285 1.285 0 0 0-2.3 0l-3.192 6.411A1.294 1.294 0 0 0 8.289 16h6.377a1.294 1.294 0 0 0 1.152-1.873z" fill="#ffbf00"/>
+  <path d="M11.478 8a.272.272 0 0 1 .256.161l3.188 6.412a.291.291 0 0 1-.013.291.275.275 0 0 1-.243.137H8.289a.275.275 0 0 1-.243-.137.29.29 0 0 1-.013-.291l3.188-6.412A.272.272 0 0 1 11.478 8m0-1a1.272 1.272 0 0 0-1.152.716l-3.189 6.411A1.294 1.294 0 0 0 8.289 16h6.377a1.294 1.294 0 0 0 1.152-1.873l-3.189-6.411A1.272 1.272 0 0 0 11.478 7z" fill="#d76e00" opacity=".35"/>
+  <path d="M11.5 12a.5.5 0 0 0 .5-.5v-2a.5.5 0 0 0-1 0v2a.5.5 0 0 0 .5.5zm0 .809a.691.691 0 1 0 .691.691.691.691 0 0 0-.691-.691z" fill="#fff"/>
+</svg>
new file mode 100644
--- /dev/null
+++ b/mail/themes/shared/mail/icons/connection-secure.svg
@@ -0,0 +1,6 @@
+<!-- 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" viewBox="0 0 16 16">
+  <path fill="context-fill" 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/mail/themes/shared/mail/tabmail.css
+++ b/mail/themes/shared/mail/tabmail.css
@@ -350,34 +350,50 @@
 
 /* Content Tabs */
 .chromeTabInstance[collapsed="false"] .contentTabToolbox,
 .contentTabInstance[collapsed="false"] .contentTabToolbox {
   display: none;
 }
 
 .contentTabSecurity {
-  height: 20px;
-  width: 20px;
+  height: 16px;
+  width: 16px;
+  margin: 2px;
   margin-inline-end: 5px;
   background-repeat: no-repeat;
 }
 
-.contentTabSecurity[level="high"],
+.contentTabSecurity[level="high"] {
+  background-image: url("chrome://messenger/skin/icons/connection-secure.svg");
+  -moz-context-properties: fill;
+  fill: #12bc00;
+}
+
 .contentTabSecurity[level="low"] {
-  background-image: url("chrome://messenger/skin/icons/secure.png");
+  background-image: url("chrome://messenger/skin/icons/connection-mixed.svg");
+  -moz-context-properties: fill;
+  fill: currentColor;
 }
 
 .contentTabSecurity[level="broken"] {
-  background-image: url("chrome://messenger/skin/icons/insecure.png");
+  background-image: url("chrome://messenger/skin/icons/connection-insecure.svg");
+  -moz-context-properties: fill;
+  fill: currentColor;
 }
 
 .contentTabSecurity[loading="true"] {
   background-image: url("chrome://global/skin/icons/loading.png");
-  background-position: 4px 2px;
+}
+
+@media (min-resolution: 1.1ddpx) {
+  #security-button[loading="true"] {
+    background-image: url("chrome://global/skin/icons/loading@2x.png");
+    background-size: 16px;
+  }
 }
 
 .contentTabAddress * {
   -moz-user-select: text;
 }
 
 .contentTabUrlbar {
   margin: 0;