From 868b4137623e5709a07f354b7d72f67de57c9558 Mon Sep 17 00:00:00 2001
From: Robert Kaiser <kairo@kairo.at>
Date: Sun, 11 Dec 2016 23:21:46 +0100
Subject: [PATCH] second (small) part of syncing LCARStrek with Firefox 51
 browser windows theme changes

---
 LCARStrek/browser/browser.css                | 99 +++-----------------
 LCARStrek/browser/content-contextmenu.svg    | 18 ++++
 LCARStrek/browser/controlcenter/panel.css    |  3 +
 LCARStrek/browser/customizableui/panelUI.css |  2 +-
 LCARStrek/devtools/common.css                |  2 +-
 5 files changed, 38 insertions(+), 86 deletions(-)
 create mode 100644 LCARStrek/browser/content-contextmenu.svg

diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css
index f71eacfa..33783c01 100644
--- a/LCARStrek/browser/browser.css
+++ b/LCARStrek/browser/browser.css
@@ -5871,99 +5871,36 @@ menugroup > .menuitem-iconic[disabled="true"] > .menu-iconic-left {
   -moz-appearance: none;
 }
 
-#context-back > .menu-iconic-left {
-  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#back"); */
-  list-style-image: url("chrome://browser/skin/ToolbarFx.png");
-  -moz-image-region: rect(0, 54px, 18px, 36px);
-}
-
-#context-back:not([disabled="true"]):hover > .menu-iconic-left {
-  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#back-active"); */
-  -moz-image-region: rect(18px, 54px, 36px, 36px);
-}
-
-#context-back[disabled="true"] > .menu-iconic-left {
-  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#back-disabled"); */
-  -moz-image-region: rect(36px, 54px, 54px, 36px);
-}
-
-#context-forward > .menu-iconic-left {
-  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#forward"); */
-  list-style-image: url("chrome://browser/skin/ToolbarFx.png");
-  -moz-image-region: rect(0, 72px, 18px, 54px);
+#context-navigation > .menuitem-iconic > .menu-iconic-left > .menu-iconic-icon {
+  width: 16px;
+  height: 16px;
+  margin: 7px;
+  filter: url(chrome://browser/skin/filters.svg#fill);
+  fill: currentColor;
 }
 
-#context-forward:not([disabled="true"]):hover > .menu-iconic-left {
-  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#forward-active"); */
-  -moz-image-region: rect(18px, 72px, 36px, 54px);
+#context-back {
+  list-style-image: url("chrome://browser/skin/content-contextmenu.svg#back");
 }
 
-#context-forward[disabled="true"] > .menu-iconic-left {
-  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#forward-disabled"); */
-  -moz-image-region: rect(36px, 72px, 54px, 54px);
+#context-forward {
+  list-style-image: url("chrome://browser/skin/content-contextmenu.svg#forward");
 }
 
 #context-reload > .menu-iconic-left {
-  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#reload"); */
-  list-style-image: url("chrome://browser/skin/reload-stop-goFx.png");
-  -moz-image-region: rect(0, 14px, 14px, 0);
-}
-
-#context-reload:not([disabled="true"]):hover > .menu-iconic-left {
-  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#reload-active"); */
-  -moz-image-region: rect(14px, 14px, 28px, 0);
-}
-
-#context-reload[disabled="true"] > .menu-iconic-left {
-  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#reload-disabled"); */
-  -moz-image-region: rect(28px, 14px, 42px, 0);
+  list-style-image: url("chrome://browser/skin/content-contextmenu.svg#reload");
 }
 
 #context-stop > .menu-iconic-left {
-  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#stop"); */
-  list-style-image: url("chrome://browser/skin/reload-stop-goFx.png");
-  -moz-image-region: rect(0, 28px, 14px, 14px);
+  list-style-image: url("chrome://browser/skin/content-contextmenu.svg#stop");
 }
 
