third part of syncing LCARStrek with Firefox 55 browser windows theme changes

diff --git a/LCARStrek/browser/aboutSyncTabs.css b/LCARStrek/browser/aboutSyncTabs.css
deleted file mode 100644 (file)
index 015f517..0000000
--- a/LCARStrek/browser/aboutSyncTabs.css
+++ /dev/null
@@ -1,86 +0,0 @@
-#tabsList {
-  background: #000000;
-  width: 100%;
-}
-
-#headers {
-  background: url("chrome://communicator/skin/sync/sync-32.png") no-repeat;
-  margin-top: 4px;
-  width: 45em;
-  height: 32px;
-  margin-inline-start: 2em;
-  margin-inline-end: 2em;
-}
-
-#headers:-moz-locale-dir(rtl) {
-  background-position-x: 100%;
-}
-
-#tabsListHeading {
-  font-size: 140%;
-  font-weight: bold;
-  margin-inline-start: 40px;
-}
-
-richlistitem {
-  margin-inline-end: 2em;
-}
-
-richlistitem[selected="true"],
-richlistitem:focus {
-  outline-style: none;
-}
-
-richlistitem[type="tab"] {
-  min-height: 3em;
-  border: #9C9CFF 1px solid !important;
-  padding: 2px 5px;
-  margin-bottom: 4px;
-  margin-inline-start: 4em;
-  border-radius: 6px;
-  background-color: #402800;
-  width: 44em;
-  opacity: 0.9;
-}
-
-richlistitem[type="tab"][selected="true"] {
-  background-color: #008484;
-}
-
-richlistitem[type="client"] {
-  min-height: 2em;
-  color: #FF9F00;
-  margin-inline-start: 2em;
-  margin-top: 2px;
-  margin-bottom: 3px;
-  width: 42em;
-  border-radius: 6px;
-  background-color: transparent;
-  -moz-user-focus: ignore !important;
-}
-richlistitem.mobile[type="client"] {
-  list-style-image: url("chrome://browser/skin/sync-mobileIcon.svg#icon");
-}
-richlistitem.desktop[type="client"] {
-  list-style-image: url("chrome://browser/skin/sync-desktopIcon.svg#icon");
-}
-
-.title,
-.clientName {
-  font-size: 1.1em;
-}
-
-.title[selected="true"],
-.url[selected="true"] {
-  color: inherit;
-}
-
-.url {
-  color: #3333FF;
-  font-size: 0.95em;
-}
-
-.tabIcon {
-  padding-inline-start: 2px;
-  padding-top: 2px;
-}

diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css
index 376fa833168c8aed199d3ad2392f3116aa7077b4..d475b64647ddbbc134b6d2e632942253074bc294 100644 (file)
--- a/LCARStrek/browser/browser.css
+++ b/LCARStrek/browser/browser.css
@@ -1873,12 +1873,19 @@ html|*.urlbar-input:-moz-lwtheme::placeholder,
 
 /* === BEGIN urlbarSearchSuggestionsNotification.inc.css === */
 
-#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] {
+#PopupAutoCompleteRichResult > deck[anonid="search-suggestions-notification"] {
   border-bottom: 1px solid var(--panel-separator-color);
-  background-color: #000000;
+  padding-inline-start: 0;
+  padding-inline-end: 6px;
+  min-height: 3em;
+}
+
+/* Opt-in notification */
+
+#PopupAutoCompleteRichResult > deck[anonid="search-suggestions-notification"] > hbox[anonid="search-suggestions-opt-in"] {
   padding: 6px 0;
   padding-inline-start: 44px;
-  padding-inline-end: 6px;
+  background-color: #000000;
   background-image: url("chrome://browser/skin/info.svg");
   background-clip: padding-box;
   background-position: 20px center;
@@ -1886,20 +1893,20 @@ html|*.urlbar-input:-moz-lwtheme::placeholder,
   background-size: 16px 16px;
 }
 
