Fixed colors for url bar and dialogs

This commit is contained in:
Mauro Balades
2024-04-14 13:19:20 +02:00
parent a05156a0c4
commit 62fdd756b7
9 changed files with 56 additions and 16 deletions

View File

@@ -95,7 +95,7 @@ pref("alerts.showFavicons", true);
pref('zen.welcomeScreen.enabled', true); pref('zen.welcomeScreen.enabled', true);
pref('zen.welcomeScreen.seen', false); pref('zen.welcomeScreen.seen', false);
pref('zen.tabs.vertical', true); pref('zen.tabs.vertical', true);
pref('zen.theme.accent-color', "#0b57d0"); pref('zen.theme.accent-color', "#aac7ff");
// From: https://github.com/yokoffing/Betterfox // From: https://github.com/yokoffing/Betterfox

View File

@@ -1,5 +1,5 @@
diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
index 8a2a20280954eb9db144a723f477e7afc603fda3..7b2ab2815b51e8b569c0db42e231f1ee70adc30c 100644 index 8a2a20280954eb9db144a723f477e7afc603fda3..b6eb4fe9de2077420e1f750cb9662f883f95d300 100644
--- a/browser/base/content/browser.css --- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css +++ b/browser/base/content/browser.css
@@ -2,6 +2,8 @@ @@ -2,6 +2,8 @@
@@ -20,6 +20,15 @@ index 8a2a20280954eb9db144a723f477e7afc603fda3..7b2ab2815b51e8b569c0db42e231f1ee
} }
:root[uidensity=touch] .tabbrowser-tab:not([pinned]) { :root[uidensity=touch] .tabbrowser-tab:not([pinned]) {
@@ -658,7 +658,7 @@ toolbar:not(#TabsToolbar) > #personal-bookmarks {
#urlbar[usertyping] > #urlbar-input-container > #page-action-buttons > #urlbar-zoom-button,
#urlbar:not([usertyping]) > #urlbar-input-container > #urlbar-go-button,
#urlbar:not([focused]) > #urlbar-input-container > #urlbar-go-button {
- display: none;
+ display: none !important;
}
#nav-bar:not([keyNav=true]) #identity-box,
@@ -1319,13 +1319,13 @@ printpreview-pagination:focus-within, @@ -1319,13 +1319,13 @@ printpreview-pagination:focus-within,

View File

@@ -1,5 +1,5 @@
diff --git a/browser/base/content/main-popupset.inc.xhtml b/browser/base/content/main-popupset.inc.xhtml diff --git a/browser/base/content/main-popupset.inc.xhtml b/browser/base/content/main-popupset.inc.xhtml
index 4074f35ffc622d5ec44a4b4e4c766aa5ecefd9f2..df8781b76d29866fe9ba2e73ef99027619c7d013 100644 index 4074f35ffc622d5ec44a4b4e4c766aa5ecefd9f2..b308e81ea73ea1dd363fd7de6aad798ba9b27f55 100644
--- a/browser/base/content/main-popupset.inc.xhtml --- a/browser/base/content/main-popupset.inc.xhtml
+++ b/browser/base/content/main-popupset.inc.xhtml +++ b/browser/base/content/main-popupset.inc.xhtml
@@ -166,6 +166,10 @@ @@ -166,6 +166,10 @@
@@ -13,7 +13,14 @@ index 4074f35ffc622d5ec44a4b4e4c766aa5ecefd9f2..df8781b76d29866fe9ba2e73ef990276
<box class="panel-header"> <box class="panel-header">
<html:h1> <html:h1>
<html:span id="editBookmarkPanelTitle"/> <html:span id="editBookmarkPanelTitle"/>
@@ -194,6 +198,7 @@ @@ -188,12 +192,14 @@
class="footer-button"
data-l10n-id="bookmark-panel-save-button"
default="true"
+ autofocus="true"
oncommand="StarUI.panel.hidePopup();"/>
<button id="editBookmarkPanelRemoveButton"
class="footer-button"
oncommand="StarUI.removeBookmarkButtonCommand();"/> oncommand="StarUI.removeBookmarkButtonCommand();"/>
</html:moz-button-group> </html:moz-button-group>
</vbox> </vbox>

View File

@@ -1,6 +1,6 @@
const kZenColors = [ const kZenColors = [
"#2868cf", "#aac7ff",
"#74d7cb", "#74d7cb",
"#a0d490", "#a0d490",
"#dec663", "#dec663",

View File

@@ -1,8 +1,8 @@
diff --git a/browser/themes/shared/identity-block/identity-block.css b/browser/themes/shared/identity-block/identity-block.css diff --git a/browser/themes/shared/identity-block/identity-block.css b/browser/themes/shared/identity-block/identity-block.css
index 39cf7c917aa8807d491cc6a3702e398569681022..30b3801d20e785d460e06baeef063b7b10e827bc 100644 index 39cf7c917aa8807d491cc6a3702e398569681022..6e6942d97596540b0823c7934062ad2d63fa415c 100644
--- a/browser/themes/shared/identity-block/identity-block.css --- a/browser/themes/shared/identity-block/identity-block.css
+++ b/browser/themes/shared/identity-block/identity-block.css +++ b/browser/themes/shared/identity-block/identity-block.css
@@ -65,7 +65,7 @@ @@ -65,10 +65,10 @@
} }
#identity-box[pageproxystate="valid"].notSecureText > .identity-box-button, #identity-box[pageproxystate="valid"].notSecureText > .identity-box-button,
@@ -10,4 +10,8 @@ index 39cf7c917aa8807d491cc6a3702e398569681022..30b3801d20e785d460e06baeef063b7b
+#identity-box[pageproxystate="valid"] > .identity-box-button, +#identity-box[pageproxystate="valid"] > .identity-box-button,
#identity-box[pageproxystate="valid"].extensionPage > .identity-box-button, #identity-box[pageproxystate="valid"].extensionPage > .identity-box-button,
#urlbar-label-box { #urlbar-label-box {
background-color: var(--urlbar-box-bgcolor); - background-color: var(--urlbar-box-bgcolor);
+ background-color: light-dark(white, rgb(66, 65, 77));
color: var(--urlbar-box-text-color);
padding-inline: 8px;
border-radius: var(--urlbar-icon-border-radius);

View File

@@ -1,5 +1,5 @@
diff --git a/browser/themes/shared/urlbar-searchbar.css b/browser/themes/shared/urlbar-searchbar.css diff --git a/browser/themes/shared/urlbar-searchbar.css b/browser/themes/shared/urlbar-searchbar.css
index 9fc88fbde80a39989bde559ecc07b8e3094ccb7e..e4ceab446cc10d45a4c3a50e7f6323a3da36e8d4 100644 index 9fc88fbde80a39989bde559ecc07b8e3094ccb7e..170d9f31e1c0ac0c1ba3cea828d4a530e61e079b 100644
--- a/browser/themes/shared/urlbar-searchbar.css --- a/browser/themes/shared/urlbar-searchbar.css
+++ b/browser/themes/shared/urlbar-searchbar.css +++ b/browser/themes/shared/urlbar-searchbar.css
@@ -59,7 +59,7 @@ @@ -59,7 +59,7 @@
@@ -7,7 +7,7 @@ index 9fc88fbde80a39989bde559ecc07b8e3094ccb7e..e4ceab446cc10d45a4c3a50e7f6323a3
#urlbar-background, #urlbar-background,
#searchbar { #searchbar {
- background-color: var(--toolbar-field-background-color); - background-color: var(--toolbar-field-background-color);
+ background-color: var(--zen-colors-input-bg); + background-color: var(--zen-urlbar-background);
background-clip: border-box; background-clip: border-box;
border: 1px solid var(--toolbar-field-border-color); border: 1px solid var(--toolbar-field-border-color);
border-radius: var(--toolbarbutton-border-radius); border-radius: var(--toolbarbutton-border-radius);

View File

@@ -50,7 +50,17 @@
#urlbar[focused="true"] > #urlbar-background, #urlbar[focused="true"] > #urlbar-background,
#searchbar:focus-within { #searchbar:focus-within {
box-shadow: none !important; border-color: var(--urlbarView-separator-color) !important;
}
#urlbar[focused="true"] {
box-shadow: var(--panel-shadow) !important;
}
#urlbar[focused="true"] > #urlbar-background {
border-radius: 10px !important;
background: var(--zen-dialog-background) !important;
border: 1px solid transparent;
} }
#urlbar[focused="true"]:not([suppress-focus-border]) > #urlbar-background, #urlbar[focused="true"]:not([suppress-focus-border]) > #urlbar-background,

