From d13fbbf46e6bffeca940a9cf7e733fab09669a13 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Mon, 29 Nov 2021 09:20:41 +0900 Subject: [PATCH 01/25] Add: Library - Content's icon #236 --- userContent.css | 134 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 134 insertions(+) diff --git a/userContent.css b/userContent.css index 7a4241d..c879bc7 100644 --- a/userContent.css +++ b/userContent.css @@ -1262,7 +1262,141 @@ /*= chrome://browser/content/places/places.xhtml =============================*/ @-moz-document url("chrome://browser/content/places/places.xhtml") { + /** Library - Icons Replace *************************************************/ + /*= Standard Folder - More Visible =========================================*/ + /* on Toolbar and Menus */ + :-moz-any(#PlacesToolbar, #BMB_bookmarksPopup, #bookmarksMenu) .bookmark-item[container="true"]:not([query="true"], [tagContainer], [dayContainer]), + /* in Sidebar, Library, Add/Edit Bookmark dialog */ + /* https://github.com/rillian/firefox/blob/1f88437d263f56bdede4f20f69ba9c7b62f57001/layout/style/nsCSSAnonBoxList.h#L85-L98 */ + /* Need to overide!!, can not use :not() */ + :-moz-any(#bookmarks-view, #historyTree, #editBMPanel_folderTree, #placesList, #placeContent) treechildren::-moz-tree-image(title, container), + #editBMPanel_folderMenuList:not([selectedGuid="toolbar_____"], [selectedGuid="menu________"]), + #editBMPanel_folderMenuList .folder-icon:not([id]), + /* Download Popup */ + .downloadIconShow > .button-box > .button-icon { + list-style-image: url("./icons/folder.svg") !important; + } + + /* Standard Folder - Open */ + :-moz-any(#PlacesToolbar, #BMB_bookmarksPopup, #bookmarksMenu) + .bookmark-item[container="true"]:not([query="true"], [tagContainer], [dayContainer])[open="true"], + :-moz-any(#bookmarks-view, #historyTree, #editBMPanel_folderTree, #placesList, #placeContent) + treechildren::-moz-tree-image(title, container, open) { + list-style-image: url("./icons/folder-open.svg") !important; + } + + /*= Other Folder - Inbox Icon ==============================================*/ + /* on Menus */ + #PlacesToolbar #OtherBookmarks, + #BMB_bookmarksPopup #BMB_unsortedBookmarks, + #bookmarksMenuPopup #menu_unsortedBookmarks, + /* Other Bookmarks -- in Sidebar, Library, Add/Edit Bookmark dialog */ + :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) treechildren::-moz-tree-image(container, OrganizerQuery_UnfiledBookmarks), + :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) treechildren::-moz-tree-image(container, queryFolder_unfiled_____), + #editBMPanel_unfiledRootItem, + #editBMPanel_folderMenuList[selectedGuid="unfiled_____"] { + list-style-image: url("./icons/mail-inbox-all.svg") !important; + } + + /* Other Folder - Open */ + #PlacesToolbar #OtherBookmarks[open="true"], + #BMB_bookmarksPopup #BMB_unsortedBookmarks[open="true"], + #bookmarksMenuPopup #menu_unsortedBookmarks[open="true"], + :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) + treechildren::-moz-tree-image(container, open, OrganizerQuery_UnfiledBookmarks), + :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) + treechildren::-moz-tree-image(container, open, queryFolder_unfiled_____) { + list-style-image: url("./icons/mail-inbox.svg") !important; + } + + /*= Default Icon - Overide =================================================*/ + /* https://github.com/mozilla/gecko-dev/blob/master/browser/themes/shared/places/tree-icons.css */ + + /* Query */ + :-moz-any(#historyTree, #placesList, #placeContent) treechildren::-moz-tree-image(title, query) { + list-style-image: url("chrome://browser/skin/places/folder-smart.svg") !important; + } + + /* History */ + :-moz-any(#historyTree, #placesList, #placeContent) treechildren::-moz-tree-image(title, query, dayContainer), + :-moz-any(#historyTree, #placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_history____v) { + list-style-image: url("chrome://browser/skin/history.svg") !important; + } + + /* Downloads */ + :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_downloads__v) { + list-style-image: url("chrome://browser/skin/downloads/downloads.svg") !important; + } + + /* Tag */ + :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(title, query, tagContainer), + :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_tags_______v) { + list-style-image: url("chrome://browser/skin/places/tag.svg") !important; + } + + /* Boomark */ + :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_allbms_____v) { + list-style-image: url("chrome://browser/skin/bookmark.svg") !important; + } + + /* Bookmark Toolbar */ + #BMB_bookmarksPopup #BMB_bookmarksToolbar, /* Original: Default folder icon */ + #bookmarksMenuPopup #bookmarksToolbarFolderMenu, /* Original: Default folder icon */ + :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) treechildren::-moz-tree-image(container, queryFolder_toolbar_____) { + list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.svg") !important; + } + + /* Bookmark Menu */ + :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) + treechildren::-moz-tree-image(container, queryFolder_menu________) { + list-style-image: url("chrome://browser/skin/places/bookmarksMenu.svg") !important; + } + + /*= Default Icon - Open ====================================================*/ + /* Query */ + :-moz-any(#PlacesToolbar, #BMB_bookmarksPopup, #bookmarksMenu) + .bookmark-item[container="true"][query="true"]:not([tagContainer])[open="true"] + > .menu-iconic-left + > .menu-iconic-icon { + transform: rotate(15deg) !important; + } + + /* History */ + :-moz-any(#historyTree, #placesList, #placeContent) treechildren::-moz-tree-image(title, query, open, dayContainer), + :-moz-any(#historyTree, #placesList, #placeContent) + treechildren::-moz-tree-image(query, open, OrganizerQuery_history____v) { + list-style-image: url("./icons/history-reverse.svg") !important; + } + + /* Tag */ + :-moz-any(#PlacesToolbar, #BMB_bookmarksPopup, #bookmarksMenu) + .bookmark-item[container="true"][tagContainer="true"][open="true"], + :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(title, query, open, tagContainer), + :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, open, OrganizerQuery_tags_______v) { + list-style-image: url("./icons/tag-open.svg") !important; + } + + /* Boomark */ + :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, open, OrganizerQuery_allbms_____v) { + list-style-image: url("chrome://browser/skin/bookmark-hollow.svg") !important; + } + + /* Bookmark Toolbar */ + #BMB_bookmarksPopup #BMB_bookmarksToolbar[open="true"], + #bookmarksMenuPopup #bookmarksToolbarFolderMenu[open="true"], + :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) + treechildren::-moz-tree-image(container, open, queryFolder_toolbar_____) { + list-style-image: url("./icons/bookmarksToolbar-open.svg") !important; + } + + /* Bookmark Menu */ + :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) + treechildren::-moz-tree-image(container, open, queryFolder_menu________) { + list-style-image: url("./icons/bookmarksMenu-open.svg") !important; /* or bookmarksMenu-open2.svg" */ + } + @media (-moz-gtk-csd-available) { + /*= Proton ===============================================================*/ :root { --organizer-color: -moz-DialogText; --organizer-deemphasized-color: GrayText; From 41f3044d88633d7e3862e12f6b7a98088da2d07b Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Mon, 29 Nov 2021 09:24:03 +0900 Subject: [PATCH 02/25] Add: Library - Content's menubar icons #236 --- userContent.css | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/userContent.css b/userContent.css index c879bc7..efa501b 100644 --- a/userContent.css +++ b/userContent.css @@ -1396,6 +1396,52 @@ } @media (-moz-gtk-csd-available) { + /*= Menubar - Icons ======================================================*/ + #organizeButton, + #viewMenu, + #maintenanceButton, + #back-button, + #forward-button, + #clearDownloadsButton { + fill: currentColor !important; + -moz-context-properties: fill !important; + } + + /* Add */ + #organizeButton { + list-style-image: url("chrome://global/skin/icons/settings.svg") !important; + } + #viewMenu { + list-style-image: url("./icons/sort.svg") !important; + } + #maintenanceButton { + list-style-image: url("./icons/import-export.svg") !important; + } + + #clearDownloadsButton { + list-style-image: url("chrome://global/skin/icons/delete.svg") !important; + } + #clearDownloadsButton > .toolbarbutton-icon { + display: -moz-inline-box !important; + margin-top: 0; + margin-bottom: 0; + margin-inline-start: 0; + margin-inline-end: 2px; + } + + /* Replace */ + #back-button { + list-style-image: url("chrome://browser/skin/back.svg") !important; + } + #forward-button { + list-style-image: url("chrome://browser/skin/forward.svg") !important; + } + + #back-button:-moz-locale-dir(rtl) > .toolbarbutton-icon, + #forward-button:-moz-locale-dir(rtl) > .toolbarbutton-icon { + transform: scaleX(-1) !important; + } + /*= Proton ===============================================================*/ :root { --organizer-color: -moz-DialogText; From f7bb0a776bdfd5daa1e36f7db1acbedae0b974f4 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Mon, 29 Nov 2021 10:13:46 +0900 Subject: [PATCH 03/25] Add: Library - Context menu icons #236 --- userContent.css | 197 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 197 insertions(+) diff --git a/userContent.css b/userContent.css index efa501b..22198d5 100644 --- a/userContent.css +++ b/userContent.css @@ -1442,6 +1442,203 @@ transform: scaleX(-1) !important; } + /*= Context Menu =========================================================*/ + menupopup menuitem:not([type="checkbox"], [type="radio"]), + menupopup menu:not([type="checkbox"], [type="radio"]), + #main-menubar > menu { + -moz-appearance: none !important; /* Linux: menulist */ + } + + #placesContext menuitem:not(.menuitem-iconic, .in-menulist, [type="checkbox"], [checked="true"]), + #placesContext menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]) { + /* Color */ + -moz-context-properties: fill, fill-opacity !important; + fill: currentColor !important; + + /* Layout */ + background-size: 16px !important; + background-repeat: no-repeat !important; + background-image: var(--menuitem-image); + } + + /* For native context menus on macOS */ + @supports -moz-bool-pref("widget.macos.native-context-menus") { + :not(menu, #ContentSelectDropdown) + > menupopup + > menuitem:not(.menuitem-iconic, [type="checkbox"], [checked="true"], .in-menulist), + :not(menu, #ContentSelectDropdown) + > menupopup + > menu:not(.menu-iconic, [type="checkbox"], [checked="true"], .in-menulist) { + list-style-image: var(--menuitem-image) !important; + } + } + + /* Padding */ + :root { + --context-menu-background-padding-default: 5px; + --context-menu-background-padding: var(--context-menu-background-padding-default); + } + #placesContext menuitem:not(.menuitem-iconic, .in-menulist, [type="checkbox"], [checked="true"]), + #placesContext menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]) { + background-position: left var(--context-menu-background-padding) center !important; + padding-inline-start: var(--context-menu-background-padding) !important; + } + + /* Padding - Windows */ + @media (-moz-os-version: windows-win7), (-moz-os-version: windows-win8), (-moz-os-version: windows-win10) { + /* Checkbox */ + :root { + --context-menu-text-padding: calc(var(--menu-padding) + var(--context-menu-background-padding-default) + 16px); + } + :not(menu, #ContentSelectDropdown, #context-navigation) + > menupopup + > menuitem[type="checkbox"][checked="false"] + > .menu-iconic-left { + padding-inline-start: var(--context-menu-text-padding); + } + } + + @media (-moz-os-version: windows-win7) { + :root { + --context-menu-background-padding-default: 2px; + } + } + @media (-moz-os-version: windows-win8) { + :root { + --context-menu-background-padding-default: 3px; + } + } + @media (-moz-os-version: windows-win7), (-moz-os-version: windows-win8) { + #placesContext menuitem:not(.menuitem-iconic, .in-menulist, [type="checkbox"], [checked="true"]), + #placesContext menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]) { + background-position: left var(--context-menu-background-padding) center !important; + padding-inline-start: 0 !important; + } + } + @media (-moz-os-version: windows-win10) { + :root { + --context-menu-background-padding: 1em; + --context-menu-text-padding: 24px; /* 16px + 8px */ + --menu-background-padding-default: calc(var(--context-menu-background-padding) + var(--context-menu-text-padding)); + } + + #placesContext menuitem:not(.menuitem-iconic, .in-menulist, [type="checkbox"], [checked="true"]), + #placesContext menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]) { + padding-inline-start: var(--menu-background-padding-default) !important; + margin-left: 0 !important; + } + } + + /* Padding - Linux */ + @media (-moz-gtk-csd-available) { + :root { + --context-menu-background-padding-default: 6px; + } + } + + /* Padding - Mac */ + @supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") { + :root { + --context-menu-background-padding-default: 10px; + --context-menu-mac-padding: 21px; + } + + /* context menu width */ + #placesContext menuitem:not(.menuitem-iconic, .in-menulist, [type="checkbox"], [checked="true"]), + #placesContext menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]) { + padding-inline-end: var(--context-menu-background-padding) !important; + } + + /* text position */ + #placesContext menuitem:not(.menuitem-iconic, .in-menulist, [type="checkbox"], [checked="true"]) > .menu-text, + #placesContext menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]) > .menu-text { + padding-inline-start: var(--context-menu-mac-padding) !important; + } + + /* Checkbox menuitem, None iconic menu */ + #placesContext menuitem[type="checkbox"], + #placesContext menu:not(.menu-iconic) { + padding-inline-start: calc(var(--context-menu-background-padding) + var(--context-menu-mac-padding)) !important; + } + } + + /* Icon lists */ + #placesContext_open { + --menuitem-image: url("./icons/link-square.svg"); + } + #placesContext_openBookmarkContainer\:tabs, + #placesContext_openBookmarkLinks\:tabs { + --menuitem-image: url("./icons/movetowindow-16.svg"); + } + #placesContext_open\:newtab, + #placesContext_openContainer\:tabs, + #placesContext_openLinks\:tabs { + --menuitem-image: url("chrome://browser/skin/new-tab.svg"); + } + #placesContext_open\:newwindow { + --menuitem-image: url("chrome://browser/skin/window.svg"); + } + #placesContext_open\:newprivatewindow { + --menuitem-image: url("chrome://browser/skin/privateBrowsing.svg"); + } + + #placesContext_show_bookmark\:info, + #placesContext_show\:info, + #placesContext_show_folder\:info { + --menuitem-image: url("chrome://global/skin/icons/edit.svg"); + } + #placesContext_deleteBookmark, + #placesContext_deleteFolder, + #placesContext_delete, + #placesContext_delete_history { + --menuitem-image: url("chrome://global/skin/icons/delete.svg"); + } + #placesContext_deleteHost { + --menuitem-image: url("./icons/eye-hide.svg"); + } + #placesContext_sortBy\:name { + --menuitem-image: url("./icons/text-sort-ascending.svg"); + } + + #placesContext_cut { + --menuitem-image: url("chrome://browser/skin/edit-cut.svg"); + } + #placesContext_copy { + --menuitem-image: url("./icons/edit-copy.svg"); + } + #placesContext_paste_group { + --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); + } + + #placesContext_new\:bookmark { + --menuitem-image: url("chrome://browser/skin/bookmark.svg"); + } + #placesContext_new\:folder { + --menuitem-image: url("chrome://global/skin/icons/folder.svg"); + } + #placesContext_new\:separator { + --menuitem-image: url("./icons/vertical-line.svg"); + } + + #placesContext_paste { + --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); + } + + #placesContext_createBookmark { + --menuitem-image: url("chrome://browser/skin/bookmark.svg"); + } + #show-other-bookmarks_PersonalToolbar { + /* checkbox */ + /* --menuitem-image: url("./icons/star-line-horizontal.svg"); */ + } + #placesContext_showAllBookmarks { + --menuitem-image: url("chrome://browser/skin/bookmark-star-on-tray.svg"); + } + + .openintabs-menuitem { + --menuitem-image: url("./icons/movetowindow-16.svg"); + } + /*= Proton ===============================================================*/ :root { --organizer-color: -moz-DialogText; From 1be2aef6a1795aff7fd3eb2cab62c83ee103d42c Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Mon, 29 Nov 2021 10:56:08 +0900 Subject: [PATCH 04/25] Add: Library - Content's menu icons #236 --- userContent.css | 80 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 76 insertions(+), 4 deletions(-) diff --git a/userContent.css b/userContent.css index 22198d5..147071c 100644 --- a/userContent.css +++ b/userContent.css @@ -1450,7 +1450,9 @@ } #placesContext menuitem:not(.menuitem-iconic, .in-menulist, [type="checkbox"], [checked="true"]), - #placesContext menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]) { + #placesContext menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]), + menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > menuitem, + menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu { /* Color */ -moz-context-properties: fill, fill-opacity !important; fill: currentColor !important; @@ -1479,7 +1481,9 @@ --context-menu-background-padding: var(--context-menu-background-padding-default); } #placesContext menuitem:not(.menuitem-iconic, .in-menulist, [type="checkbox"], [checked="true"]), - #placesContext menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]) { + #placesContext menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]), + menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > menuitem, + menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu { background-position: left var(--context-menu-background-padding) center !important; padding-inline-start: var(--context-menu-background-padding) !important; } @@ -1510,7 +1514,9 @@ } @media (-moz-os-version: windows-win7), (-moz-os-version: windows-win8) { #placesContext menuitem:not(.menuitem-iconic, .in-menulist, [type="checkbox"], [checked="true"]), - #placesContext menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]) { + #placesContext menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]), + menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > menuitem, + menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu { background-position: left var(--context-menu-background-padding) center !important; padding-inline-start: 0 !important; } @@ -1523,7 +1529,9 @@ } #placesContext menuitem:not(.menuitem-iconic, .in-menulist, [type="checkbox"], [checked="true"]), - #placesContext menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]) { + #placesContext menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]), + menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > menuitem, + menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu { padding-inline-start: var(--menu-background-padding-default) !important; margin-left: 0 !important; } @@ -1639,6 +1647,70 @@ --menuitem-image: url("./icons/movetowindow-16.svg"); } + /*= organizeButtonPopup ======================================================*/ + #newbookmark { + --menuitem-image: url("chrome://browser/skin/bookmark.svg"); + } + #newfolder { + --menuitem-image: url("./icons/folder.svg"); + } + #newseparator { + --menuitem-image: url("./icons/vertical-line.svg"); + } + + #orgUndo { + --menuitem-image: url("chrome://global/skin/icons/undo.svg"); + } + #orgRedo { + } + + #orgCut { + --menuitem-image: url("chrome://browser/skin/edit-cut.svg"); + } + #orgCopy { + --menuitem-image: url("./icons/edit-copy.svg"); + } + #orgPaste { + --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); + } + #orgDelete { + --menuitem-image: url("chrome://global/skin/icons/delete.svg"); + } + + #orgSelectAll { + --menuitem-image: url("./icons/select-all-on.svg"); + } + + #orgClose { + --menuitem-image: url("chrome://global/skin/icons/close.svg"); + } + + /*= viewMenuPopup ============================================================*/ + #viewColumns { + --menuitem-image: url("chrome://global/skin/icons/columnpicker.svg"); + } + #viewSort { + --menuitem-image: url("./icons/text-sort-ascending.svg"); + } + + /*= maintenanceButtonPopup ===================================================*/ + #backupBookmarks { + --menuitem-image: url("chrome://devtools/skin/images/datastore.svg"); + } + #fileRestoreMenu { + } + + #fileImport { + --menuitem-image: url("chrome://browser/skin/save.svg"); + } + #fileExport { + --menuitem-image: url("chrome://browser/skin/open.svg"); + } + + #browserImport { + --menuitem-image: url("chrome://browser/skin/import.svg"); + } + /*= Proton ===============================================================*/ :root { --organizer-color: -moz-DialogText; From 470c4c6ffa34a555504dedac7cdef47d20750fe1 Mon Sep 17 00:00:00 2001 From: black7375 Date: Mon, 29 Nov 2021 01:57:51 +0000 Subject: [PATCH 05/25] Clean: Prettified Code! --- userContent.css | 53 ++++++++++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/userContent.css b/userContent.css index 147071c..9f74609 100644 --- a/userContent.css +++ b/userContent.css @@ -1279,9 +1279,9 @@ /* Standard Folder - Open */ :-moz-any(#PlacesToolbar, #BMB_bookmarksPopup, #bookmarksMenu) - .bookmark-item[container="true"]:not([query="true"], [tagContainer], [dayContainer])[open="true"], + .bookmark-item[container="true"]:not([query="true"], [tagContainer], [dayContainer])[open="true"], :-moz-any(#bookmarks-view, #historyTree, #editBMPanel_folderTree, #placesList, #placeContent) - treechildren::-moz-tree-image(title, container, open) { + treechildren::-moz-tree-image(title, container, open) { list-style-image: url("./icons/folder-open.svg") !important; } @@ -1303,9 +1303,9 @@ #BMB_bookmarksPopup #BMB_unsortedBookmarks[open="true"], #bookmarksMenuPopup #menu_unsortedBookmarks[open="true"], :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) - treechildren::-moz-tree-image(container, open, OrganizerQuery_UnfiledBookmarks), + treechildren::-moz-tree-image(container, open, OrganizerQuery_UnfiledBookmarks), :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) - treechildren::-moz-tree-image(container, open, queryFolder_unfiled_____) { + treechildren::-moz-tree-image(container, open, queryFolder_unfiled_____) { list-style-image: url("./icons/mail-inbox.svg") !important; } @@ -1319,7 +1319,8 @@ /* History */ :-moz-any(#historyTree, #placesList, #placeContent) treechildren::-moz-tree-image(title, query, dayContainer), - :-moz-any(#historyTree, #placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_history____v) { + :-moz-any(#historyTree, #placesList, #placeContent) + treechildren::-moz-tree-image(query, OrganizerQuery_history____v) { list-style-image: url("chrome://browser/skin/history.svg") !important; } @@ -1348,29 +1349,29 @@ /* Bookmark Menu */ :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) - treechildren::-moz-tree-image(container, queryFolder_menu________) { + treechildren::-moz-tree-image(container, queryFolder_menu________) { list-style-image: url("chrome://browser/skin/places/bookmarksMenu.svg") !important; } /*= Default Icon - Open ====================================================*/ /* Query */ :-moz-any(#PlacesToolbar, #BMB_bookmarksPopup, #bookmarksMenu) - .bookmark-item[container="true"][query="true"]:not([tagContainer])[open="true"] - > .menu-iconic-left - > .menu-iconic-icon { + .bookmark-item[container="true"][query="true"]:not([tagContainer])[open="true"] + > .menu-iconic-left + > .menu-iconic-icon { transform: rotate(15deg) !important; } /* History */ :-moz-any(#historyTree, #placesList, #placeContent) treechildren::-moz-tree-image(title, query, open, dayContainer), :-moz-any(#historyTree, #placesList, #placeContent) - treechildren::-moz-tree-image(query, open, OrganizerQuery_history____v) { + treechildren::-moz-tree-image(query, open, OrganizerQuery_history____v) { list-style-image: url("./icons/history-reverse.svg") !important; } /* Tag */ :-moz-any(#PlacesToolbar, #BMB_bookmarksPopup, #bookmarksMenu) - .bookmark-item[container="true"][tagContainer="true"][open="true"], + .bookmark-item[container="true"][tagContainer="true"][open="true"], :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(title, query, open, tagContainer), :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, open, OrganizerQuery_tags_______v) { list-style-image: url("./icons/tag-open.svg") !important; @@ -1385,13 +1386,13 @@ #BMB_bookmarksPopup #BMB_bookmarksToolbar[open="true"], #bookmarksMenuPopup #bookmarksToolbarFolderMenu[open="true"], :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) - treechildren::-moz-tree-image(container, open, queryFolder_toolbar_____) { + treechildren::-moz-tree-image(container, open, queryFolder_toolbar_____) { list-style-image: url("./icons/bookmarksToolbar-open.svg") !important; } /* Bookmark Menu */ :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) - treechildren::-moz-tree-image(container, open, queryFolder_menu________) { + treechildren::-moz-tree-image(container, open, queryFolder_menu________) { list-style-image: url("./icons/bookmarksMenu-open.svg") !important; /* or bookmarksMenu-open2.svg" */ } @@ -1466,11 +1467,11 @@ /* For native context menus on macOS */ @supports -moz-bool-pref("widget.macos.native-context-menus") { :not(menu, #ContentSelectDropdown) - > menupopup - > menuitem:not(.menuitem-iconic, [type="checkbox"], [checked="true"], .in-menulist), + > menupopup + > menuitem:not(.menuitem-iconic, [type="checkbox"], [checked="true"], .in-menulist), :not(menu, #ContentSelectDropdown) - > menupopup - > menu:not(.menu-iconic, [type="checkbox"], [checked="true"], .in-menulist) { + > menupopup + > menu:not(.menu-iconic, [type="checkbox"], [checked="true"], .in-menulist) { list-style-image: var(--menuitem-image) !important; } } @@ -1495,9 +1496,9 @@ --context-menu-text-padding: calc(var(--menu-padding) + var(--context-menu-background-padding-default) + 16px); } :not(menu, #ContentSelectDropdown, #context-navigation) - > menupopup - > menuitem[type="checkbox"][checked="false"] - > .menu-iconic-left { + > menupopup + > menuitem[type="checkbox"][checked="false"] + > .menu-iconic-left { padding-inline-start: var(--context-menu-text-padding); } } @@ -1515,8 +1516,8 @@ @media (-moz-os-version: windows-win7), (-moz-os-version: windows-win8) { #placesContext menuitem:not(.menuitem-iconic, .in-menulist, [type="checkbox"], [checked="true"]), #placesContext menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]), - menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > menuitem, - menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu { + menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > menuitem, + menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu { background-position: left var(--context-menu-background-padding) center !important; padding-inline-start: 0 !important; } @@ -1525,13 +1526,15 @@ :root { --context-menu-background-padding: 1em; --context-menu-text-padding: 24px; /* 16px + 8px */ - --menu-background-padding-default: calc(var(--context-menu-background-padding) + var(--context-menu-text-padding)); + --menu-background-padding-default: calc( + var(--context-menu-background-padding) + var(--context-menu-text-padding) + ); } #placesContext menuitem:not(.menuitem-iconic, .in-menulist, [type="checkbox"], [checked="true"]), #placesContext menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]), - menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > menuitem, - menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu { + menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > menuitem, + menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu { padding-inline-start: var(--menu-background-padding-default) !important; margin-left: 0 !important; } From 9c7529136c76abf3ef4120efe3d7770004098637 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Mon, 29 Nov 2021 11:15:04 +0900 Subject: [PATCH 06/25] Fix: Library - menu hover flashing at Linux --- userChrome.css | 1 + userContent.css | 1 + 2 files changed, 2 insertions(+) diff --git a/userChrome.css b/userChrome.css index 7539077..8262df2 100644 --- a/userChrome.css +++ b/userChrome.css @@ -2142,6 +2142,7 @@ browser[type="content"] > html { margin-inline-end: 2px !important; } + #placesMenu > menu[_moz-menuactive="true"], #placesMenu > menu:hover { background-color: var(--organizer-hover-background) !important; color: var(--organizer-hover-color) !important; diff --git a/userContent.css b/userContent.css index 147071c..6ab5874 100644 --- a/userContent.css +++ b/userContent.css @@ -1836,6 +1836,7 @@ margin-inline-end: 2px !important; } + #placesMenu > menu[_moz-menuactive="true"], #placesMenu > menu:hover { background-color: var(--organizer-hover-background) !important; color: var(--organizer-hover-color) !important; From a7453881b524c94e98ec12c2052ec979b0bbea4a Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Tue, 30 Nov 2021 19:25:33 +0900 Subject: [PATCH 07/25] Fix: Library - Icons for other OS #236 --- userContent.css | 544 ++++++++++++++++++++++++------------------------ 1 file changed, 272 insertions(+), 272 deletions(-) diff --git a/userContent.css b/userContent.css index 67374aa..b3abf11 100644 --- a/userContent.css +++ b/userContent.css @@ -1396,324 +1396,324 @@ list-style-image: url("./icons/bookmarksMenu-open.svg") !important; /* or bookmarksMenu-open2.svg" */ } - @media (-moz-gtk-csd-available) { - /*= Menubar - Icons ======================================================*/ - #organizeButton, - #viewMenu, - #maintenanceButton, - #back-button, - #forward-button, - #clearDownloadsButton { - fill: currentColor !important; - -moz-context-properties: fill !important; - } + /*= Menubar - Icons ========================================================*/ + #organizeButton, + #viewMenu, + #maintenanceButton, + #back-button, + #forward-button, + #clearDownloadsButton { + fill: currentColor !important; + -moz-context-properties: fill !important; + } - /* Add */ - #organizeButton { - list-style-image: url("chrome://global/skin/icons/settings.svg") !important; - } - #viewMenu { - list-style-image: url("./icons/sort.svg") !important; - } - #maintenanceButton { - list-style-image: url("./icons/import-export.svg") !important; - } + /* Add */ + #organizeButton { + list-style-image: url("chrome://global/skin/icons/settings.svg") !important; + } + #viewMenu { + list-style-image: url("./icons/sort.svg") !important; + } + #maintenanceButton { + list-style-image: url("./icons/import-export.svg") !important; + } - #clearDownloadsButton { - list-style-image: url("chrome://global/skin/icons/delete.svg") !important; - } - #clearDownloadsButton > .toolbarbutton-icon { - display: -moz-inline-box !important; - margin-top: 0; - margin-bottom: 0; - margin-inline-start: 0; - margin-inline-end: 2px; - } + #clearDownloadsButton { + list-style-image: url("chrome://global/skin/icons/delete.svg") !important; + } + #clearDownloadsButton > .toolbarbutton-icon { + display: -moz-inline-box !important; + margin-top: 0; + margin-bottom: 0; + margin-inline-start: 0; + margin-inline-end: 2px; + } - /* Replace */ - #back-button { - list-style-image: url("chrome://browser/skin/back.svg") !important; - } - #forward-button { - list-style-image: url("chrome://browser/skin/forward.svg") !important; - } + /* Replace */ + #back-button { + list-style-image: url("chrome://browser/skin/back.svg") !important; + } + #forward-button { + list-style-image: url("chrome://browser/skin/forward.svg") !important; + } - #back-button:-moz-locale-dir(rtl) > .toolbarbutton-icon, - #forward-button:-moz-locale-dir(rtl) > .toolbarbutton-icon { - transform: scaleX(-1) !important; - } + #back-button:-moz-locale-dir(rtl) > .toolbarbutton-icon, + #forward-button:-moz-locale-dir(rtl) > .toolbarbutton-icon { + transform: scaleX(-1) !important; + } - /*= Context Menu =========================================================*/ - menupopup menuitem:not([type="checkbox"], [type="radio"]), - menupopup menu:not([type="checkbox"], [type="radio"]), - #main-menubar > menu { - -moz-appearance: none !important; /* Linux: menulist */ - } + /*= Context Menu ===========================================================*/ + menupopup menuitem:not([type="checkbox"], [type="radio"]), + menupopup menu:not([type="checkbox"], [type="radio"]), + #main-menubar > menu { + -moz-appearance: none !important; /* Linux: menulist */ + } - #placesContext menuitem:not(.menuitem-iconic, .in-menulist, [type="checkbox"], [checked="true"]), - #placesContext menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]), - menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > menuitem, - menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu { - /* Color */ - -moz-context-properties: fill, fill-opacity !important; - fill: currentColor !important; + #placesContext menuitem:not(.menuitem-iconic, .in-menulist, [type="checkbox"], [checked="true"]), + #placesContext menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]), + menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > menuitem, + menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu { + /* Color */ + -moz-context-properties: fill, fill-opacity !important; + fill: currentColor !important; - /* Layout */ - background-size: 16px !important; - background-repeat: no-repeat !important; - background-image: var(--menuitem-image); - } + /* Layout */ + background-size: 16px !important; + background-repeat: no-repeat !important; + background-image: var(--menuitem-image); + } - /* For native context menus on macOS */ - @supports -moz-bool-pref("widget.macos.native-context-menus") { - :not(menu, #ContentSelectDropdown) + /* For native context menus on macOS */ + @supports -moz-bool-pref("widget.macos.native-context-menus") { + :not(menu, #ContentSelectDropdown) > menupopup > menuitem:not(.menuitem-iconic, [type="checkbox"], [checked="true"], .in-menulist), - :not(menu, #ContentSelectDropdown) + :not(menu, #ContentSelectDropdown) > menupopup > menu:not(.menu-iconic, [type="checkbox"], [checked="true"], .in-menulist) { - list-style-image: var(--menuitem-image) !important; - } + list-style-image: var(--menuitem-image) !important; } + } - /* Padding */ + /* Padding */ + :root { + --context-menu-background-padding-default: 5px; + --context-menu-background-padding: var(--context-menu-background-padding-default); + } + #placesContext menuitem:not(.menuitem-iconic, .in-menulist, [type="checkbox"], [checked="true"]), + #placesContext menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]), + menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > menuitem, + menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu { + background-position: left var(--context-menu-background-padding) center !important; + padding-inline-start: var(--context-menu-background-padding) !important; + } + + /* Padding - Windows */ + @media (-moz-os-version: windows-win7), (-moz-os-version: windows-win8), (-moz-os-version: windows-win10) { + /* Checkbox */ :root { - --context-menu-background-padding-default: 5px; - --context-menu-background-padding: var(--context-menu-background-padding-default); + --context-menu-text-padding: calc(var(--menu-padding) + var(--context-menu-background-padding-default) + 16px); } + :not(menu, #ContentSelectDropdown, #context-navigation) + > menupopup + > menuitem[type="checkbox"][checked="false"] + > .menu-iconic-left { + padding-inline-start: var(--context-menu-text-padding); + } + } + + @media (-moz-os-version: windows-win7) { + :root { + --context-menu-background-padding-default: 2px; + } + } + @media (-moz-os-version: windows-win8) { + :root { + --context-menu-background-padding-default: 3px; + } + } + @media (-moz-os-version: windows-win7), (-moz-os-version: windows-win8) { #placesContext menuitem:not(.menuitem-iconic, .in-menulist, [type="checkbox"], [checked="true"]), #placesContext menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]), menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > menuitem, menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu { background-position: left var(--context-menu-background-padding) center !important; - padding-inline-start: var(--context-menu-background-padding) !important; + padding-inline-start: 0 !important; + } + } + @media (-moz-os-version: windows-win10) { + :root { + --context-menu-background-padding: 1em; + --context-menu-text-padding: 24px; /* 16px + 8px */ + --menu-background-padding-default: calc( + var(--context-menu-background-padding) + var(--context-menu-text-padding) + ); } - /* Padding - Windows */ - @media (-moz-os-version: windows-win7), (-moz-os-version: windows-win8), (-moz-os-version: windows-win10) { - /* Checkbox */ - :root { - --context-menu-text-padding: calc(var(--menu-padding) + var(--context-menu-background-padding-default) + 16px); - } - :not(menu, #ContentSelectDropdown, #context-navigation) - > menupopup - > menuitem[type="checkbox"][checked="false"] - > .menu-iconic-left { - padding-inline-start: var(--context-menu-text-padding); - } + #placesContext menuitem:not(.menuitem-iconic, .in-menulist, [type="checkbox"], [checked="true"]), + #placesContext menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]), + menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > menuitem, + menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu { + padding-inline-start: var(--menu-background-padding-default) !important; + margin-left: 0 !important; + } + } + + /* Padding - Linux */ + @media (-moz-gtk-csd-available) { + :root { + --context-menu-background-padding-default: 6px; + } + } + + /* Padding - Mac */ + @supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") { + :root { + --context-menu-background-padding-default: 10px; + --context-menu-mac-padding: 21px; } - @media (-moz-os-version: windows-win7) { - :root { - --context-menu-background-padding-default: 2px; - } - } - @media (-moz-os-version: windows-win8) { - :root { - --context-menu-background-padding-default: 3px; - } - } - @media (-moz-os-version: windows-win7), (-moz-os-version: windows-win8) { - #placesContext menuitem:not(.menuitem-iconic, .in-menulist, [type="checkbox"], [checked="true"]), - #placesContext menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]), - menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > menuitem, - menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu { - background-position: left var(--context-menu-background-padding) center !important; - padding-inline-start: 0 !important; - } - } - @media (-moz-os-version: windows-win10) { - :root { - --context-menu-background-padding: 1em; - --context-menu-text-padding: 24px; /* 16px + 8px */ - --menu-background-padding-default: calc( - var(--context-menu-background-padding) + var(--context-menu-text-padding) - ); - } - - #placesContext menuitem:not(.menuitem-iconic, .in-menulist, [type="checkbox"], [checked="true"]), - #placesContext menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]), - menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > menuitem, - menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu { - padding-inline-start: var(--menu-background-padding-default) !important; - margin-left: 0 !important; - } + /* context menu width */ + #placesContext menuitem:not(.menuitem-iconic, .in-menulist, [type="checkbox"], [checked="true"]), + #placesContext menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]) { + padding-inline-end: var(--context-menu-background-padding) !important; } - /* Padding - Linux */ - @media (-moz-gtk-csd-available) { - :root { - --context-menu-background-padding-default: 6px; - } + /* text position */ + #placesContext menuitem:not(.menuitem-iconic, .in-menulist, [type="checkbox"], [checked="true"]) > .menu-text, + #placesContext menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]) > .menu-text { + padding-inline-start: var(--context-menu-mac-padding) !important; } - /* Padding - Mac */ - @supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") { - :root { - --context-menu-background-padding-default: 10px; - --context-menu-mac-padding: 21px; - } + /* Checkbox menuitem, None iconic menu */ + #placesContext menuitem[type="checkbox"], + #placesContext menu:not(.menu-iconic) { + padding-inline-start: calc(var(--context-menu-background-padding) + var(--context-menu-mac-padding)) !important; + } + } - /* context menu width */ - #placesContext menuitem:not(.menuitem-iconic, .in-menulist, [type="checkbox"], [checked="true"]), - #placesContext menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]) { - padding-inline-end: var(--context-menu-background-padding) !important; - } + /* Icon lists */ + #placesContext_open { + --menuitem-image: url("./icons/link-square.svg"); + } + #placesContext_openBookmarkContainer\:tabs, + #placesContext_openBookmarkLinks\:tabs { + --menuitem-image: url("./icons/movetowindow-16.svg"); + } + #placesContext_open\:newtab, + #placesContext_openContainer\:tabs, + #placesContext_openLinks\:tabs { + --menuitem-image: url("chrome://browser/skin/new-tab.svg"); + } + #placesContext_open\:newwindow { + --menuitem-image: url("chrome://browser/skin/window.svg"); + } + #placesContext_open\:newprivatewindow { + --menuitem-image: url("chrome://browser/skin/privateBrowsing.svg"); + } - /* text position */ - #placesContext menuitem:not(.menuitem-iconic, .in-menulist, [type="checkbox"], [checked="true"]) > .menu-text, - #placesContext menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]) > .menu-text { - padding-inline-start: var(--context-menu-mac-padding) !important; - } + #placesContext_show_bookmark\:info, + #placesContext_show\:info, + #placesContext_show_folder\:info { + --menuitem-image: url("chrome://global/skin/icons/edit.svg"); + } + #placesContext_deleteBookmark, + #placesContext_deleteFolder, + #placesContext_delete, + #placesContext_delete_history { + --menuitem-image: url("chrome://global/skin/icons/delete.svg"); + } + #placesContext_deleteHost { + --menuitem-image: url("./icons/eye-hide.svg"); + } + #placesContext_sortBy\:name { + --menuitem-image: url("./icons/text-sort-ascending.svg"); + } - /* Checkbox menuitem, None iconic menu */ - #placesContext menuitem[type="checkbox"], - #placesContext menu:not(.menu-iconic) { - padding-inline-start: calc(var(--context-menu-background-padding) + var(--context-menu-mac-padding)) !important; - } - } + #placesContext_cut { + --menuitem-image: url("chrome://browser/skin/edit-cut.svg"); + } + #placesContext_copy { + --menuitem-image: url("./icons/edit-copy.svg"); + } + #placesContext_paste_group { + --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); + } - /* Icon lists */ - #placesContext_open { - --menuitem-image: url("./icons/link-square.svg"); - } - #placesContext_openBookmarkContainer\:tabs, - #placesContext_openBookmarkLinks\:tabs { - --menuitem-image: url("./icons/movetowindow-16.svg"); - } - #placesContext_open\:newtab, - #placesContext_openContainer\:tabs, - #placesContext_openLinks\:tabs { - --menuitem-image: url("chrome://browser/skin/new-tab.svg"); - } - #placesContext_open\:newwindow { - --menuitem-image: url("chrome://browser/skin/window.svg"); - } - #placesContext_open\:newprivatewindow { - --menuitem-image: url("chrome://browser/skin/privateBrowsing.svg"); - } + #placesContext_new\:bookmark { + --menuitem-image: url("chrome://browser/skin/bookmark.svg"); + } + #placesContext_new\:folder { + --menuitem-image: url("chrome://global/skin/icons/folder.svg"); + } + #placesContext_new\:separator { + --menuitem-image: url("./icons/vertical-line.svg"); + } - #placesContext_show_bookmark\:info, - #placesContext_show\:info, - #placesContext_show_folder\:info { - --menuitem-image: url("chrome://global/skin/icons/edit.svg"); - } - #placesContext_deleteBookmark, - #placesContext_deleteFolder, - #placesContext_delete, - #placesContext_delete_history { - --menuitem-image: url("chrome://global/skin/icons/delete.svg"); - } - #placesContext_deleteHost { - --menuitem-image: url("./icons/eye-hide.svg"); - } - #placesContext_sortBy\:name { - --menuitem-image: url("./icons/text-sort-ascending.svg"); - } + #placesContext_paste { + --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); + } - #placesContext_cut { - --menuitem-image: url("chrome://browser/skin/edit-cut.svg"); - } - #placesContext_copy { - --menuitem-image: url("./icons/edit-copy.svg"); - } - #placesContext_paste_group { - --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); - } + #placesContext_createBookmark { + --menuitem-image: url("chrome://browser/skin/bookmark.svg"); + } + #show-other-bookmarks_PersonalToolbar { + /* checkbox */ + /* --menuitem-image: url("./icons/star-line-horizontal.svg"); */ + } + #placesContext_showAllBookmarks { + --menuitem-image: url("chrome://browser/skin/bookmark-star-on-tray.svg"); + } - #placesContext_new\:bookmark { - --menuitem-image: url("chrome://browser/skin/bookmark.svg"); - } - #placesContext_new\:folder { - --menuitem-image: url("chrome://global/skin/icons/folder.svg"); - } - #placesContext_new\:separator { - --menuitem-image: url("./icons/vertical-line.svg"); - } + .openintabs-menuitem { + --menuitem-image: url("./icons/movetowindow-16.svg"); + } - #placesContext_paste { - --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); - } + /*= organizeButtonPopup ====================================================*/ + #newbookmark { + --menuitem-image: url("chrome://browser/skin/bookmark.svg"); + } + #newfolder { + --menuitem-image: url("./icons/folder.svg"); + } + #newseparator { + --menuitem-image: url("./icons/vertical-line.svg"); + } - #placesContext_createBookmark { - --menuitem-image: url("chrome://browser/skin/bookmark.svg"); - } - #show-other-bookmarks_PersonalToolbar { - /* checkbox */ - /* --menuitem-image: url("./icons/star-line-horizontal.svg"); */ - } - #placesContext_showAllBookmarks { - --menuitem-image: url("chrome://browser/skin/bookmark-star-on-tray.svg"); - } + #orgUndo { + --menuitem-image: url("chrome://global/skin/icons/undo.svg"); + } + #orgRedo { + } - .openintabs-menuitem { - --menuitem-image: url("./icons/movetowindow-16.svg"); - } + #orgCut { + --menuitem-image: url("chrome://browser/skin/edit-cut.svg"); + } + #orgCopy { + --menuitem-image: url("./icons/edit-copy.svg"); + } + #orgPaste { + --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); + } + #orgDelete { + --menuitem-image: url("chrome://global/skin/icons/delete.svg"); + } - /*= organizeButtonPopup ======================================================*/ - #newbookmark { - --menuitem-image: url("chrome://browser/skin/bookmark.svg"); - } - #newfolder { - --menuitem-image: url("./icons/folder.svg"); - } - #newseparator { - --menuitem-image: url("./icons/vertical-line.svg"); - } + #orgSelectAll { + --menuitem-image: url("./icons/select-all-on.svg"); + } - #orgUndo { - --menuitem-image: url("chrome://global/skin/icons/undo.svg"); - } - #orgRedo { - } + #orgClose { + --menuitem-image: url("chrome://global/skin/icons/close.svg"); + } - #orgCut { - --menuitem-image: url("chrome://browser/skin/edit-cut.svg"); - } - #orgCopy { - --menuitem-image: url("./icons/edit-copy.svg"); - } - #orgPaste { - --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); - } - #orgDelete { - --menuitem-image: url("chrome://global/skin/icons/delete.svg"); - } + /*= viewMenuPopup ==========================================================*/ + #viewColumns { + --menuitem-image: url("chrome://global/skin/icons/columnpicker.svg"); + } + #viewSort { + --menuitem-image: url("./icons/text-sort-ascending.svg"); + } - #orgSelectAll { - --menuitem-image: url("./icons/select-all-on.svg"); - } + /*= maintenanceButtonPopup =================================================*/ + #backupBookmarks { + --menuitem-image: url("chrome://devtools/skin/images/datastore.svg"); + } + #fileRestoreMenu { + } - #orgClose { - --menuitem-image: url("chrome://global/skin/icons/close.svg"); - } + #fileImport { + --menuitem-image: url("chrome://browser/skin/save.svg"); + } + #fileExport { + --menuitem-image: url("chrome://browser/skin/open.svg"); + } - /*= viewMenuPopup ============================================================*/ - #viewColumns { - --menuitem-image: url("chrome://global/skin/icons/columnpicker.svg"); - } - #viewSort { - --menuitem-image: url("./icons/text-sort-ascending.svg"); - } - - /*= maintenanceButtonPopup ===================================================*/ - #backupBookmarks { - --menuitem-image: url("chrome://devtools/skin/images/datastore.svg"); - } - #fileRestoreMenu { - } - - #fileImport { - --menuitem-image: url("chrome://browser/skin/save.svg"); - } - #fileExport { - --menuitem-image: url("chrome://browser/skin/open.svg"); - } - - #browserImport { - --menuitem-image: url("chrome://browser/skin/import.svg"); - } + #browserImport { + --menuitem-image: url("chrome://browser/skin/import.svg"); + } + @media (-moz-gtk-csd-available) { /*= Proton ===============================================================*/ :root { --organizer-color: -moz-DialogText; From 6d827a9d1e0f2c9f6aea56ef8ab9f141bd44acf4 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Tue, 30 Nov 2021 19:51:06 +0900 Subject: [PATCH 08/25] Fix: Library - Content's menu paading & arrow at linux #236 --- userContent.css | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/userContent.css b/userContent.css index b3abf11..0f4a1a8 100644 --- a/userContent.css +++ b/userContent.css @@ -1714,6 +1714,17 @@ } @media (-moz-gtk-csd-available) { + /*= Layout Fixes =========================================================*/ + menupopup menu { + padding-block: 4px; + } + + .menu-right { + width: 16px !important; /* Original: 1ex */ + background-image: url("chrome://global/skin/icons/arrow-right.svg"); + background-position: right center; + } + /*= Proton ===============================================================*/ :root { --organizer-color: -moz-DialogText; From 3171b97264addc6ff8dc5275630e5c86d1579bf8 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Tue, 30 Nov 2021 19:53:39 +0900 Subject: [PATCH 09/25] Fix: Draw in titlebar - make to option #281 I think draw in titlebar is better defaults However, I disabled it for user options. --- user.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/user.js b/user.js index f797534..e526e39 100644 --- a/user.js +++ b/user.js @@ -1,7 +1,4 @@ // ** Theme Related Options **************************************************** -// Draw in Titlebar -user_pref("browser.tabs.drawInTitlebar", true); - // userchrome.css usercontent.css activate user_pref("toolkit.legacyUserProfileCustomizations.stylesheets", true); @@ -35,3 +32,7 @@ user_pref("browser.urlbar.suggest.calculator", true); // Integrated unit convertor at urlbar // user_pref("browser.urlbar.unitConversion.enabled", true); + +// Draw in Titlebar +// user_pref("browser.tabs.drawInTitlebar", true); +// user_pref("browser.tabs.inTitlebar", 1); // Nightly, 96 Above From 027b7b41c620c345319d29887c0a2449fd8867e2 Mon Sep 17 00:00:00 2001 From: black7375 Date: Tue, 30 Nov 2021 10:56:09 +0000 Subject: [PATCH 10/25] Clean: Prettified Code! --- userContent.css | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/userContent.css b/userContent.css index 0f4a1a8..2be6674 100644 --- a/userContent.css +++ b/userContent.css @@ -1466,11 +1466,11 @@ /* For native context menus on macOS */ @supports -moz-bool-pref("widget.macos.native-context-menus") { :not(menu, #ContentSelectDropdown) - > menupopup - > menuitem:not(.menuitem-iconic, [type="checkbox"], [checked="true"], .in-menulist), + > menupopup + > menuitem:not(.menuitem-iconic, [type="checkbox"], [checked="true"], .in-menulist), :not(menu, #ContentSelectDropdown) - > menupopup - > menu:not(.menu-iconic, [type="checkbox"], [checked="true"], .in-menulist) { + > menupopup + > menu:not(.menu-iconic, [type="checkbox"], [checked="true"], .in-menulist) { list-style-image: var(--menuitem-image) !important; } } @@ -1495,9 +1495,9 @@ --context-menu-text-padding: calc(var(--menu-padding) + var(--context-menu-background-padding-default) + 16px); } :not(menu, #ContentSelectDropdown, #context-navigation) - > menupopup - > menuitem[type="checkbox"][checked="false"] - > .menu-iconic-left { + > menupopup + > menuitem[type="checkbox"][checked="false"] + > .menu-iconic-left { padding-inline-start: var(--context-menu-text-padding); } } From 8a8351de928c95ed482955f989ba48eba4f20ba4 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Wed, 1 Dec 2021 13:41:30 +0900 Subject: [PATCH 11/25] Fix: Windows7, 8 titlebar button appearance #218 I'am not sure as it's not reproducible. --- userChrome.css | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/userChrome.css b/userChrome.css index 8262df2..0320b0b 100644 --- a/userChrome.css +++ b/userChrome.css @@ -98,6 +98,14 @@ :root:not([lwtheme-image]) #navigator-toolbox:-moz-lwtheme { background-color: var(--lwt-accent-color) !important; } + :root[sizemode="normal"] .titlebar-buttonbox { + appearance: auto !important; + -moz-default-appearance: -moz-window-button-box !important; + } + :root[sizemode="maximized"] .titlebar-buttonbox { + appearance: auto !important; + -moz-default-appearance: -moz-window-button-box-maximized !important; + } } @media (-moz-os-version: windows-win7) { #TabsToolbar:-moz-lwtheme { From 07baed729e372fd0e2e5620f3c2b912ece5954dd Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Thu, 2 Dec 2021 09:07:50 +0900 Subject: [PATCH 12/25] Revert "Fix: Windows7, 8 titlebar button appearance #218" This reverts commit 8a8351de928c95ed482955f989ba48eba4f20ba4. https://github.com/black7375/Firefox-UI-Fix/issues/218#issuecomment-983622813 --- userChrome.css | 8 -------- 1 file changed, 8 deletions(-) diff --git a/userChrome.css b/userChrome.css index 0320b0b..8262df2 100644 --- a/userChrome.css +++ b/userChrome.css @@ -98,14 +98,6 @@ :root:not([lwtheme-image]) #navigator-toolbox:-moz-lwtheme { background-color: var(--lwt-accent-color) !important; } - :root[sizemode="normal"] .titlebar-buttonbox { - appearance: auto !important; - -moz-default-appearance: -moz-window-button-box !important; - } - :root[sizemode="maximized"] .titlebar-buttonbox { - appearance: auto !important; - -moz-default-appearance: -moz-window-button-box-maximized !important; - } } @media (-moz-os-version: windows-win7) { #TabsToolbar:-moz-lwtheme { From 0b6f1b11bacf93a8239f714cdb5de52963f608f7 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Fri, 3 Dec 2021 12:35:38 +0900 Subject: [PATCH 13/25] Add: Context Menu - Send tab icons --- userChrome.css | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/userChrome.css b/userChrome.css index 8262df2..6afc1a8 100644 --- a/userChrome.css +++ b/userChrome.css @@ -4324,6 +4324,7 @@ menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #histo menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]), menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > menuitem, menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu, +#context_sendTabToDevicePopupMenu > menuitem, #blockedPopupDontShowMessage { /* Color */ -moz-context-properties: fill, fill-opacity !important; @@ -4360,6 +4361,7 @@ menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #histo menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]), menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > menuitem, menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu, +#context_sendTabToDevicePopupMenu > menuitem, #blockedPopupDontShowMessage { background-position: left var(--context-menu-background-padding) center !important; padding-inline-start: var(--context-menu-background-padding) !important; @@ -4416,6 +4418,7 @@ menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu, menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]), menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > menuitem, menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu, + #context_sendTabToDevicePopupMenu > menuitem, #blockedPopupDontShowMessage { background-position: left var(--context-menu-background-padding) center !important; padding-inline-start: 0 !important; @@ -4440,6 +4443,7 @@ menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu, menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]), menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > menuitem, menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu, + #context_sendTabToDevicePopupMenu > menuitem, #blockedPopupDontShowMessage { padding-inline-start: var(--menu-background-padding-default) !important; margin-left: 0 !important; @@ -5247,6 +5251,35 @@ menuitem.searchbar-clear-history { --menuitem-image: url("chrome://browser/skin/forget.svg"); } +/*= context_sendTabToDevicePopupMenu =========================================*/ +#context_sendTabToDevicePopupMenu > .sync-menuitem.sendtab-target[clientType="phone"] { + --menuitem-image: url("chrome://browser/skin/device-phone.svg"); +} + +#context_sendTabToDevicePopupMenu > .sync-menuitem.sendtab-target[clientType="tablet"] { + --menuitem-image: url("chrome://browser/skin/device-tablet.svg"); +} + +#context_sendTabToDevicePopupMenu > .sync-menuitem.sendtab-target[clientType="desktop"] { + --menuitem-image: url("chrome://browser/skin/device-desktop.svg"); +} + +#context_sendTabToDevicePopupMenu > .sync-menuitem.sendtab-target[clientType="tv"] { + --menuitem-image: url("chrome://browser/skin/device-tv.svg"); +} + +#context_sendTabToDevicePopupMenu > .sync-menuitem.sendtab-target[clientType="vr"] { + --menuitem-image: url("chrome://browser/skin/device-vr.svg"); +} + +#context_sendTabToDevicePopupMenu > .sync-menuitem.sendtab-target[clientType=""] { + --menuitem-image: url("./icons/send-to-device.svg"); +} + +#context_sendTabToDevicePopupMenu > .sync-menuitem.sendtab-target:not([clientType]) { + --menuitem-image: url("chrome://global/skin/icons/settings.svg"); +} + /** Global Menu ***************************************************************/ /*= main-menubar =============================================================*/ #file-menu { From ea9d5fc40228509276654404ffbfe972ecff12d8 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Fri, 3 Dec 2021 13:42:12 +0900 Subject: [PATCH 14/25] Fix: Context Menu - context-sendpagetodevice-popup icons --- userChrome.css | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/userChrome.css b/userChrome.css index 6afc1a8..26c7a06 100644 --- a/userChrome.css +++ b/userChrome.css @@ -4324,7 +4324,7 @@ menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #histo menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]), menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > menuitem, menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu, -#context_sendTabToDevicePopupMenu > menuitem, +menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) > menuitem, #blockedPopupDontShowMessage { /* Color */ -moz-context-properties: fill, fill-opacity !important; @@ -4361,7 +4361,7 @@ menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #histo menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]), menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > menuitem, menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu, -#context_sendTabToDevicePopupMenu > menuitem, +menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) > menuitem, #blockedPopupDontShowMessage { background-position: left var(--context-menu-background-padding) center !important; padding-inline-start: var(--context-menu-background-padding) !important; @@ -4418,7 +4418,7 @@ menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu, menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]), menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > menuitem, menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu, - #context_sendTabToDevicePopupMenu > menuitem, + menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) > menuitem, #blockedPopupDontShowMessage { background-position: left var(--context-menu-background-padding) center !important; padding-inline-start: 0 !important; @@ -4443,7 +4443,7 @@ menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu, menu:not(.menu-iconic, .in-menulist, [type="checkbox"], [checked="true"]), menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > menuitem, menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu, - #context_sendTabToDevicePopupMenu > menuitem, + menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) > menuitem, #blockedPopupDontShowMessage { padding-inline-start: var(--menu-background-padding-default) !important; margin-left: 0 !important; @@ -5252,31 +5252,38 @@ menuitem.searchbar-clear-history { } /*= context_sendTabToDevicePopupMenu =========================================*/ -#context_sendTabToDevicePopupMenu > .sync-menuitem.sendtab-target[clientType="phone"] { +menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) + > .sync-menuitem.sendtab-target[clientType="phone"] { --menuitem-image: url("chrome://browser/skin/device-phone.svg"); } -#context_sendTabToDevicePopupMenu > .sync-menuitem.sendtab-target[clientType="tablet"] { +menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) + > .sync-menuitem.sendtab-target[clientType="tablet"] { --menuitem-image: url("chrome://browser/skin/device-tablet.svg"); } -#context_sendTabToDevicePopupMenu > .sync-menuitem.sendtab-target[clientType="desktop"] { +menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) + > .sync-menuitem.sendtab-target[clientType="desktop"] { --menuitem-image: url("chrome://browser/skin/device-desktop.svg"); } -#context_sendTabToDevicePopupMenu > .sync-menuitem.sendtab-target[clientType="tv"] { +menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) + > .sync-menuitem.sendtab-target[clientType="tv"] { --menuitem-image: url("chrome://browser/skin/device-tv.svg"); } -#context_sendTabToDevicePopupMenu > .sync-menuitem.sendtab-target[clientType="vr"] { +menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) + > .sync-menuitem.sendtab-target[clientType="vr"] { --menuitem-image: url("chrome://browser/skin/device-vr.svg"); } -#context_sendTabToDevicePopupMenu > .sync-menuitem.sendtab-target[clientType=""] { +menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) + > .sync-menuitem.sendtab-target[clientType=""] { --menuitem-image: url("./icons/send-to-device.svg"); } -#context_sendTabToDevicePopupMenu > .sync-menuitem.sendtab-target:not([clientType]) { +menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup) + > .sync-menuitem.sendtab-target:not([clientType]) { --menuitem-image: url("chrome://global/skin/icons/settings.svg"); } From 336420faffd93a8e5e96adc9a6add66e6c4678e3 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Fri, 3 Dec 2021 14:14:04 +0900 Subject: [PATCH 15/25] Add: Popup - sidebar menu icons --- userChrome.css | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/userChrome.css b/userChrome.css index 26c7a06..a6b6400 100644 --- a/userChrome.css +++ b/userChrome.css @@ -4299,10 +4299,35 @@ panelMenuBookmarkThisPage[starred] { list-style-image: url("./icons/broom.svg"); } +/*= sidebarMenu-popup ========================================================*/ #identity-popup-more-info { list-style-image: url("chrome://global/skin/icons/info.svg"); } +#sidebar-switcher-bookmarks { + list-style-image: url("chrome://browser/skin/bookmark.svg"); +} + +#sidebar-switcher-history { + list-style-image: url("chrome://browser/skin/history.svg"); +} + +#sidebar-switcher-tabs { + list-style-image: url("chrome://browser/skin/tab.svg"); +} + +#sidebar-reverse-position { + list-style-image: url("chrome://browser/skin/sidebars-right.svg"); +} +#sidebar-box[positionend="true"] #sidebar-reverse-position { + /* Can't apply this. shadow dom */ + list-style-image: url("chrome://browser/skin/sidebars.svg"); +} + +#sidebarMenu-popup > .subviewbutton[data-l10n-id="sidebar-menu-close"] { + list-style-image: url("chrome://global/skin/icons/close.svg"); +} + /** Menu - Icons Layout *******************************************************/ menupopup menuitem:not([type="checkbox"], [type="radio"]), menupopup menu:not([type="checkbox"], [type="radio"]), From 688b22e8f0b74f26ed839254c9a0f77c033b788f Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sun, 5 Dec 2021 20:36:04 +0900 Subject: [PATCH 16/25] Fix: BMB_bookmarksPoup at mac - Typo --- userChrome.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/userChrome.css b/userChrome.css index a6b6400..d75c506 100644 --- a/userChrome.css +++ b/userChrome.css @@ -4263,7 +4263,7 @@ panelMenuBookmarkThisPage[starred] { #BMB_bookmarksShowAllTop { list-style-image: url("chrome://browser/skin/bookmark-star-on-tray.svg") !important; } - #BMB_bookmarksShowAllTop > .menu-conic-left { + #BMB_bookmarksShowAllTop > .menu-iconic-left { display: -moz-box !important; } } From a8161fd3e69fd84b227d802db4574b9ab8d110db Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sun, 5 Dec 2021 21:18:55 +0900 Subject: [PATCH 17/25] Fix: BMB_bookmarksPopup at win7,8 - Typo --- userChrome.css | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/userChrome.css b/userChrome.css index d75c506..9d7604f 100644 --- a/userChrome.css +++ b/userChrome.css @@ -140,10 +140,10 @@ #BMB_bookmarksPopup menuitem { border: none !important; /* Remove border */ } - #PlacesToolbar menu:not([disabed], :active)[_moz-menuactive="true"], - #PlacesToolbar menuitem:not([disabed], :active)[_moz-menuactive="true"], - #BMB_bookmarksPopup menu:not([disabed], :active)[_moz-menuactive="true"], - #BMB_bookmarksPopup menuitem:not([disabed], :active)[_moz-menuactive="true"] { + #PlacesToolbar menu:not([disabled], :active)[_moz-menuactive="true"], + #PlacesToolbar menuitem:not([disabled], :active)[_moz-menuactive="true"], + #BMB_bookmarksPopup menu:not([disabled], :active)[_moz-menuactive="true"], + #BMB_bookmarksPopup menuitem:not([disabled], :active)[_moz-menuactive="true"] { background-color: var(--button-hover-bgcolor) !important; } } @@ -3067,7 +3067,7 @@ menupopup > menu { :root[uidensity="compact"] #protections-popup-multiView #protections-popup-footer { padding: 3px 0 20px !important; } -/* Button and disabed category in Protection popup */ +/* Button and disabled category in Protection popup */ :root[uidensity="compact"] #protections-popup-multiView .protections-popup-footer-button, :root[uidensity="compact"] #protections-popup-multiView .protections-popup-category { height: 20px !important; From 5bc18ca836c62e9c1507d64f348f21559f28beec Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sun, 5 Dec 2021 21:30:28 +0900 Subject: [PATCH 18/25] Add: Library - Contents for Radio button #236 --- userContent.css | 66 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/userContent.css b/userContent.css index 2be6674..6b500a5 100644 --- a/userContent.css +++ b/userContent.css @@ -2112,5 +2112,71 @@ background-color: var(--organizer-selected-background) !important; color: var(--organizer-selected-color) !important; } + + /*- Radio Button ---------------------------------------------------------*/ + menuitem[type="radio"] { + /* margin-inline-start: 0 !important; */ + appearance: none !important; + } + + menuitem[type="radio"] > .menu-iconic-left { + appearance: none !important; + width: 16px !important; + height: 16px !important; + padding: 0 !important; + border: 1px solid var(--in-content-box-border-color) !important; + border-radius: 100% !important; + margin-block: 0px !important; /* extend the vertical clicktarget */ + margin-inline: 0 6px !important; + background-color: var(--in-content-button-background) !important; + background-position: center !important; + flex-shrink: 0 !important; /* avoid shrinking inside flex container */ + } + + menuitem[type="radio"]:not([disabled="true"]):hover > .menu-iconic-left { + background-color: var(--in-content-button-background-hover) !important; + color: var(--in-content-button-text-color-hover) !important; + } + + menuitem[type="radio"]:not([disabled="true"]):hover:active > .menu-iconic-left { + background-color: var(--in-content-button-background-active) !important; + } + + menuitem[type="radio"] > .menu-iconic-left[checked="true"] { + -moz-context-properties: fill !important; + fill: currentColor !important; + color: var(--in-content-primary-button-text-color) !important; + background-color: var(--in-content-primary-button-background) !important; + background-image: url("chrome://global/skin/icons/radio.svg") !important; + border-color: transparent !important; + + /* Style the button also when printing with "Print Backgrounds" unchecked */ + color-adjust: exact !important; + } + + menuitem[type="radio"]:not([disabled="true"])[checked="true"]:hover > .menu-iconic-left { + background-color: var(--in-content-primary-button-background-hover) !important; + color: var(--in-content-primary-button-text-color-hover) !important; + } + + menuitem[type="radio"]:not([disabled="true"])[checked="true"]:hover:active > .menu-iconic-left { + background-color: var(--in-content-primary-button-background-active) !important; + } + + menuitem[type="radio"] > .menu-iconic-text { + margin-inline: 0 8px !important; + padding-inline-start: 0 !important; + } + + /* Disabled checkboxes, radios and labels */ + menuitem[type="radio"][disabled="true"], + menuitem[type="checkbox"][disabled="true"] { + color: inherit !important; + } + + menuitem[type="radio"][disabled="true"], + menuitem[type="checkbox"][disabled="true"] { + opacity: 0.5 !important; + } } } From 70973ce0af9e153ab34d632ccce771fb9c046c9b Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sun, 5 Dec 2021 21:31:27 +0900 Subject: [PATCH 19/25] Fix: Library - Contents' radio button ratio #236 --- userContent.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/userContent.css b/userContent.css index 6b500a5..81500dd 100644 --- a/userContent.css +++ b/userContent.css @@ -2122,11 +2122,11 @@ menuitem[type="radio"] > .menu-iconic-left { appearance: none !important; width: 16px !important; - height: 16px !important; + height: 18px !important; /* extend the vertical clicktarget instead of margin-block */ padding: 0 !important; border: 1px solid var(--in-content-box-border-color) !important; border-radius: 100% !important; - margin-block: 0px !important; /* extend the vertical clicktarget */ + margin-block: 0px !important; /* 2px -> 0px */ margin-inline: 0 6px !important; background-color: var(--in-content-button-background) !important; background-position: center !important; From f641e1969ad26bcdc5e189f8f4f08c30e9332f75 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sun, 5 Dec 2021 22:57:31 +0900 Subject: [PATCH 20/25] Add: Library - Contents' checkbox #236 --- userContent.css | 102 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) diff --git a/userContent.css b/userContent.css index 81500dd..118a89b 100644 --- a/userContent.css +++ b/userContent.css @@ -2178,5 +2178,107 @@ menuitem[type="checkbox"][disabled="true"] { opacity: 0.5 !important; } + + /*- Check Box ------------------------------------------------------------*/ + /* From checkbox.css */ + menuitem[type="checkbox"] { + appearance: none !important; + -moz-box-align: center !important; + margin: 4px 2px !important; + } + + menuitem[type="checkbox"] > .menu-iconic-left > .menu-iconic-icon { + margin-inline-end: 2px !important; + } + menuitem[type="checkbox"] > .menu-iconic-text { + margin: 1px 0 !important; + } + + menuitem[type="checkbox"][disabled="true"] { + opacity: 0.4 !important; + } + + menuitem[type="checkbox"] > .menu-iconic-left { + appearance: none !important; + color: var(--checkbox-border-color, ThreeDDarkShadow) !important; + background-color: var(--checkbox-unchecked-bgcolor, Field) !important; + border: 1px solid currentColor !important; + border-radius: 2px !important; + margin-inline-end: 6px !important; + } + + menuitem[type="checkbox"] > .menu-iconic-left { + height: 16px !important; + width: 16px !important; + } + + menuitem[type="checkbox"]:not([disabled="true"]):hover > .menu-iconic-left { + background-color: var( + --checkbox-unchecked-hover-bgcolor, + color-mix(in srgb, -moz-accent-color 4%, Field) + ) !important; + } + + menuitem[type="checkbox"]:not([disabled="true"]):hover:active > .menu-iconic-left { + background-color: var( + --checkbox-unchecked-active-bgcolor, + color-mix(in srgb, -moz-accent-color 8%, Field) + ) !important; + } + + menuitem[type="checkbox"] > .menu-iconic-left[checked="true"] { + border-color: var(--checkbox-checked-border-color, transparent) !important; + background-color: var(--checkbox-checked-bgcolor, -moz-accent-color) !important; + background-image: url("chrome://global/skin/icons/check.svg") !important; + background-position: center !important; + background-repeat: no-repeat !important; + -moz-context-properties: fill !important; + fill: currentColor !important; + color: var(--checkbox-checked-color, -moz-accent-color-foreground) !important; + /* Style the button also when printing with "Print Backgrounds" unchecked */ + color-adjust: exact !important; + } + + menuitem[type="checkbox"]:not([disabled="true"]):hover > .menu-iconic-left[checked="true"] { + background-color: var( + --checkbox-checked-hover-bgcolor, + color-mix(in srgb, currentColor 12.5%, -moz-accent-color) + ) !important; + } + + menuitem[type="checkbox"]:not([disabled="true"]):hover:active > .menu-iconic-left[checked="true"]{ + background-color: var( + --checkbox-checked-active-bgcolor, + color-mix(in srgb, currentColor 25%, -moz-accent-color) + ) !important; + } + + menuitem[type="checkbox"]:focus > .menu-iconic-left { + outline: 2px solid var(--focus-outline-color, -moz-accent-color) !important; + outline-offset: var(--focus-outline-offset, 2px) !important; + } + + @media (prefers-contrast) { + menuitem[type="checkbox"]:not([disabled="true"]) > .menu-iconic-left { + /* color will set the border-color on the check due to how HCM works for in-content pages. */ + color: var(--checkbox-checked-border-color, color-mix(in srgb, -moz-accent-color 4%, Field)) !important; + } + + menuitem[type="checkbox"] > .menu-iconic-left[checked="true"] { + color: var(--checkbox-checked-border-color, currentColor) !important; + fill: var(--checkbox-checked-color, -moz-accent-color-foreground) !important; + } + + menuitem[type="checkbox"]:not([disabled="true"]):hover:active > .menu-iconic-left[checked="true"], + menuitem[type="checkbox"]:not([disabled="true"]):hover > .menu-iconic-left[checked="true"] { + color: var(--checkbox-checked-border-color-hover, -moz-accent-color-foreground) !important; + fill: var(--checkbox-checked-border-color-hover, -moz-accent-color-foreground) !important; + } + } + + /* From common.css */ + menuitem[type="checkbox"] > .menu-iconic-left { + margin-block: 2px !important; + } } } From a3c48c75354f5da60c9a68ac7adfa8fb975f2792 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Sun, 5 Dec 2021 23:31:25 +0900 Subject: [PATCH 21/25] Fix: Library - Contents' Radio button size #236 --- userContent.css | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/userContent.css b/userContent.css index 118a89b..542fe38 100644 --- a/userContent.css +++ b/userContent.css @@ -2119,30 +2119,30 @@ appearance: none !important; } - menuitem[type="radio"] > .menu-iconic-left { + menuitem[type="radio"] > .menu-iconic-left > .menu-iconic-icon { appearance: none !important; width: 16px !important; - height: 18px !important; /* extend the vertical clicktarget instead of margin-block */ + height: 16px !important; padding: 0 !important; border: 1px solid var(--in-content-box-border-color) !important; border-radius: 100% !important; - margin-block: 0px !important; /* 2px -> 0px */ + margin-block: 2px !important; /* extend the vertical clicktarget */ margin-inline: 0 6px !important; background-color: var(--in-content-button-background) !important; background-position: center !important; flex-shrink: 0 !important; /* avoid shrinking inside flex container */ } - menuitem[type="radio"]:not([disabled="true"]):hover > .menu-iconic-left { + menuitem[type="radio"]:not([disabled="true"]):hover > .menu-iconic-left > .menu-iconic-icon { background-color: var(--in-content-button-background-hover) !important; color: var(--in-content-button-text-color-hover) !important; } - menuitem[type="radio"]:not([disabled="true"]):hover:active > .menu-iconic-left { + menuitem[type="radio"]:not([disabled="true"]):hover:active > .menu-iconic-left > .menu-iconic-icon { background-color: var(--in-content-button-background-active) !important; } - menuitem[type="radio"] > .menu-iconic-left[checked="true"] { + menuitem[type="radio"] > .menu-iconic-left[checked="true"] > .menu-iconic-icon { -moz-context-properties: fill !important; fill: currentColor !important; color: var(--in-content-primary-button-text-color) !important; @@ -2154,12 +2154,12 @@ color-adjust: exact !important; } - menuitem[type="radio"]:not([disabled="true"])[checked="true"]:hover > .menu-iconic-left { + menuitem[type="radio"]:not([disabled="true"])[checked="true"]:hover > .menu-iconic-left > .menu-iconic-icon { background-color: var(--in-content-primary-button-background-hover) !important; color: var(--in-content-primary-button-text-color-hover) !important; } - menuitem[type="radio"]:not([disabled="true"])[checked="true"]:hover:active > .menu-iconic-left { + menuitem[type="radio"]:not([disabled="true"])[checked="true"]:hover:active > .menu-iconic-left > .menu-iconic-icon { background-color: var(--in-content-primary-button-background-active) !important; } @@ -2198,7 +2198,7 @@ opacity: 0.4 !important; } - menuitem[type="checkbox"] > .menu-iconic-left { + menuitem[type="checkbox"] > .menu-iconic-left > .menu-iconic-icon { appearance: none !important; color: var(--checkbox-border-color, ThreeDDarkShadow) !important; background-color: var(--checkbox-unchecked-bgcolor, Field) !important; @@ -2207,26 +2207,26 @@ margin-inline-end: 6px !important; } - menuitem[type="checkbox"] > .menu-iconic-left { + menuitem[type="checkbox"] > .menu-iconic-left > .menu-iconic-icon { height: 16px !important; width: 16px !important; } - menuitem[type="checkbox"]:not([disabled="true"]):hover > .menu-iconic-left { + menuitem[type="checkbox"]:not([disabled="true"]):hover > .menu-iconic-left > .menu-iconic-icon { background-color: var( --checkbox-unchecked-hover-bgcolor, color-mix(in srgb, -moz-accent-color 4%, Field) ) !important; } - menuitem[type="checkbox"]:not([disabled="true"]):hover:active > .menu-iconic-left { + menuitem[type="checkbox"]:not([disabled="true"]):hover:active > .menu-iconic-left > .menu-iconic-icon { background-color: var( --checkbox-unchecked-active-bgcolor, color-mix(in srgb, -moz-accent-color 8%, Field) ) !important; } - menuitem[type="checkbox"] > .menu-iconic-left[checked="true"] { + menuitem[type="checkbox"] > .menu-iconic-left[checked="true"] > .menu-iconic-icon { border-color: var(--checkbox-checked-border-color, transparent) !important; background-color: var(--checkbox-checked-bgcolor, -moz-accent-color) !important; background-image: url("chrome://global/skin/icons/check.svg") !important; @@ -2239,27 +2239,27 @@ color-adjust: exact !important; } - menuitem[type="checkbox"]:not([disabled="true"]):hover > .menu-iconic-left[checked="true"] { + menuitem[type="checkbox"]:not([disabled="true"]):hover > .menu-iconic-left[checked="true"] > .menu-iconic-icon { background-color: var( --checkbox-checked-hover-bgcolor, color-mix(in srgb, currentColor 12.5%, -moz-accent-color) ) !important; } - menuitem[type="checkbox"]:not([disabled="true"]):hover:active > .menu-iconic-left[checked="true"]{ + menuitem[type="checkbox"]:not([disabled="true"]):hover:active > .menu-iconic-left[checked="true"] > .menu-iconic-icon { background-color: var( --checkbox-checked-active-bgcolor, color-mix(in srgb, currentColor 25%, -moz-accent-color) ) !important; } - menuitem[type="checkbox"]:focus > .menu-iconic-left { + menuitem[type="checkbox"]:focus > .menu-iconic-left > .menu-iconic-icon { outline: 2px solid var(--focus-outline-color, -moz-accent-color) !important; outline-offset: var(--focus-outline-offset, 2px) !important; } @media (prefers-contrast) { - menuitem[type="checkbox"]:not([disabled="true"]) > .menu-iconic-left { + menuitem[type="checkbox"]:not([disabled="true"]) > .menu-iconic-left > .menu-iconic-icon { /* color will set the border-color on the check due to how HCM works for in-content pages. */ color: var(--checkbox-checked-border-color, color-mix(in srgb, -moz-accent-color 4%, Field)) !important; } @@ -2269,15 +2269,15 @@ fill: var(--checkbox-checked-color, -moz-accent-color-foreground) !important; } - menuitem[type="checkbox"]:not([disabled="true"]):hover:active > .menu-iconic-left[checked="true"], - menuitem[type="checkbox"]:not([disabled="true"]):hover > .menu-iconic-left[checked="true"] { + menuitem[type="checkbox"]:not([disabled="true"]):hover:active > .menu-iconic-left[checked="true"] > .menu-iconic-icon, + menuitem[type="checkbox"]:not([disabled="true"]):hover > .menu-iconic-left[checked="true"] > .menu-iconic-icon { color: var(--checkbox-checked-border-color-hover, -moz-accent-color-foreground) !important; fill: var(--checkbox-checked-border-color-hover, -moz-accent-color-foreground) !important; } } /* From common.css */ - menuitem[type="checkbox"] > .menu-iconic-left { + menuitem[type="checkbox"] > .menu-iconic-left > .menu-iconic-icon { margin-block: 2px !important; } } From 7c16eb2a7e3d11d979b017817d81b834459f5068 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Mon, 6 Dec 2021 00:03:40 +0900 Subject: [PATCH 22/25] Fix: Library - Contents' checkbox margin-block #236 --- userContent.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/userContent.css b/userContent.css index 542fe38..596d121 100644 --- a/userContent.css +++ b/userContent.css @@ -2184,7 +2184,7 @@ menuitem[type="checkbox"] { appearance: none !important; -moz-box-align: center !important; - margin: 4px 2px !important; + margin: 0px 2px !important; } menuitem[type="checkbox"] > .menu-iconic-left > .menu-iconic-icon { From 666fd94785fe4f8d73a1b0141a29b5f41556f98b Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Mon, 6 Dec 2021 00:18:40 +0900 Subject: [PATCH 23/25] Add: Library - Contents' menuseparator #236 --- userContent.css | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/userContent.css b/userContent.css index 596d121..c82e384 100644 --- a/userContent.css +++ b/userContent.css @@ -2280,5 +2280,16 @@ menuitem[type="checkbox"] > .menu-iconic-left > .menu-iconic-icon { margin-block: 2px !important; } + + /*- Menu Separtor --------------------------------------------------------*/ + menuseparator { + appearance: none !important; + min-width: 2px; + min-height: 0; + border-top: 1px solid var(--in-content-box-border-color, ThreeDDarkShadow); + border-bottom: none; + margin: var(--panel-separator-margin, 6px); + padding: 0; + } } } From 329b395ec4255ef3d3ccf675300f901bfa4f1484 Mon Sep 17 00:00:00 2001 From: black7375 Date: Sun, 5 Dec 2021 15:19:53 +0000 Subject: [PATCH 24/25] Clean: Prettified Code! --- userContent.css | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/userContent.css b/userContent.css index c82e384..9524792 100644 --- a/userContent.css +++ b/userContent.css @@ -2246,7 +2246,9 @@ ) !important; } - menuitem[type="checkbox"]:not([disabled="true"]):hover:active > .menu-iconic-left[checked="true"] > .menu-iconic-icon { + menuitem[type="checkbox"]:not([disabled="true"]):hover:active + > .menu-iconic-left[checked="true"] + > .menu-iconic-icon { background-color: var( --checkbox-checked-active-bgcolor, color-mix(in srgb, currentColor 25%, -moz-accent-color) @@ -2259,7 +2261,7 @@ } @media (prefers-contrast) { - menuitem[type="checkbox"]:not([disabled="true"]) > .menu-iconic-left > .menu-iconic-icon { + menuitem[type="checkbox"]:not([disabled="true"]) > .menu-iconic-left > .menu-iconic-icon { /* color will set the border-color on the check due to how HCM works for in-content pages. */ color: var(--checkbox-checked-border-color, color-mix(in srgb, -moz-accent-color 4%, Field)) !important; } @@ -2269,7 +2271,9 @@ fill: var(--checkbox-checked-color, -moz-accent-color-foreground) !important; } - menuitem[type="checkbox"]:not([disabled="true"]):hover:active > .menu-iconic-left[checked="true"] > .menu-iconic-icon, + menuitem[type="checkbox"]:not([disabled="true"]):hover:active + > .menu-iconic-left[checked="true"] + > .menu-iconic-icon, menuitem[type="checkbox"]:not([disabled="true"]):hover > .menu-iconic-left[checked="true"] > .menu-iconic-icon { color: var(--checkbox-checked-border-color-hover, -moz-accent-color-foreground) !important; fill: var(--checkbox-checked-border-color-hover, -moz-accent-color-foreground) !important; From 1da2535f8d84fe0ef05c2b6020a44c38a3698323 Mon Sep 17 00:00:00 2001 From: alstjr7375 Date: Wed, 8 Dec 2021 11:36:08 +0900 Subject: [PATCH 25/25] Fix: Windows7, 8 titlebar background color #218 --- userChrome.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/userChrome.css b/userChrome.css index 9d7604f..aa899f1 100644 --- a/userChrome.css +++ b/userChrome.css @@ -95,7 +95,7 @@ /*= Windows 7, 8 - Tab Bar Background *****************************************/ @media (-moz-os-version: windows-win7), (-moz-os-version: windows-win8) { /* Header Color */ - :root:not([lwtheme-image]) #navigator-toolbox:-moz-lwtheme { + :root:not([lwtheme-image]):-moz-lwtheme { background-color: var(--lwt-accent-color) !important; } }