-#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"]:-moz-locale-dir(rtl) {
+#PopupAutoCompleteRichResult > deck[anonid="search-suggestions-notification"] > hbox[anonid="search-suggestions-notification"]:-moz-locale-dir(rtl) {
   background-position: right 20px center;
 }
 
-#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > description {
+#PopupAutoCompleteRichResult > deck[anonid="search-suggestions-notification"] > hbox[anonid="search-suggestions-notification"] > description {
   margin: 0;
   padding: 0;
 }
 
-#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > description > label.text-link {
+#PopupAutoCompleteRichResult > deck[anonid="search-suggestions-notification"] > hbox[anonid="search-suggestions-notification"] > description > label.text-link {
   margin-inline-start: 0;
 }
 
-#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button {
+#PopupAutoCompleteRichResult > deck[anonid="search-suggestions-notification"] button {
   -moz-appearance: none;
   min-width: 80px;
   border-radius: 3px;
@@ -1908,16 +1915,121 @@ html|*.urlbar-input:-moz-lwtheme::placeholder,
   margin-inline-start: 10px;
 }
 
-#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button[anonid="search-suggestions-notification-disable"] {
+#PopupAutoCompleteRichResult > deck[anonid="search-suggestions-notification"] button[anonid="search-suggestions-notification-disable"] {
+}
+
+#PopupAutoCompleteRichResult > deck[anonid="search-suggestions-notification"] button[anonid="search-suggestions-notification-disable"]:hover {
+}
+
+#PopupAutoCompleteRichResult > deck[anonid="search-suggestions-notification"] button[anonid="search-suggestions-notification-enable"] {
+}
+
+#PopupAutoCompleteRichResult > deck[anonid="search-suggestions-notification"] button[anonid="search-suggestions-notification-enable"]:hover {
+}
+
+/* Opt-out hint */
+
+#PopupAutoCompleteRichResult > deck[anonid="search-suggestions-notification"] > hbox[anonid="search-suggestions-opt-out"] {
+  font: message-box;
+}
+
+#PopupAutoCompleteRichResult > deck[anonid="search-suggestions-notification"] hbox[anonid="search-suggestions-hint-box"] > description {
+  margin: auto;
+  padding: 4px 8px;
+  background-color: #000000;
+  border: 1px solid #FFCF00;
+  border-radius: 4px;
+  color: #A09090;
+}
+
+#PopupAutoCompleteRichResult > deck[anonid="search-suggestions-notification"] hbox[anonid="search-suggestions-hint-box"] > description > html|span {
+  unicode-bidi: embed;
+}
+
+#PopupAutoCompleteRichResult > deck[anonid="search-suggestions-notification"] hbox[anonid="search-suggestions-hint-box"] > description > html|span.prefix {
+  font-weight: bold;
+}
+
+#PopupAutoCompleteRichResult > deck[anonid="search-suggestions-notification"][animate] > hbox[anonid="search-suggestions-opt-out"] > .ac-site-icon {
+  transform: scale(0);
+  animation-name: search-suggestions-hint-grow;
+  animation-duration: 500ms;
+  animation-delay: 500ms;
+  animation-iteration-count: 1;
+  animation-timing-function: ease-in-out;
+  animation-fill-mode: forwards;
+}
+
+@keyframes search-suggestions-hint-grow {
+  0%   { transform: scale(0); }
+  40%  { transform: scale(1.5); }
+  60%  { transform: scale(1); }
+  80%  { transform: scale(1.25); }
+  100% { transform: scale(1); }
+}
+
+#PopupAutoCompleteRichResult > deck[anonid="search-suggestions-notification"][animate] hbox[anonid="search-suggestions-hint-typing"] > .ac-title-text {
+  text-overflow: clip;
+}
+
+#PopupAutoCompleteRichResult > deck[anonid="search-suggestions-notification"][animate] hbox[anonid="search-suggestions-hint-typing"] {
+  overflow: hidden;
+  max-width: 8ch;
+  width: 0;
+  animation-name: search-suggestions-hint-typing;
+  animation-duration: 500ms;
+  animation-delay: 750ms;
+  animation-iteration-count: 1;
+  animation-fill-mode: forwards;
+}
+
+@keyframes search-suggestions-hint-typing {
+  from { width: 0; }
+  to   { width: 8ch; }
+}
+
+#PopupAutoCompleteRichResult > deck[anonid="search-suggestions-notification"][animate] hbox[anonid="search-suggestions-hint-box"] {
+  opacity: 0;
+  animation-duration: 250ms;
+  animation-delay: 1500ms;
+  animation-iteration-count: 1;
+  animation-fill-mode: forwards;
 }
 
