From 96d6de279355bc728e4474e8185f4cc8d2368ef2 Mon Sep 17 00:00:00 2001 From: vinceliuice Date: Tue, 18 Apr 2023 22:23:08 +0800 Subject: [PATCH] Fixed issues --- .../icons/audio-muted-symbolic-light.svg | 86 +++++++++ .../icons/audio-playing-symbolic-light.svg | 70 +++++++ .../chrome/Colloid/icons/phone-symbolic.svg | 4 + .../icons/save-to-pocket-open-light.svg | 47 +++++ .../Colloid/icons/save-to-pocket-open.svg | 47 +++++ .../icons/screenshot-symbolic-light.svg | 6 + .../icons/tab-restore-symbolic-light.svg | 5 + .../Colloid/icons/tab-restore-symbolic.svg | 5 + .../Colloid/icons/url2qr-icon-light.svg | 182 ++++++++++++++++++ .../chrome/Colloid/icons/url2qr-icon.svg | 182 ++++++++++++++++++ .../firefox/chrome/Colloid/parts/dialogs.css | 6 + .../firefox/chrome/Colloid/parts/icons.css | 93 ++++++++- 12 files changed, 725 insertions(+), 8 deletions(-) create mode 100644 src/other/firefox/chrome/Colloid/icons/audio-muted-symbolic-light.svg create mode 100644 src/other/firefox/chrome/Colloid/icons/audio-playing-symbolic-light.svg create mode 100644 src/other/firefox/chrome/Colloid/icons/phone-symbolic.svg create mode 100644 src/other/firefox/chrome/Colloid/icons/save-to-pocket-open-light.svg create mode 100644 src/other/firefox/chrome/Colloid/icons/save-to-pocket-open.svg create mode 100644 src/other/firefox/chrome/Colloid/icons/screenshot-symbolic-light.svg create mode 100644 src/other/firefox/chrome/Colloid/icons/tab-restore-symbolic-light.svg create mode 100644 src/other/firefox/chrome/Colloid/icons/tab-restore-symbolic.svg create mode 100644 src/other/firefox/chrome/Colloid/icons/url2qr-icon-light.svg create mode 100644 src/other/firefox/chrome/Colloid/icons/url2qr-icon.svg diff --git a/src/other/firefox/chrome/Colloid/icons/audio-muted-symbolic-light.svg b/src/other/firefox/chrome/Colloid/icons/audio-muted-symbolic-light.svg new file mode 100644 index 00000000..cd6c9f96 --- /dev/null +++ b/src/other/firefox/chrome/Colloid/icons/audio-muted-symbolic-light.svg @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + diff --git a/src/other/firefox/chrome/Colloid/icons/audio-playing-symbolic-light.svg b/src/other/firefox/chrome/Colloid/icons/audio-playing-symbolic-light.svg new file mode 100644 index 00000000..57a68dc8 --- /dev/null +++ b/src/other/firefox/chrome/Colloid/icons/audio-playing-symbolic-light.svg @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + diff --git a/src/other/firefox/chrome/Colloid/icons/phone-symbolic.svg b/src/other/firefox/chrome/Colloid/icons/phone-symbolic.svg new file mode 100644 index 00000000..dc747703 --- /dev/null +++ b/src/other/firefox/chrome/Colloid/icons/phone-symbolic.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/other/firefox/chrome/Colloid/icons/save-to-pocket-open-light.svg b/src/other/firefox/chrome/Colloid/icons/save-to-pocket-open-light.svg new file mode 100644 index 00000000..b2ecda59 --- /dev/null +++ b/src/other/firefox/chrome/Colloid/icons/save-to-pocket-open-light.svg @@ -0,0 +1,47 @@ + + + + + + + + + + diff --git a/src/other/firefox/chrome/Colloid/icons/save-to-pocket-open.svg b/src/other/firefox/chrome/Colloid/icons/save-to-pocket-open.svg new file mode 100644 index 00000000..504bfa73 --- /dev/null +++ b/src/other/firefox/chrome/Colloid/icons/save-to-pocket-open.svg @@ -0,0 +1,47 @@ + + + + + + + + + + diff --git a/src/other/firefox/chrome/Colloid/icons/screenshot-symbolic-light.svg b/src/other/firefox/chrome/Colloid/icons/screenshot-symbolic-light.svg new file mode 100644 index 00000000..fa6d8e88 --- /dev/null +++ b/src/other/firefox/chrome/Colloid/icons/screenshot-symbolic-light.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/other/firefox/chrome/Colloid/icons/tab-restore-symbolic-light.svg b/src/other/firefox/chrome/Colloid/icons/tab-restore-symbolic-light.svg new file mode 100644 index 00000000..3b3bda66 --- /dev/null +++ b/src/other/firefox/chrome/Colloid/icons/tab-restore-symbolic-light.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/other/firefox/chrome/Colloid/icons/tab-restore-symbolic.svg b/src/other/firefox/chrome/Colloid/icons/tab-restore-symbolic.svg new file mode 100644 index 00000000..5342d92d --- /dev/null +++ b/src/other/firefox/chrome/Colloid/icons/tab-restore-symbolic.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/other/firefox/chrome/Colloid/icons/url2qr-icon-light.svg b/src/other/firefox/chrome/Colloid/icons/url2qr-icon-light.svg new file mode 100644 index 00000000..0bf3009b --- /dev/null +++ b/src/other/firefox/chrome/Colloid/icons/url2qr-icon-light.svg @@ -0,0 +1,182 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/other/firefox/chrome/Colloid/icons/url2qr-icon.svg b/src/other/firefox/chrome/Colloid/icons/url2qr-icon.svg new file mode 100644 index 00000000..6e87af6b --- /dev/null +++ b/src/other/firefox/chrome/Colloid/icons/url2qr-icon.svg @@ -0,0 +1,182 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/other/firefox/chrome/Colloid/parts/dialogs.css b/src/other/firefox/chrome/Colloid/parts/dialogs.css index 45ffc9ef..51672e27 100644 --- a/src/other/firefox/chrome/Colloid/parts/dialogs.css +++ b/src/other/firefox/chrome/Colloid/parts/dialogs.css @@ -19,6 +19,10 @@ window { #window-modal-dialog { margin-top: auto !important; + display: flex; + justify-content: center; + align-items: center; + height: 100vh; } /* Dialog */ @@ -32,7 +36,9 @@ window[role="dialog"] { border: 0 !important; box-shadow: var(--gnome-menu-shadow) !important; padding: 0 !important; + border-radius: 12px !important; } + dialog { padding: 0 !important; } diff --git a/src/other/firefox/chrome/Colloid/parts/icons.css b/src/other/firefox/chrome/Colloid/parts/icons.css index a5e211c2..cc744aa9 100644 --- a/src/other/firefox/chrome/Colloid/parts/icons.css +++ b/src/other/firefox/chrome/Colloid/parts/icons.css @@ -226,11 +226,13 @@ menu[disabled] > .menu-right { /* Search entries */ #urlbar[pageproxystate="invalid"] > #identity-box > #identity-icon, +#urlbar:not(.searchButton) > #urlbar-input-container > #identity-box[pageproxystate="invalid"] #identity-icon, .searchbar-search-icon, #search-box .textbox-search-sign { list-style-image: url("../icons/edit-find-symbolic.svg") !important; opacity: 0.7 !important; } + #search-box .textbox-search-sign { width: 16px !important; margin: 2px 0; @@ -348,14 +350,11 @@ treechildren::-moz-tree-image(query, OrganizerQuery_history____v) { } /* Addons button */ #add-ons-button, +#unified-extensions-button, #addons-notification-icon, .install-icon { list-style-image: url("../icons/application-x-addon-symbolic.svg") !important; } -/* Extensions button */ -#unified-extensions-button { - list-style-image: url("../icons/application-x-addon-symbolic.svg") !important; -} /* Find button */ #find-button { list-style-image: url("../icons/edit-find-symbolic.svg") !important; @@ -368,6 +367,11 @@ treechildren::-moz-tree-image(query, OrganizerQuery_history____v) { #bookmarks-menu-button { list-style-image: url("../icons/bookmarks-symbolic.svg") !important; } +#sidebar-box[sidebarcommand="viewBookmarksSidebar"] > #sidebar-header > #sidebar-switcher-target > #sidebar-icon, +.urlbarView-row[source="bookmarks"] > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-favicon, +#urlbar-engine-one-off-item-bookmarks { + list-style-image: url("../icons/starred-symbolic.svg") !important; +} /* History button */ #history-panelmenu, #sidebar-box[sidebarcommand="viewHistorySidebar"] > #sidebar-header > #sidebar-switcher-target > #sidebar-icon, @@ -398,6 +402,14 @@ treechildren::-moz-tree-image(query, OrganizerQuery_history____v) { #nav-bar-overflow-button { list-style-image: url("../icons/view-more-horizontal-symbolic.svg") !important; } +/* Bookmarks button */ +#mozcn-mobile-bookmarks-button { + list-style-image: url("../icons/phone-symbolic.svg") !important; +} + +#bookmarks-toolbar-button, #bookmarks-toolbar-placeholder { + list-style-image: url("../icons/star-symbolic.svg") !important; +} #downloads-button .toolbarbutton-icon { /* Downloads button / Glitch - it swaps to the default one anyway */ list-style-image: url("../icons/folder-download-symbolic.svg") !important; animation: none !important; @@ -430,10 +442,15 @@ treechildren::-moz-tree-image(query, OrganizerQuery_history____v) { list-style-image: url("../icons/page-action.svg") !important; } +#save-to-pocket-button, #pocket-button, #pageAction-panel-pocket { list-style-image: url("../icons/save-to-pocket.svg") !important; } +#save-to-pocket-button[open="true"], #save-to-pocket-button[pocketed="true"] { + list-style-image: url("../icons/save-to-pocket-open.svg") !important; +} + /* Bookmarks menu button */ #bookmarks-menu-button, #sidebar-box[sidebarcommand="viewBookmarksSidebar"] > #sidebar-header > #sidebar-switcher-target > #sidebar-icon, @@ -534,6 +551,44 @@ treechildren::-moz-tree-image(query, OrganizerQuery_history____v) { list-style-image: url("../icons/screenshot-symbolic.svg") !important; } +toolbarbutton#easyscreenshot_mozillaonline_com-BAP { + --webextension-menupanel-image: url("../icons/screenshot-symbolic.svg") !important; + --webextension-menupanel-image-2x: url("../icons/screenshot-symbolic.svg") !important; + --webextension-menupanel-image-light: url("../icons/screenshot-symbolic-light.svg") !important; + --webextension-menupanel-image-2x-light: url("../icons/screenshot-symbolic-light.svg") !important; + --webextension-menupanel-image-dark: url("../icons/screenshot-symbolic.svg") !important; + --webextension-menupanel-image-2x-dark: url("../icons/screenshot-symbolic.svg") !important; + --webextension-toolbar-image: url("../icons/screenshot-symbolic.svg") !important; + --webextension-toolbar-image-2x: url("../icons/screenshot-symbolic.svg") !important; + --webextension-toolbar-image-light: url("../icons/screenshot-symbolic-light.svg") !important; + --webextension-toolbar-image-2x-light: url("../icons/screenshot-symbolic-light.svg") !important; + --webextension-toolbar-image-dark: url("../icons/screenshot-symbolic.svg") !important; + --webextension-toolbar-image-2x-dark: url("../icons/screenshot-symbolic.svg") !important; +} + +toolbarbutton#cpmanager_mozillaonline_com-BAP { + --webextension-menupanel-image: url("../icons/tab-restore-symbolic.svg") !important; + --webextension-menupanel-image-2x: url("../icons/tab-restore-symbolic.svg") !important; + --webextension-menupanel-image-light: url("../icons/tab-restore-symbolic-light.svg") !important; + --webextension-menupanel-image-2x-light: url("../icons/tab-restore-symbolic-light.svg") !important; + --webextension-menupanel-image-dark: url("../icons/tab-restore-symbolic.svg") !important; + --webextension-menupanel-image-2x-dark: url("../icons/tab-restore-symbolic.svg") !important; + --webextension-toolbar-image: url("../icons/tab-restore-symbolic.svg") !important; + --webextension-toolbar-image-2x: url("../icons/tab-restore-symbolic.svg") !important; + --webextension-toolbar-image-light: url("../icons/tab-restore-symbolic-light.svg") !important; + --webextension-toolbar-image-2x-light: url("../icons/tab-restore-symbolic-light.svg") !important; + --webextension-toolbar-image-dark: url("../icons/tab-restore-symbolic.svg") !important; + --webextension-toolbar-image-2x-dark: url("../icons/tab-restore-symbolic.svg") !important; +} + +toolbar:not([brighttext]) .webextension-browser-action:-moz-lwtheme { + list-style-image: var(--webextension-toolbar-image-2x-dark, var(--gnome-toolbar-color)) !important; +} + +#mo-url2qr-icon { + list-style-image: url("../icons/url2qr-icon.svg") !important; +} + .popup-notification-icon[popupid="web-notifications"], .desktop-notification-icon { list-style-image: url("../icons/notification-symbolic.svg") !important; } @@ -606,10 +661,12 @@ button.close::before { height: 16px !important; width: 16px !important; } + /* Fix icon color */ #sidebar-icon { opacity: 1 !important; } + treechildren::-moz-tree-twisty, treechildren::-moz-tree-image { fill-opacity: 1 !important; @@ -633,6 +690,7 @@ treechildren::-moz-tree-image { .menu-right, #urlbar[pageproxystate="invalid"] > #identity-box > #identity-icon, + #urlbar:not(.searchButton) > #urlbar-input-container > #identity-box[pageproxystate="invalid"] #identity-icon, .searchbar-search-icon, #search-box .textbox-search-sign, @@ -703,13 +761,16 @@ treechildren::-moz-tree-image { #nav-bar-overflow-button .toolbarbutton-icon, #reload-button .toolbarbutton-icon, .downloadIconRetry > .button-box > .button-icon, - #context-reload, + #context-reload .menu-iconic-icon, #stop-button .toolbarbutton-icon, .downloadIconCancel > .button-box > .button-icon, #context-stop, #downloads-button .toolbarbutton-icon, #sync-button .toolbarbutton-icon, #new-window-button .toolbarbutton-icon, + #mozcn-mobile-bookmarks-button .toolbarbutton-icon, + #bookmarks-toolbar-button .toolbarbutton-icon, + #bookmarks-toolbar-placeholder .toolbarbutton-icon, #screenshot-button .toolbarbutton-icon, #tracking-protection-icon, #pageActionButton, @@ -717,7 +778,7 @@ treechildren::-moz-tree-image { #tracking-protection-icon-animatable-image, #reader-mode-button > .urlbar-icon, #star-button:not([starred]), - #context-bookmarkpage:not([starred]), + #context-bookmarkpage:not([starred]) .menu-iconic-icon, #geo-sharing-icon[sharing], .geo-icon, .blocked-permission-icon.popup-icon, #webrtc-sharing-icon[sharing="screen"], @@ -740,16 +801,32 @@ treechildren::-moz-tree-image { #identity-box[pageproxystate="valid"].localResource #identity-icon, .bookmark-item[container] .toolbarbutton-icon, .menu-iconic.bookmark-item[container] .menu-iconic-icon, - .panel-info-button > image, - .tab-icon-overlay { + .panel-info-button > image { filter: invert(60%) brightness(150%); } + .tab-icon-overlay[soundplaying] { + list-style-image: url("../icons/audio-playing-symbolic-light.svg") !important; + } + + .tab-icon-overlay[muted] { + list-style-image: url("../icons/audio-muted-symbolic-light.svg") !important; + } + #pocket-button, + #save-to-pocket-button, #pageAction-panel-pocket { list-style-image: url("../icons/save-to-pocket-light.svg") !important; } + #save-to-pocket-button[open="true"], #save-to-pocket-button[pocketed="true"] { + list-style-image: url("../icons/save-to-pocket-open-light.svg") !important; + } + + #mo-url2qr-icon { + list-style-image: url("../icons/url2qr-icon-light.svg") !important; + } + /* Tree views */ treechildren::-moz-tree-twisty, .item.client .item-twisty-container {