diff --git a/chrome/resources/content.css b/chrome/resources/content.css index 092c4e6..c5b3b06 100644 --- a/chrome/resources/content.css +++ b/chrome/resources/content.css @@ -42,14 +42,8 @@ /* about and chrome stylynh */ @-moz-document regexp("chrome:\/\/(?!devtools|browser\/content\/browser\.xhtml).*"), regexp("about:(?!blank)(?!devtools-toolbox).*") { :root { - --photon-primary-border-radius: 4px; - --photon-secondary-border-radius: 2px; --content-css: 1px; --photon-speed-1: 0.1s; - --blue-60: #0060df; - --blue-70: #003eaa; - --blue-80: #002275; - --grey-20: #ededf0; /* new color prefixed versions */ --color-blue-60: var(--blue-60) !important; --color-blue-70: var(--blue-70) !important; @@ -61,12 +55,23 @@ --checkbox-size: 20px !important; --space-xsmall: 0.2rem !important; } + * { + --blue-60: #0060df; + --blue-70: #003eaa; + --blue-80: #002275; + --grey-20: #ededf0; + --in-content-primary-button-text-color: white !important; + --in-content-primary-button-text-color-hover: white !important; + --in-content-primary-button-text-color-active: white !important; + } @media (prefers-reduced-motion) { - :root { - --photon-speed-1: 0s; - } + :root { + --photon-speed-1: 0s; + } } * { + --photon-primary-border-radius: 4px; + --photon-secondary-border-radius: 2px; --color-accent-primary: #0a84ff !important; --grey-90: rgba(12, 12, 13) !important; --brand-color-accent: #0a84ff !important; @@ -304,6 +309,38 @@ .arrowhead.up { list-style-image: url(./icons/arrow-up-12.svg) !important; } + /* screenshots-buttons */ + .screenshots-button { + border-radius: var(--photon-secondary-border-radius) !important; + } + #download > img { + content: url("./icons/download-icons.svg#arrow-with-bar") !important; + } + #copy > img { + content: url("./icons/edit-copy.svg") !important; + } + #cancel > img { + content: url("./icons/close.svg") !important; + } + #cancel { + aspect-ratio: 1; + max-width: 34px !important; + } + .chevron-icon { + background-image: url("./icons/arrow-dropdown-16.svg") !important; + scale: 1 -1; + .card-container:not([open]) & { + scale: 1; + } + } + /* context menus */ + panel-list { + border-radius: 0 !important; + background-color: var(--in-content-box-background) !important; + hr { + --border-color-interactive: color-mix(in srgb, var(--in-content-page-color) 20%, transparent) !important; + } + } @media (-moz-bool-pref: "uc.floorp") { img[src="chrome://devtools/skin/images/aboutdebugging-firefox-logo.svg"] { content: url(./icons/forks/floorp/floorp-grayscale.svg) !important; @@ -1039,6 +1076,19 @@ background-image: url("./icons/delete.svg") !important; } + /* shadow dom workaround */ + button[part="button"] { + background-image: var(--button-icon, inherit) !important; + } + panel-item[action="remove"] { + --button-icon: url("./icons/delete.svg") !important; + } + panel-item[action="report"] { + --button-icon: url("./icons/warning-16.svg") !important; + } + panel-item[checked] { + --button-icon: url("./icons/check.svg") !important; + } .disco-cta-button[action="install-addon"] { background-color: var(--in-content-primary-button-background) !important; background-image: url("./icons/add.svg") !important; @@ -1056,14 +1106,6 @@ background-color: var(--in-content-primary-button-background-active) !important; } } - /* context menus */ - panel-list { - border-radius: 0 !important; - background-color: var(--in-content-box-background) !important; - hr { - --border-color-interactive: color-mix(in srgb, var(--in-content-page-color) 20%, transparent) !important; - } - } } /* firefox view */ @@ -1158,24 +1200,18 @@ .page-nav-icon[src="chrome://browser/content/firefoxview/view-history.svg"] { content: url(./icons/history.svg); } - /* - .search-icon { - background-image: url(./icons/find-in-page.svg) !important; - fill: #939393 !important; - scale: -1 1; - } - .chevron-icon { - background-image: url(./icons/arrow-dropdown-16.svg) !important; - } - .card-container[open] .chevron-icon { - scale: 1 -1; - } #fxview-tab-row-secondary-button { - background-image: url(./icons/close-icon2.svg) !important; + --button-icon: url(./icons/close.svg) !important; &[aria-haspopup] { - background-image: url(./icons/more.svg) !important; + --button-icon: url(./icons/more.svg) !important; } - }*/ + } + #fxview-tab-row-tertiary-button { + --button-icon: url(./icons/close.svg) !important; + } + button[part="button"] { + background-image: var(--button-icon) !important; + } @media (-moz-platform: windows) { slot { diff --git a/chrome/resources/icons.css b/chrome/resources/icons.css index 49ee17d..5ecbef1 100644 --- a/chrome/resources/icons.css +++ b/chrome/resources/icons.css @@ -1496,4 +1496,11 @@ img[src="chrome://browser/skin/preferences/category-general.svg"] { #heading-wrapper .chevron-icon { background-image: url("./icons/arrow-dropdown-16.svg") !important; } +/* shadow root */ +.header-close-button { + --button-icon: url(./icons/close.svg) !important; +} +button[part="button"] { + background-image: var(--button-icon, inherit) !important; +} } \ No newline at end of file diff --git a/chrome/resources/tabs-and-urlbar.css b/chrome/resources/tabs-and-urlbar.css index 192afbe..d812ab0 100644 --- a/chrome/resources/tabs-and-urlbar.css +++ b/chrome/resources/tabs-and-urlbar.css @@ -343,7 +343,7 @@ credits to phroton for some of this stuff */ height: calc(var(--urlbar-height) - 8px); right: -1px; top: 3px; - border-right: 1px solid color-mix(in srgb, var(--toolbar-field-color) 20%, transparent); + border-right: 1px solid color-mix(in srgb, var(--toolbar-field-color, currentColor) 20%, transparent); } &:is(:hover, [open]) { padding-inline-end: calc(var(--urlbar-icon-padding) + 1px) !important; @@ -366,7 +366,7 @@ credits to phroton for some of this stuff */ display: block; translate: 6px 0px; height: calc(var(--urlbar-height) - 8px); - border-left: 1px solid color-mix(in srgb, var(--toolbar-field-color) 20%, transparent); + border-left: 1px solid color-mix(in srgb, var(--toolbar-field-color, currentColor) 20%, transparent); opacity: 0 } #identity-icon-box:not(:hover, :active, [open])::after { @@ -911,7 +911,8 @@ credits to phroton for some of this stuff */ } } moz-radio, moz-checkbox, .extension-item { - padding-inline: var(--space-xsmall); + padding-inline: 0; + padding-block: var(--space-small) !important; } /* Vertical tabs */ :root #vertical-tabs { @@ -920,6 +921,7 @@ credits to phroton for some of this stuff */ margin-inline-start: -5px !important; margin-inline-end: 0px !important; .tabbrowser-tab { + max-height: var(--tab-min-height) !important; &[selected] .tab-background { background-color: var(--button-active-bgcolor) !important; } @@ -940,7 +942,7 @@ credits to phroton for some of this stuff */ min-width: 16px !important; width: 16px !important; } - &[selected]:hover .tab-icon-image { + &[selected]:hover :is(.tab-icon-image, .tab-throbber) { opacity: 0 !important; } &[selected]:hover .tab-close-button { @@ -967,6 +969,9 @@ credits to phroton for some of this stuff */ &[pinned][selected]:hover .tab-icon-stack { position: absolute !important; } + .tab-close-button { + display: block !important; + } &:not([pinned]) .tab-icon-overlay { border-radius: var(--photon-border-radius) !important; padding: 0px !important; @@ -999,6 +1004,9 @@ credits to phroton for some of this stuff */ } #tabbrowser-arrowscrollbox { height: 100% !important; + &:not([overflowing]) tab { + overflow: hidden !important; + } } #newtab-button-container { margin-inline: auto !important; diff --git a/custom/resources/version.css b/custom/resources/version.css index a452e82..5b1004e 100644 --- a/custom/resources/version.css +++ b/custom/resources/version.css @@ -12,7 +12,7 @@ background-position: 4px 0; -moz-context-properties: fill; fill: currentColor; - content: "zapsCoolPhotonTheme v0.24.19 (webextension)"; + content: "zapsCoolPhotonTheme v0.24.20 (webextension)"; position: absolute; height: 48px; overflow: visible; diff --git a/manifest.json b/manifest.json index 4cd95a9..53c1ae2 100644 --- a/manifest.json +++ b/manifest.json @@ -3,7 +3,7 @@ "name": "__MSG_extensionName__", "short_name": "__MSG_extensionShortName__", "homepage_url": "https://github.com/zapSNH/zapsCoolPhotonTheme", - "version": "0.24.19.1", + "version": "0.24.20.1", "author": "zapsnh", "default_locale": "en", "description": "__MSG_extensionDescription__", diff --git a/updates.json b/updates.json index 610dd90..15e8c49 100644 --- a/updates.json +++ b/updates.json @@ -3,8 +3,8 @@ "coolPhotonTheme@zapsnh": { "updates": [ { - "version": "0.24.19", - "update_link": "https://github.com/zapSNH/zcpt-webextension/releases/download/v0.24.19/zapsCoolPhotonTheme-esr.xpi", + "version": "0.24.20", + "update_link": "https://github.com/zapSNH/zcpt-webextension/releases/download/v0.24.20/zapsCoolPhotonTheme-esr.xpi", "applications": { "gecko": { "strict_min_version": "128.0", @@ -13,8 +13,8 @@ } }, { - "version": "0.24.19.1", - "update_link": "https://github.com/zapSNH/zcpt-webextension/releases/download/v0.24.19/zapsCoolPhotonTheme.xpi", + "version": "0.24.20.1", + "update_link": "https://github.com/zapSNH/zcpt-webextension/releases/download/v0.24.20/zapsCoolPhotonTheme.xpi", "applications": { "gecko": { "strict_min_version": "129.0"