-#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button[anonid="search-suggestions-notification-disable"]:hover {
+/* Margin-inline-start can't be animated yet */
+#PopupAutoCompleteRichResult > deck[anonid="search-suggestions-notification"][animate] hbox[anonid="search-suggestions-hint-box"]:-moz-locale-dir(ltr) {
+  margin-left: 160px;
+  animation-name: search-suggestions-hint-buildin-ltr;
 }
 
-#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button[anonid="search-suggestions-notification-enable"] {
+@keyframes search-suggestions-hint-buildin-ltr {
+  from  { margin-left: 160px; opacity: 0; }
+  to    { margin-left: 0; opacity: 1; }
+}
+
+#PopupAutoCompleteRichResult > deck[anonid="search-suggestions-notification"][animate] hbox[anonid="search-suggestions-hint-box"]:-moz-locale-dir(rtl) {
+  /* Should be margin-inline-start but that can't be animated yet */
+  margin-right: 160px;
+  animation-name: search-suggestions-hint-buildin-rtl;
+}
+
+@keyframes search-suggestions-hint-buildin-rtl {
+  from  { margin-right: 160px; opacity: 0; }
+  to    { margin-right: 0; opacity: 1; }
+}
+
+#search-suggestions-change-settings {
+  opacity: 0;
+  animation-name: search-suggestions-hint-fadein;
+  animation-duration: 500ms;
+  animation-delay: 1800ms;
+  animation-iteration-count: 1;
+  animation-fill-mode: forwards;
 }
 
-#PopupAutoCompleteRichResult > hbox[anonid="search-suggestions-notification"] > button[anonid="search-suggestions-notification-enable"]:hover {
+@keyframes search-suggestions-hint-fadein {
+  from  { opacity: 0 }
+  to    { opacity: 1 }
 }
 
 /* === END urlbarSearchSuggestionsNotification.inc.css === */
@@ -1974,62 +2086,6 @@ html|*.urlbar-input:-moz-lwtheme::placeholder,
 /* page proxy icon */
 /* === BEGIN identity-block.inc.css === */
 
