From f87eaa556919418caaaa9d267a12ee83c27d1619 Mon Sep 17 00:00:00 2001 From: overdodactyl Date: Sat, 17 Feb 2018 14:15:04 -0700 Subject: [PATCH] update userChrome_windows with latest fixes --- alternative_user_files/userChrome_windows.css | 256 ++++++++++-------- .../windows_fixes/context_menus.css | 200 ++++++++------ userChrome-files/windows_fixes/library.css | 39 +-- userChrome-files/windows_fixes/page_info.css | 55 ++-- 4 files changed, 315 insertions(+), 235 deletions(-) diff --git a/alternative_user_files/userChrome_windows.css b/alternative_user_files/userChrome_windows.css index 8196bde..cabf374 100644 --- a/alternative_user_files/userChrome_windows.css +++ b/alternative_user_files/userChrome_windows.css @@ -1124,141 +1124,181 @@ menupopup menuseparator { padding: 0px !important; } -/* Bookmarks Toolbar, Toolbar Context menu, spacing tweaks */ - -#personal-bookmarks menupopup .bookmark-item, -#bookmarksMenuPopup, -menupopup#toolbar-context-menu, -menupopup#menu_ToolsPopup, -menupopup#goPopup, -menupopup#tabContextMenu { - padding-left: 4px !important; - padding-right: 4px !important; -} - -/* Tab menu */ - -menupopup > menu > menupopup > .popup-internal-box, -menupopup#toolbar-context-menu > menuitem { - padding-left: 1px !important; - padding-right: 1px !important; -} - -/* All menus padding tweaks */ - -menupopup, -menupopup > menu > menupopup, -#bookmarksMenuPopup menupopup > hbox { - padding: 4px 0px 4px 0px !important; -} - -#bookmarksMenuPopup menupopup { - padding: 0px 0px 0px 0px !important; -} +/* Bookmark Toolbar, fix border */ #BMB_bookmarksPopup menupopup { padding: 4px 0px 0px 0px !important; } -/* Context menu, spacing and font size similar to macOS */ - -menupopup menuitem, -menupopup menu { - font-size: 1.167em !important; - padding-top: 1px !important; - padding-bottom: 1px !important; -} - -menupopup menu menuitem, -menupopup menu menu { - font-size: 1em !important; - padding-top: 1px !important; - padding-bottom: 1px !important; -} - -menupopup#contentAreaContextMenu menuitem, -menupopup#contentAreaContextMenu menu { - padding-top: 2px !important; - padding-bottom: 2px !important; -} - -/* Menus, slightly adjust arrow */ - -menupopup .menu-right { - margin-right: 0px !important; -} - -/* Menus, slightly increase separator margin */ - -menupopup menuseparator { - margin: 2px !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, -#bookmarksMenuPopup menupopup[placespopup="true"] > hbox, menupopup#BMB_bookmarksPopup > menu > menupopup > hbox, -menupopup#bookmarksMenuPopup > 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 > menu > menupopup { +menupopup#tabContextMenu menupopup, +toolbaritem#menubar-items menupopup { border-color: var(--primary-dark-color) !important; border-width: 1px !important; border-style: solid !important; } -#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; + +/* 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; } -#security-identity-groupbox, -#security-privacy-groupbox, -#security-technical-groupbox { - -moz-appearance: none !important; - background-color: var(--dark-accent) !important; -} -#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; +/* 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; } -#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; +/* Context menus, TOP/BOTTOM padding fixes */ + +menupopup, +menupopup > menu > menupopup { + padding: 4px 0px 4px 0px !important; } -#security-identity-groupbox, -#security-privacy-groupbox, -#security-technical-groupbox { - -moz-appearance: none !important; - background-color: var(--dark-accent) !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; +} +@-moz-document url(chrome://browser/content/places/places.xul), +url(chrome://browser/content/places/bookmarkProperties.xul) { + #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; + } +} +@-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; + } + + #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; + } } \ No newline at end of file diff --git a/userChrome-files/windows_fixes/context_menus.css b/userChrome-files/windows_fixes/context_menus.css index c0b6972..db482bc 100644 --- a/userChrome-files/windows_fixes/context_menus.css +++ b/userChrome-files/windows_fixes/context_menus.css @@ -1,96 +1,128 @@ -/* Remove white separators between menu items */ -menupopup menuseparator { - -moz-appearance:none !important; - background: rgba(0, 0, 0, 0) !important; - border: 0px !important; -} + /* 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; -} + /* Removes white bar between icons and menu items */ + #context-navigation, #context-sep-navigation { + padding: 0px !important; + } -/* Bookmarks Toolbar, Toolbar Context menu, spacing tweaks */ -#personal-bookmarks menupopup .bookmark-item, -#bookmarksMenuPopup, -menupopup#toolbar-context-menu, -menupopup#menu_ToolsPopup, -menupopup#goPopup, -menupopup#tabContextMenu { - padding-left: 4px !important; - padding-right: 4px !important; -} + /* Bookmark Toolbar, fix border */ + #BMB_bookmarksPopup menupopup { + padding: 4px 0px 0px 0px !important; + } -/* Tab menu */ -menupopup > menu > menupopup > .popup-internal-box, -menupopup#toolbar-context-menu > menuitem { - padding-left: 1px !important; - padding-right: 1px !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; + } -/* All menus padding tweaks */ -menupopup, -menupopup > menu > menupopup, -#bookmarksMenuPopup menupopup > hbox { - padding: 4px 0px 4px 0px !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; + } -#bookmarksMenuPopup menupopup { - padding: 0px 0px 0px 0px !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; + } -#BMB_bookmarksPopup menupopup { - padding: 4px 0px 0px 0px !important; -} + /* Context menus, TOP/BOTTOM padding fixes */ + menupopup, + menupopup > menu > menupopup { + padding: 4px 0px 4px 0px !important; + } -/* Context menu, spacing and font size similar to macOS */ -menupopup menuitem, -menupopup menu { - font-size: 1.167em !important; - padding-top: 1px !important; - padding-bottom: 1px !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 menu menuitem, -menupopup menu menu { - font-size: 1em !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; + } -menupopup#contentAreaContextMenu menuitem, -menupopup#contentAreaContextMenu menu { - padding-top: 2px !important; - padding-bottom: 2px !important; -} + /* Menu Bar menus, text size to match macOS */ + toolbaritem#menubar-items menupopup > menuitem, + toolbaritem#menubar-items menupopup > menu { + font-size: 1.167em !important; + } -/* Menus, slightly adjust arrow */ -menupopup .menu-right { - margin-right: 0px !important; -} + toolbaritem#menubar-items menupopup menupopup > menuitem, + toolbaritem#menubar-items menupopup menupopup > menu { + font-size: 1em !important; + } -/* Menus, slightly increase separator margin */ -menupopup menuseparator { - margin: 2px !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 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, -#bookmarksMenuPopup menupopup[placespopup="true"] > hbox, -menupopup#BMB_bookmarksPopup > menu > menupopup > hbox, -menupopup#bookmarksMenuPopup > menu > menupopup > hbox, -menupopup#contentAreaContextMenu, -menupopup#placesContext, -menupopup#bookmarksMenuPopup, -menupopup#PlacesChevronPopup, -menupopup#toolbar-context-menu, -menupopup#downloadsContextMenu, -menupopup#tabContextMenu, -menupopup > menu > menupopup { - border-color: var(--primary-dark-color) !important; - border-width: 1px !important; - border-style: solid !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; + } diff --git a/userChrome-files/windows_fixes/library.css b/userChrome-files/windows_fixes/library.css index 546c366..95c5ae3 100644 --- a/userChrome-files/windows_fixes/library.css +++ b/userChrome-files/windows_fixes/library.css @@ -1,19 +1,24 @@ -#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; -} +@-moz-document url(chrome://browser/content/places/places.xul), +url(chrome://browser/content/places/bookmarkProperties.xul) { + + #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; + } -#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/page_info.css b/userChrome-files/windows_fixes/page_info.css index fb71c5e..52624c0 100644 --- a/userChrome-files/windows_fixes/page_info.css +++ b/userChrome-files/windows_fixes/page_info.css @@ -1,28 +1,31 @@ -#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-document url(chrome://browser/content/pageinfo/pageInfo.xul) { -#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; -} + #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; + } -#security-identity-groupbox, -#security-privacy-groupbox, -#security-technical-groupbox { - -moz-appearance: none !important; - background-color: var(--dark-accent) !important; -} + #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; + } + }