-#context-stop:not([disabled="true"]):hover > .menu-iconic-left {
-  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#stop-active"); */
-  -moz-image-region: rect(14px, 28px, 28px, 14px);
-}
-
-#context-stop[disabled="true"] > .menu-iconic-left {
-  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#stop-disabled"); */
-  -moz-image-region: rect(28px, 28px, 42px, 14px);
-}
-
-#context-bookmarkpage > .menu-iconic-left {
-  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#bookmark"); */
-  list-style-image: url("chrome://browser/skin/ToolbarFx.png");
-  -moz-image-region: rect(0, 144px, 18px, 126px);
-}
-
-#context-bookmarkpage:not([disabled="true"]):hover > .menu-iconic-left {
-  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#bookmark-active"); */
-  -moz-image-region: rect(18px, 144px, 36px, 126px);
-}
-
-#context-bookmarkpage[disabled="true"] > .menu-iconic-left {
-  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#bookmark-disabled"); */
-  -moz-image-region: rect(36px, 144px, 54px, 126px);
+#context-bookmarkpage {
+  list-style-image: url("chrome://browser/skin/content-contextmenu.svg#bookmark");
 }
 
 #context-bookmarkpage[starred=true] {
-  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#bookmarked"); */
-  -moz-image-region: rect(0px, 162px, 18px, 144px);
-}
-
-#context-bookmarkpage[starred=true][_moz-menuactive=true] {
-  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#bookmarked-active"); */
-  -moz-image-region: rect(18px, 162px, 36px, 144px);
-}
-
-#context-bookmarkpage[starred=true][disabled=true] {
-  /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#bookmarked-disabled"); */
-  -moz-image-region: rect(36px, 162px, 54px, 144px);
+  list-style-image: url("chrome://browser/skin/content-contextmenu.svg#bookmarked");
 }
 
 #context-back:-moz-locale-dir(rtl),
@@ -5972,12 +5909,6 @@ menugroup > .menuitem-iconic[disabled="true"] > .menu-iconic-left {
   transform: scaleX(-1);
 }
 
-#context-navigation > .menuitem-iconic > .menu-iconic-left > .menu-iconic-icon {
-  width: 18px; /*16px;*/
-  height: 18px; /*16px;*/
-  margin: 7px;
-}
-
 #context-navigation > #context-reload > .menu-iconic-left > .menu-iconic-icon,
 #context-navigation > #context-stop > .menu-iconic-left > .menu-iconic-icon {
   width: 14px;