-/* === BEGIN identity-block/icons.inc.css === */
-
-#identity-icon {
-  list-style-image: url(chrome://browser/skin/identity-icon.svg#normal);
-}
-
-#identity-box:hover > #identity-icon:not(.no-hover),
-#identity-box[open=true] > #identity-icon {
-  list-style-image: url(chrome://browser/skin/identity-icon.svg#hover);
-}
-
-#identity-box.grantedPermissions > #identity-icon {
-  list-style-image: url(chrome://browser/skin/identity-icon.svg#notice);
-}
-
-#identity-box.grantedPermissions:hover > #identity-icon:not(.no-hover),
-#identity-box.grantedPermissions[open=true] > #identity-icon {
-  list-style-image: url(chrome://browser/skin/identity-icon.svg#notice-hover);
-}
-
-#urlbar[pageproxystate="valid"] > #identity-box.chromeUI > #identity-icon {
-  list-style-image: url(chrome://branding/content/identity-icons-brand.svg);
-}
-
-#tracking-protection-icon {
-  list-style-image: url(chrome://browser/skin/tracking-protection-16.svg#enabled);
-}
-
-#tracking-protection-icon[state="loaded-tracking-content"] {
-  list-style-image: url(chrome://browser/skin/tracking-protection-16.svg#disabled);
-}
-
-
-#urlbar[pageproxystate="valid"] > #identity-box.verifiedDomain > #connection-icon,
-#urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity > #connection-icon,
-#urlbar[pageproxystate="valid"] > #identity-box.mixedActiveBlocked > #connection-icon {
-  list-style-image: url(chrome://browser/skin/connection-secure.svg);
-  visibility: visible;
-}
-
-#urlbar[pageproxystate="valid"] > #identity-box.weakCipher > #connection-icon,
-#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContent > #connection-icon,
-#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContentLoadedActiveBlocked > #connection-icon,
-#urlbar[pageproxystate="valid"] > #identity-box.certUserOverridden > #connection-icon {
-  list-style-image: url(chrome://browser/skin/connection-mixed-passive-loaded.svg#icon);
-  visibility: visible;
-}
-
-#urlbar[pageproxystate="valid"] > #identity-box.insecureLoginForms > #connection-icon,
-#urlbar[pageproxystate="valid"] > #identity-box.mixedActiveContent > #connection-icon {
-  list-style-image: url(chrome://browser/skin/connection-mixed-active-loaded.svg#icon);
-  visibility: visible;
-}
-
-/* === END identity-block/icons.inc.css === */
-
 #identity-box {
   font-size: .9em;
   border-radius: 2px;
@@ -2098,11 +2154,47 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-but
   padding-inline-start: 2.01px;
 }
 
+#identity-icon,
+#tracking-protection-icon,
+#connection-icon,
+#extension-icon {
+  width: 16px;
+  height: 16px;
+  -moz-context-properties: fill;
+  fill: #A09090;
+}
+
+#identity-icon:-moz-lwtheme,
+#tracking-protection-icon:-moz-lwtheme,
+#connection-icon:-moz-lwtheme,
+#extension-icon:-moz-lwtheme {
+/*  fill: rgba(0,0,0,.6);*/
+}
+
 /* MAIN IDENTITY ICON */
 
 #identity-icon {
   width: 16px;
   height: 16px;
+  list-style-image: url(chrome://browser/skin/identity-icon.svg#normal);
+}
+
+#identity-box:hover > #identity-icon:not(.no-hover),
+#identity-box[open=true] > #identity-icon {
+  list-style-image: url(chrome://browser/skin/identity-icon.svg#hover);
+}
+
+#identity-box.grantedPermissions > #identity-icon {
+  list-style-image: url(chrome://browser/skin/identity-icon.svg#notice);
+}
+
+#identity-box.grantedPermissions:hover > #identity-icon:not(.no-hover),
+#identity-box.grantedPermissions[open=true] > #identity-icon {
+  list-style-image: url(chrome://browser/skin/identity-icon.svg#notice-hover);
+}
+
+#urlbar[pageproxystate="valid"] > #identity-box.chromeUI > #identity-icon {
+  list-style-image: url(chrome://branding/content/identity-icons-brand.svg);
 }
 
 #urlbar[pageproxystate="invalid"] > #identity-box > #identity-icon {
@@ -2110,20 +2202,11 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-but
 }
 
 #urlbar[actiontype="searchengine"] > #identity-box > #identity-icon {
-  -moz-image-region: inherit;
   list-style-image: url(chrome://global/skin/icons/autocomplete-search.svg);
-  context-properties: fill;
-  fill: #FFCF00;
-  width: 16px;
-  width: 16px;
-  height: 16px;
 }
 
 #urlbar[actiontype="extension"] > #identity-box > #identity-icon {
-  -moz-image-region: inherit;
   list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg);
-  width: 16px;
-  height: 16px;
 }
 
 /* SHARING ICON */
@@ -2172,12 +2255,15 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-but
 /* TRACKING PROTECTION ICON */
 
 #tracking-protection-icon {
-  width: 16px;
-  height: 16px;
+  list-style-image: url(chrome://browser/skin/tracking-protection-16.svg#enabled);
   margin-inline-start: 2px;
   margin-inline-end: 0;
 }
 