View File

@@ -8,4 +8,14 @@
xul|button { xul|button {
border-radius: var(--zen-button-border-radius) !important; border-radius: var(--zen-button-border-radius) !important;
padding: var(--zen-button-padding) !important; padding: var(--zen-button-padding) !important;
transition: .2s;
}
button:active {
transform: scale(0.97);
}
html|button {
transition: .2s;
border-radius: 10px !important;
} }

View File

@@ -16,21 +16,21 @@
*/ */
/** Primary color will be injected by the theme as `--zen-primary-color` */ /** Primary color will be injected by the theme as `--zen-primary-color` */
--zen-primary-color: #2868cf; /* This is the default blue color, in case the theme doesn't provide a primary color */ --zen-primary-color: #aac7ff; /* This is the default blue color, in case the theme doesn't provide a primary color */
/** Zen colors are generated automatically from the primary color */ /** Zen colors are generated automatically from the primary color */
--zen-colors-primary: color-mix(in srgb, var(--zen-primary-color) 50%, black 50%); --zen-colors-primary: color-mix(in srgb, var(--zen-primary-color) 50%, black 50%);
--zen-colors-secondary: color-mix(in srgb, var(--zen-primary-color) 40%, white 60%); --zen-colors-secondary: color-mix(in srgb, var(--zen-primary-color) 40%, white 60%);
--zen-colors-tertiary: color-mix(in srgb, var(--zen-primary-color) 4%, white 96%); --zen-colors-tertiary: color-mix(in srgb, var(--zen-primary-color) 7%, white 93%);
--zen-colors-hover-bg: color-mix(in srgb, var(--zen-primary-color) 90%, white 10%); --zen-colors-hover-bg: color-mix(in srgb, var(--zen-primary-color) 90%, white 10%);
--zen-colors-primary-foreground: color-mix(in srgb, var(--zen-primary-color) 80%, black 20%); --zen-colors-primary-foreground: color-mix(in srgb, var(--zen-primary-color) 80%, black 20%);
--zen-colors-border: color-mix(in srgb, var(--zen-colors-secondary) 40%, black 60%); --zen-colors-border: color-mix(in srgb, var(--zen-colors-secondary) 40%, black 60%);
--zen-colors-shadow-color: color-mix(in srgb, var(--zen-primary-color) 30%, white 70%); --zen-colors-input-bg: color-mix(in srgb, var(--zen-primary-color) 10%, white 80%);
--zen-colors-input-bg: color-mix(in srgb, var(--zen-primary-color) 10%, white 90%);
--zen-dialog-background: color-mix(in srgb, var(--zen-primary-color) 1.5%, white 98.5%); --zen-dialog-background: var(--zen-colors-tertiary);
--zen-urlbar-background: color-mix(in srgb, var(--zen-primary-color) 8%, #f1f1f1 92%);
--in-content-primary-button-background: var(--zen-primary-color) !important; --in-content-primary-button-background: var(--zen-primary-color) !important;
--in-content-primary-button-background-hover: var(--zen-colors-hover-bg) !important; --in-content-primary-button-background-hover: var(--zen-colors-hover-bg) !important;