diff --git a/LCARStrek/browser/content-contextmenu.svg b/LCARStrek/browser/content-contextmenu.svg
new file mode 100644
index 00000000..9ab7beab
--- /dev/null
+++ b/LCARStrek/browser/content-contextmenu.svg
@@ -0,0 +1,18 @@
+<?xml version="1.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 xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+  <style>
+    path:not(:target),
+    polygon:not(:target) {
+      display: none;
+    }
+  </style>
+  <path id="back" fill-rule="evenodd" d="m 11,4 0,2 4,0 0,4 -4,0 0,2 5,0 0,-8 -5,0 z M 8,0 0,8 8,16 8,12 10,12 6,8 10,4 8,4 8,0 Z"/>
+  <path id="forward" fill-rule="evenodd" d="m 5,4 0,2 -4,0 0,4 4,0 0,2 -5,0 0,-8 5,0 z m 3,-4 8,8 -8,8 0,-4 -2,0 4,-4 -4,-4 2,0 0,-4 z"/>
+  <path id="reload" fill-rule="evenodd" d="M 10 1 L 8 3 L 13 8 L 15 6 L 10 1 z M 5 2 L 5 11 L 14 11 L 12 9 L 7 9 L 7 4 L 5 2 z M 4 7 L 1 10 L 6 15 L 9 12 L 4 12 L 4 7 z"/>
+  <path id="stop" points="M 2 2 L 2 14 L 14 14 L 14 2 L 2 2 z M 4 4 L 12 4 L 12 12 L 4 12 L 4 4 z M 5 5 L 5 11 L 11 11 L 11 5 L 5 5 z"/>
+  <path id="bookmark" d="M8.008,3.632l0.986,2.012l0.452,0.922l1.014,0.169l2.326,0.389l-1.719,1.799l-0.676,0.708l0.145,0.967 L10.896,13l-1.959-1.039l-0.937-0.497l-0.937,0.497l-1.957,1.038L5.468,10.6l0.146-0.968L4.937,8.924L3.219,7.126l2.351-0.39 l1.023-0.17l0.45-0.934L8.008,3.632 M8,0C7.72,0,7.44,0.217,7.228,0.65L5.242,4.766L0.907,5.485c-0.958,0.159-1.195,0.861-0.53,1.56 l3.113,3.258l-0.69,4.583c-0.105,0.689,0.172,1.092,0.658,1.092c0.185,0,0.399-0.058,0.635-0.181l3.906-2.072l3.906,2.072 c0.236,0.123,0.45,0.181,0.635,0.181c0.486,0,0.762-0.403,0.659-1.092l-0.687-4.583l3.109-3.255c0.666-0.702,0.428-1.404-0.53-1.564 l-4.303-0.719L8.772,0.65C8.56,0.217,8.28,0,8,0L8,0z"/>
+  <path id="bookmarked" d="M8,0C7.719,0,7.438,0.217,7.225,0.651L5.233,4.773l-4.35,0.72c-0.961,0.159-1.199,0.862-0.531,1.562 l3.124,3.262l-0.692,4.589C2.679,15.596,2.957,16,3.444,16c0.185,0,0.401-0.058,0.637-0.181L8,13.744l3.919,2.075 C12.156,15.942,12.372,16,12.557,16c0.487,0,0.764-0.404,0.661-1.094l-0.69-4.589l3.12-3.259c0.668-0.703,0.43-1.406-0.532-1.566 l-4.317-0.72L8.775,0.651C8.562,0.217,8.281,0,8,0L8,0z"/>
+</svg>
diff --git a/LCARStrek/browser/controlcenter/panel.css b/LCARStrek/browser/controlcenter/panel.css
index a52a1e28..7f06234e 100644
--- a/LCARStrek/browser/controlcenter/panel.css
+++ b/LCARStrek/browser/controlcenter/panel.css
@@ -162,6 +162,8 @@
 
 /* CONTENT */
 
+.identity-popup-permission-label,
+.identity-popup-permission-state-label,
 #identity-popup-security-content > description,
 #identity-popup-security-descriptions > description,
 #identity-popup-securityView-header > description,
@@ -383,6 +385,7 @@ description#identity-popup-content-verifier,
 }
 
 .identity-popup-permission-state-label {
+  margin-inline-end: 5px;
   text-align: end;
   opacity: 0.6;
 }
diff --git a/LCARStrek/browser/customizableui/panelUI.css b/LCARStrek/browser/customizableui/panelUI.css
index b7cb52ff..8e851365 100644
--- a/LCARStrek/browser/customizableui/panelUI.css
+++ b/LCARStrek/browser/customizableui/panelUI.css
@@ -1610,7 +1610,7 @@ menuitem[checked="true"].subviewbutton > .menu-iconic-left {
 /* === END panelUI.inc.css === */
 
 .panel-subviews {
-  background-color: #000000;
+  background-color: var(--panel-arrowcontent-background);
 }
 
 #PanelUI-contents #zoom-out-btn {
diff --git a/LCARStrek/devtools/common.css b/LCARStrek/devtools/common.css
index c11ffd4e..5d04977c 100644
--- a/LCARStrek/devtools/common.css
+++ b/LCARStrek/devtools/common.css
@@ -80,7 +80,7 @@ notification {
 
 /* Rest of the dark and light theme */
 
-.devtools-autocomplete-popup,
+.tooltip-panel.devtools-autocomplete-popup,
 .CodeMirror-hints,
 .CodeMirror-Tern-tooltip {
   border: 1px solid #FF9F00;
-- 
2.35.3