+#tracking-protection-icon[state="loaded-tracking-content"] {
+  list-style-image: url(chrome://browser/skin/tracking-protection-16.svg#disabled);
+}
+
 #tracking-protection-icon[animate] {
   transition: margin-left 200ms ease-out, margin-right 200ms ease-out;
 }
@@ -2190,19 +2276,47 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-but
   transition: none;
 }
 
+#urlbar[pageproxystate="invalid"] > #identity-box > #extension-icon,
 #urlbar[pageproxystate="invalid"] > #identity-box > #tracking-protection-icon {
   visibility: collapse;
 }
 
-/* CONNECTION ICON */
+/* CONNECTION ICON, EXTENSION ICON */
 
-#connection-icon {
+#connection-icon,
+#extension-icon {
   width: 16px;
   height: 16px;
   margin-inline-start: 2px;
   visibility: collapse;
 }
 
+#urlbar[pageproxystate="valid"] > #identity-box.verifiedDomain > #connection-icon,
+#urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity > #connection-icon,
+#urlbar[pageproxystate="valid"] > #identity-box.mixedActiveBlocked > #connection-icon {
+  list-style-image: url(chrome://browser/skin/connection-secure.svg);
+  visibility: visible;
+}
+
+#urlbar[pageproxystate="valid"] > #identity-box.weakCipher > #connection-icon,
+#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContent > #connection-icon,
+#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContentLoadedActiveBlocked > #connection-icon,
+#urlbar[pageproxystate="valid"] > #identity-box.certUserOverridden > #connection-icon {
+  list-style-image: url(chrome://browser/skin/connection-mixed-passive-loaded.svg#icon);
+  visibility: visible;
+}
+
+#urlbar[pageproxystate="valid"] > #identity-box.insecureLoginForms > #connection-icon,
+#urlbar[pageproxystate="valid"] > #identity-box.mixedActiveContent > #connection-icon {
+  list-style-image: url(chrome://browser/skin/connection-mixed-active-loaded.svg#icon);
+  visibility: visible;
+}
+
+#identity-box.extensionPage > #extension-icon {
+  list-style-image: url(chrome://browser/skin/controlcenter/extension.svg);
+  visibility: visible;
+}
+
 /* REMOTE CONTROL ICON */
 
 #main-window[remotecontrol] #remote-control-icon {

diff --git a/LCARStrek/browser/connection-mixed-active-loaded.svg b/LCARStrek/browser/connection-mixed-active-loaded.svg
index 1a2bd06597132c6466723af89629d5154b3fb1de..44969446fa5dbc2acd508ec491148def53aa5177 100644 (file)
--- a/LCARStrek/browser/connection-mixed-active-loaded.svg
+++ b/LCARStrek/browser/connection-mixed-active-loaded.svg
@@ -4,28 +4,6 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
      width="16" height="16" viewBox="0 0 16 16">
-<style>
-.fieldtext {
-  fill: #A09090;
-}
-
-.highlighttext {
-  fill: #FFCF00;
-}
-
-.black {
-  fill: #FFCF00;
-}
-
-.white {
-  fill: #FFCF00;
-}
-</style>
-  <style>
-    svg > g:not(:target) {
-      display: none;
-    }
-  </style>
 
   <defs>
     <rect id="shape-lock-clasp-outer" x="4" y="2" width="8" height="10" rx="4" ry="4" />
@@ -53,18 +31,6 @@
     <line id="strike-through-red" x1="2" y1="14.1" x2="14" y2="2.5" stroke="#FF0000" stroke-width="1.8"/>
   </defs>
 
-  <g id="icon">
-    <use xlink:href="#lock" class="fieldtext"/>
-    <use xlink:href="#strike-through-red"/>
-  </g>
-
-  <g id="icon-black">
-    <use xlink:href="#lock" class="black"/>
-    <use xlink:href="#strike-through-red"/>
-  </g>
-
-  <g id="icon-white">
-    <use xlink:href="#lock" class="white"/>
-    <use xlink:href="#strike-through-red"/>
-  </g>
+  <use fill="context-fill" xlink:href="#lock"/>
+  <use xlink:href="#strike-through-red"/>
 </svg>

