From 0cad3f183e0833ecbcacc3c36d79ca47f2133ea3 Mon Sep 17 00:00:00 2001
From: overdodactyl <pjohns33@protonmail.com>
Date: Fri, 23 Feb 2018 18:20:16 -0700
Subject: [PATCH] update Windows-specific fixes

---
 userChrome-files/library.css                  |  28 ++-
 .../windows_fixes/context_menus.css           | 227 ++++++++----------
 userChrome-files/windows_fixes/page_info.css  |  37 ++-
 3 files changed, 143 insertions(+), 149 deletions(-)

diff --git a/userChrome-files/library.css b/userChrome-files/library.css
index dccdda4..79265b1 100644
--- a/userChrome-files/library.css
+++ b/userChrome-files/library.css
@@ -83,4 +83,30 @@
   tree {
     background-color: var(--in-content-box-background)!important
   }
-}
\ No newline at end of file
+  @media screen and (-moz-windows-theme),
+  screen and (-moz-windows-classic),
+  screen and (-moz-windows-default-theme),
+  screen and (-moz-os-version:windows-win7),
+  screen and (-moz-os-version:windows-win8),
+  screen and (-moz-os-version:windows-win10) {
+    #metaTagsCaption,
+    #security-identity,
+    #security-privacy,
+    #security-technical,
+    #security-identity-groupbox,
+    #security-privacy-groupbox,
+    #security-technical-groupbox {
+      -moz-appearance: none !important;
+      background-color: var(--primary-dark-color) !important;
+      border: none !important;
+      color: var(--grey-10) !important;
+    }
+
+    #security-identity-groupbox,
+    #security-privacy-groupbox,
+    #security-technical-groupbox {
+      -moz-appearance: none !important;
+      background-color: var(--dark-accent) !important;
+    }
+  }
+}
diff --git a/userChrome-files/windows_fixes/context_menus.css b/userChrome-files/windows_fixes/context_menus.css
index db482bc..37e129c 100644
--- a/userChrome-files/windows_fixes/context_menus.css
+++ b/userChrome-files/windows_fixes/context_menus.css
@@ -1,128 +1,99 @@
- /* Remove white separators between menu items */
- menupopup menuseparator {
-   -moz-appearance:none !important;
-   background: rgba(0, 0, 0, 0) !important;
-   border: 0px !important;
- }
-
- /* Removes white bar between icons and menu items */
- #context-navigation, #context-sep-navigation {
-   padding: 0px !important;
- }
-
- /* Bookmark Toolbar, fix border */
- #BMB_bookmarksPopup menupopup {
-   padding: 4px 0px 0px 0px  !important;
- }
-
- /* Context menus, border added because Windows has a different drop shadow effect than macOS */
- #personal-bookmarks menupopup,
- .panel-arrowcontent,
- .box-inherit scrollbox-innerbox,
- #BMB_bookmarksPopup menupopup[placespopup="true"] > hbox,
- menupopup#BMB_bookmarksPopup > menu > menupopup > hbox,
- menupopup#bookmarksMenuPopup > menu > menupopup,
- menupopup#bookmarksMenuPopup menupopup[placespopup="true"],
- menupopup#contentAreaContextMenu,
- menupopup#contentAreaContextMenu menupopup,
- menupopup#placesContext,
- menupopup#bookmarksMenuPopup,
- menupopup#PlacesChevronPopup,
- menupopup#toolbar-context-menu,
- menupopup#downloadsContextMenu,
- menupopup#tabContextMenu,
- menupopup#tabContextMenu menupopup,
- toolbaritem#menubar-items menupopup {
-   border-color: var(--primary-dark-color) !important;
-   border-width: 1px !important;
-   border-style: solid !important;
- }
-
- /* Bookmarks Toolbar, Toolbar Context menu, LEFT/RIGHT padding fixes */
- #personal-bookmarks menupopup .bookmark-item,
- #bookmarksMenuPopup,
- menupopup#goPopup {
-   padding-left: 4px !important;
-   padding-right: 4px !important;
- }
-
- /* Tab menu, LEFT/RIGHT padding fixes */
- menupopup#tabContextMenu > menu > menupopup > .popup-internal-box,
- menupopup#toolbar-context-menu,
- menupopup#contentAreaContextMenu menupopup {
-   padding-left: 2px !important;
-   padding-right: 2px !important;
- }
-
- /* Context menus, TOP/BOTTOM padding fixes */
- menupopup,
- menupopup > menu > menupopup {
-   padding: 4px 0px 4px 0px  !important;
- }
-
- /* Menus, text size to match macOS */
- menupopup#contentAreaContextMenu > menuitem,
- menupopup#contentAreaContextMenu > menu,
- #PlacesToolbar menupopup > menuitem,
- #PlacesToolbar menupopup > menu,
- menupopup#tabContextMenu > menuitem,
- menupopup#tabContextMenu > menu,
- menupopup#tabContextMenu menupopup > menuitem,
- menupopup#tabContextMenu menupopup > menu,
- menupopup#toolbar-context-menu > menuitem ,
- menupopup#placesContext menuitem {
-   font-size: 1.167em !important;
-   padding-top: 1px !important;
-   padding-bottom: 1px !important;
- }
-
- menupopup#contentAreaContextMenu menupopup > menuitem,
- menupopup#contentAreaContextMenu menupopup > menu,
- #PlacesToolbar menupopup menupopup > menuitem,
- #PlacesToolbar menupopup menupopup > menu,
- menupopup#tabContextMenu menupopup > menuitem,
- menupopup#tabContextMenu menupopup > menu,
- menupopup.textbox-contextmenu > menuitem {
-   font-size: 1em !important;
- }
-
- /* Menu Bar menus, text size to match macOS */
- toolbaritem#menubar-items menupopup > menuitem,
- toolbaritem#menubar-items menupopup > menu {
-   font-size: 1.167em !important;
- }
-
- toolbaritem#menubar-items menupopup menupopup > menuitem,
- toolbaritem#menubar-items menupopup menupopup > menu {
-   font-size: 1em !important;
- }
-
- /* Toolbar menu, LEFT/RIGHT padding fixes */
- #customization-toolbar-menu,
- toolbaritem#menubar-items menupopup,
- toolbaritem#menubar-items menupopup > menu > menupopup {
-   padding-left: 2px !important;
-   padding-right: 2px !important;
- }
-
- /* Context menu, TOP/BOTTOM padding fixes */
- #personal-bookmarks menupopup menuitem {
-   padding-top: 1px !important;
-   padding-bottom: 1px !important;
- }
-
- menupopup#contentAreaContextMenu menuitem,
- menupopup#contentAreaContextMenu menu {
-   padding-top: 1px !important;
-   padding-bottom: 1px !important;
- }
-
- menupopup#contentAreaContextMenu > .menuitem-iconic {
-   padding-top: 0px !important;
-   padding-bottom: 0px !important;
- }
-
- /* Menus, slightly adjust arrow */
- menupopup .menu-right {
-   margin-right: 0px !important;
- }
+menupopup menuseparator {
+  -moz-appearance: none!important;
+  background: rgba(0,0,0,0)!important;
+  border: 0!important
+}
+#context-navigation,
+#context-sep-navigation {
+  padding: 0!important
+}
+#BMB_bookmarksPopup menupopup {
+  padding: 4px 0 0!important
+}
+#BMB_bookmarksPopup menupopup[placespopup=true] > hbox,
+#personal-bookmarks menupopup,
+.box-inherit scrollbox-innerbox,
+.panel-arrowcontent,
+menupopup#BMB_bookmarksPopup > menu > menupopup > hbox,
+menupopup#PlacesChevronPopup,
+menupopup#bookmarksMenuPopup,
+menupopup#bookmarksMenuPopup > menu > menupopup,
+menupopup#bookmarksMenuPopup menupopup[placespopup=true],
+menupopup#contentAreaContextMenu,
+menupopup#contentAreaContextMenu menupopup,
+menupopup#downloadsContextMenu,
+menupopup#placesContext,
+menupopup#tabContextMenu,
+menupopup#tabContextMenu menupopup,
+menupopup#toolbar-context-menu,
+toolbaritem#menubar-items menupopup {
+  border-color: var(--in-content-page-color)!important;
+  border-width: 1px!important;
+  border-style: solid!important
+}
+#bookmarksMenuPopup,
+#personal-bookmarks menupopup .bookmark-item,
+menupopup#goPopup {
+  padding-left: 4px!important;
+  padding-right: 4px!important
+}
+menupopup#contentAreaContextMenu menupopup,
+menupopup#tabContextMenu > menu > menupopup > .popup-internal-box,
+menupopup#toolbar-context-menu {
+  padding-left: 2px!important;
+  padding-right: 2px!important
+}
+menupopup,
+menupopup > menu > menupopup {
+  padding: 4px 0!important
+}
+#PlacesToolbar menupopup > menu,
+#PlacesToolbar menupopup > menuitem,
+menupopup#contentAreaContextMenu > menu,
+menupopup#contentAreaContextMenu > menuitem,
+menupopup#placesContext menuitem,
+menupopup#tabContextMenu > menu,
+menupopup#tabContextMenu > menuitem,
+menupopup#tabContextMenu menupopup > menu,
+menupopup#tabContextMenu menupopup > menuitem,
+menupopup#toolbar-context-menu > menuitem {
+  font-size: 1.167em!important;
+  padding-top: 1px!important;
+  padding-bottom: 1px!important
+}
+#PlacesToolbar menupopup menupopup > menu,
+#PlacesToolbar menupopup menupopup > menuitem,
+menupopup#contentAreaContextMenu menupopup > menu,
+menupopup#contentAreaContextMenu menupopup > menuitem,
+menupopup#tabContextMenu menupopup > menu,
+menupopup#tabContextMenu menupopup > menuitem,
+menupopup.textbox-contextmenu > menuitem {
+  font-size: 1em!important
+}
+toolbaritem#menubar-items menupopup > menu,
+toolbaritem#menubar-items menupopup > menuitem {
+  font-size: 1.167em!important
+}
+toolbaritem#menubar-items menupopup menupopup > menu,
+toolbaritem#menubar-items menupopup menupopup > menuitem {
+  font-size: 1em!important
+}
+#customization-toolbar-menu,
+toolbaritem#menubar-items menupopup,
+toolbaritem#menubar-items menupopup > menu > menupopup {
+  padding-left: 2px!important;
+  padding-right: 2px!important
+}
+#personal-bookmarks menupopup menuitem,
+menupopup#contentAreaContextMenu menu,
+menupopup#contentAreaContextMenu menuitem {
+  padding-top: 1px!important;
+  padding-bottom: 1px!important
+}
+menupopup#contentAreaContextMenu > .menuitem-iconic {
+  padding-top: 0!important;
+  padding-bottom: 0!important
+}
+menupopup .menu-right {
+  margin-right: 0!important
+}
diff --git a/userChrome-files/windows_fixes/page_info.css b/userChrome-files/windows_fixes/page_info.css
index 52624c0..3dc295c 100644
--- a/userChrome-files/windows_fixes/page_info.css
+++ b/userChrome-files/windows_fixes/page_info.css
@@ -1,31 +1,28 @@
 @-moz-document url(chrome://browser/content/pageinfo/pageInfo.xul) {
-
   #topBar {
-    -moz-appearance: none !important;
-    background-color: var(--dark-accent) !important;
-    border: none !important;
-    padding-top: 5px !important;
-    padding-bottom: 5px !important;
-    color: var(--grey-20) !important;
+    -moz-appearance: none!important;
+    background-color: var(--in-content-category-header-background)!important;
+    border: none!important;
+    padding-top: 5px!important;
+    padding-bottom: 5px!important;
+    color: var(--selected-icon-fill-color)!important
   }
-
   #metaTagsCaption,
   #security-identity,
+  #security-identity-groupbox,
   #security-privacy,
+  #security-privacy-groupbox,
   #security-technical,
+  #security-technical-groupbox {
+    -moz-appearance: none!important;
+    background-color: var(--in-content-page-color)!important;
+    border: none!important;
+    color: var(--in-content-selected-text)!important
+  }
   #security-identity-groupbox,
   #security-privacy-groupbox,
   #security-technical-groupbox {
-    -moz-appearance: none !important;
-    background-color: var(--primary-dark-color) !important;
-    border: none !important;
-    color: var(--grey-10) !important;
-  }
-
-  #security-identity-groupbox,
-  #security-privacy-groupbox,
-  #security-technical-groupbox {
-    -moz-appearance: none !important;
-    background-color: var(--dark-accent) !important;
-  }
+    -moz-appearance: none!important;
+    background-color: var(--in-content-category-header-background)!important
   }
+}