diff --git a/LCARStrek/browser/connection-mixed-passive-loaded.svg b/LCARStrek/browser/connection-mixed-passive-loaded.svg
index 0a0465d5b8805283bd35f4d2bd35c68cc8951d3c..46bb4a7dc32c97d8c3f1232280886e36101dad05 100644 (file)
--- a/LCARStrek/browser/connection-mixed-passive-loaded.svg
+++ b/LCARStrek/browser/connection-mixed-passive-loaded.svg
@@ -4,28 +4,6 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
      width="16" height="16" viewBox="0 0 16 16">
-<style>
-.fieldtext {
-  fill: #A09090;
-}
-
-.highlighttext {
-  fill: #FFCF00;
-}
-
-.black {
-  fill: #FFCF00;
-}
-
-.white {
-  fill: #FFCF00;
-}
-</style>
-  <style>
-    svg > g:not(:target) {
-      display: none;
-    }
-  </style>
 
   <defs>
     <rect id="shape-lock-clasp-outer" x="2" y="1" width="8" height="10" rx="4" ry="4" />
@@ -51,18 +29,6 @@
     </g>
    </defs>
 
-  <g id="icon">
-    <rect width="16" height="16" mask="url(#mask-lock)" class="fieldtext"/>
-    <use xlink:href="#warning-triangle"/>
-  </g>
-
-  <g id="icon-black">
-    <rect width="16" height="16" mask="url(#mask-lock)" class="black"/>
-    <use xlink:href="#warning-triangle"/>
-  </g>
-
-  <g id="icon-white">
-    <rect width="16" height="16" mask="url(#mask-lock)" class="white"/>
-    <use xlink:href="#warning-triangle"/>
-  </g>
+  <rect fill="context-fill" width="16" height="16" mask="url(#mask-lock)"/>
+  <use xlink:href="#warning-triangle"/>
 </svg>

diff --git a/LCARStrek/browser/controlcenter/extension.svg b/LCARStrek/browser/controlcenter/extension.svg
new file mode 100644 (file)
index 0000000..5f15210
--- /dev/null
+++ b/LCARStrek/browser/controlcenter/extension.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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" xmlns:xlink="http://www.w3.org/1999/xlink"
+     width="64" height="64" viewBox="0 0 64 64">
+  <path fill="context-fill" d="M42,62c2.2,0,4-1.8,4-4l0-14.2c0,0,0.4-3.7,2.8-3.7c2.4,0,2.2,3.9,6.7,3.9c2.3,0,6.2-1.2,6.2-8.2 c0-7-3.9-7.9-6.2-7.9c-4.5,0-4.3,3.7-6.7,3.7c-2.4,0-2.8-3.8-2.8-3.8V22c0-2.2-1.8-4-4-4H31.5c0,0-3.4-0.6-3.4-3 c0-2.4,3.8-2.6,3.8-7.1c0-2.3-1.3-5.9-8.3-5.9s-8,3.6-8,5.9c0,4.5,3.4,4.7,3.4,7.1c0,2.4-3.4,3-3.4,3H6c-2.2,0-4,1.8-4,4l0,7.8 c0,0-0.4,6,4.4,6c3.1,0,3.2-4.1,7.3-4.1c2,0,4,1.9,4,6c0,4.2-2,6.3-4,6.3c-4,0-4.2-4.1-7.3-4.1c-4.8,0-4.4,5.8-4.4,5.8L2,58 c0,2.2,1.8,4,4,4H19c0,0,6.3,0.4,6.3-4.4c0-3.1-4-3.6-4-7.7c0-2,2.2-4.5,6.4-4.5c4.2,0,6.6,2.5,6.6,4.5c0,4-3.9,4.6-3.9,7.7 c0,4.9,6.3,4.4,6.3,4.4H42z"/>
+</svg>

diff --git a/LCARStrek/browser/controlcenter/panel.css b/LCARStrek/browser/controlcenter/panel.css
index 09be6f363d3d54df1dff4c4271135fec490c02ce..67f1b454a3e087972bb262c1a2f1dbbe2e2989f6 100644 (file)
--- a/LCARStrek/browser/controlcenter/panel.css
+++ b/LCARStrek/browser/controlcenter/panel.css
@@ -16,6 +16,7 @@
 #identity-popup[connection=secure] [when-connection~=secure],
 #identity-popup[connection=chrome] [when-connection~=chrome],
 #identity-popup[connection=file] [when-connection~=file],
+#identity-popup[connection=extension] [when-connection~=extension],
 /* Show insecure login forms messages when needed. */
 #identity-popup[loginforms=insecure] [when-loginforms=insecure],
 /* Show weak cipher messages when needed. */
@@ -254,7 +255,9 @@
 
 #identity-popup[connection=secure-cert-user-overridden] #identity-popup-securityView,
 #identity-popup[connection=secure-cert-user-overridden] #identity-popup-security-content {
-  background-image: url(chrome://browser/skin/connection-mixed-passive-loaded.svg#icon);
+  background-image: url(chrome://browser/skin/connection-mixed-passive-loaded.svg);
+  -moz-context-properties: fill;
+  fill: #A09090;
 }
 
 #identity-popup[loginforms=insecure] #identity-popup-securityView,
@@ -264,6 +267,13 @@
   background-image: url(chrome://browser/skin/controlcenter/mcb-disabled.svg);
 }
 
+#identity-popup[connection=extension] #identity-popup-securityView,
+#identity-popup[connection=extension] #identity-popup-security-content {
+  background-image: url(chrome://browser/skin/controlcenter/extension.svg);
+  -moz-context-properties: fill;
+  fill: #008484;
+}
+
 #identity-popup-security-descriptions > description {
   margin-top: 6px;
   color: #A09090;

diff --git a/LCARStrek/browser/identity-icon.svg b/LCARStrek/browser/identity-icon.svg
index 27220e503f56c36b699777897140b7a638183919..b1f964d042069bc0f447df33f82652c61a8164e2 100755 (executable)
--- a/LCARStrek/browser/identity-icon.svg
+++ b/LCARStrek/browser/identity-icon.svg
@@ -3,32 +3,11 @@
    - 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" xmlns:xlink="http://www.w3.org/1999/xlink"
-     class="fieldtext"
      width="16" height="16" viewBox="0 0 16 16">
-<style>
-.fieldtext {
-  fill: #A09090;
-}
-
-.highlighttext {
-  fill: #FFCF00;
-}
-
-.black {
-  fill: #FFCF00;
-}
-
-.white {
-  fill: #FFCF00;
-}
-</style>
   <style>
     use:not(:target) {
       display: none;
     }
-    use {
-      fill-rule: evenodd;
-    }
   </style>
 
   <defs>
@@ -38,18 +17,8 @@
     <path id="glyph-notice-hover" d="M107.5,202a2.5,2.5,0,1,1,2.5-2.5A2.5,2.5,0,0,1,107.5,202Zm0,1.039a3.5,3.5,0,0,0,1.125-.2,7.124,7.124,0,1,1-4.464-4.464,3.5,3.5,0,0,0-.2,1.125A3.54,3.54,0,0,0,107.5,203.039ZM102,201a1,1,0,1,0,1,1A1,1,0,0,0,102,201Zm1,4a1,1,0,0,0-2,0v3a1,1,0,0,0,2,0v-3Z" transform="translate(-94 -197)"/>
   </defs>
 
-  <use id="normal" xlink:href="#glyph-normal"/>
-  <use id="hover" xlink:href="#glyph-hover"/>
-  <use id="notice" xlink:href="#glyph-notice"/>
-  <use id="notice-hover" xlink:href="#glyph-notice-hover"/>
-
-  <use class="black" id="normal-black" xlink:href="#glyph-normal"/>
-  <use class="black" id="hover-black" xlink:href="#glyph-hover"/>
-  <use class="black" id="notice-black" xlink:href="#glyph-notice"/>
-  <use class="black" id="notice-hover-black" xlink:href="#glyph-notice-hover"/>
-
-  <use class="white" id="normal-white" xlink:href="#glyph-normal"/>
-  <use class="white" id="hover-white" xlink:href="#glyph-hover"/>
-  <use class="white" id="notice-white" xlink:href="#glyph-notice"/>
-  <use class="white" id="notice-hover-white" xlink:href="#glyph-notice-hover"/>
+  <use fill="context-fill" fill-rule="evenodd" id="normal" xlink:href="#glyph-normal"/>
+  <use fill="context-fill" fill-rule="evenodd" id="hover" xlink:href="#glyph-hover"/>
+  <use fill="context-fill" fill-rule="evenodd" id="notice" xlink:href="#glyph-notice"/>
+  <use fill="context-fill" fill-rule="evenodd" id="notice-hover" xlink:href="#glyph-notice-hover"/>
 </svg>

diff --git a/LCARStrek/browser/sync-16.png b/LCARStrek/browser/sync-16.png
deleted file mode 100644 (file)
index dc6924a..0000000
Binary files a/LCARStrek/browser/sync-16.png and /dev/null differ

diff --git a/LCARStrek/browser/sync-32.png b/LCARStrek/browser/sync-32.png
deleted file mode 100644 (file)
index 1d774a4..0000000
Binary files a/LCARStrek/browser/sync-32.png and /dev/null differ

diff --git a/LCARStrek/browser/tracking-protection-16.svg b/LCARStrek/browser/tracking-protection-16.svg
index 0ee0c95b158172cb249f9a398f2340594377558f..c4c92fd58553c59de0fdebf0f6ac0f6ac2c81fb5 100755 (executable)
--- a/LCARStrek/browser/tracking-protection-16.svg
+++ b/LCARStrek/browser/tracking-protection-16.svg
@@ -4,23 +4,6 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
      width="16" height="16" viewBox="0 0 16 16">
-<style>
-.fieldtext {
-  fill: #A09090;
-}
-
-.highlighttext {
-  fill: #FFCF00;
-}
-
-.black {
-  fill: #FFCF00;
-}
-
-.white {
-  fill: #FFCF00;
-}
-</style>
   <style>
     g:not(:target) {
       display: none;
@@ -51,25 +34,10 @@
   </defs>
 
   <g id="enabled">
-    <use class="fieldtext" xlink:href="#shape-shield-outer" mask="url(#mask-shield-cutout)"/>
-  </g>
-  <g id="enabled-black">
-    <use class="black" xlink:href="#shape-shield-outer" mask="url(#mask-shield-cutout)"/>
-  </g>
-  <g id="enabled-white">
-    <use class="white" xlink:href="#shape-shield-outer" mask="url(#mask-shield-cutout)"/>
+    <use fill="context-fill" xlink:href="#shape-shield-outer" mask="url(#mask-shield-cutout)"/>
   </g>
 
   <g id="disabled">
-    <use class="fieldtext" xlink:href="#shape-shield-outer" mask="url(#mask-shield-cutout-disabled)"/>
-    <use xlink:href="#strike-through-red"/>
-  </g>
-  <g id="disabled-black">
-    <use class="black" xlink:href="#shape-shield-outer" mask="url(#mask-shield-cutout-disabled)"/>
-    <use xlink:href="#strike-through-red"/>
-  </g>
-  <g id="disabled-white">
-    <use class="white" xlink:href="#shape-shield-outer" mask="url(#mask-shield-cutout-disabled)"/>
-    <use xlink:href="#strike-through-red"/>
+    <use fill="context-fill" xlink:href="#shape-shield-outer" mask="url(#mask-shield-cutout-disabled)"/>
   </g>
 </svg>