From e96e1e20c6fc2a9b49481e6f029bbc1f681ebd02 Mon Sep 17 00:00:00 2001 From: winston Date: Sat, 22 Jul 2023 20:43:19 +0200 Subject: [PATCH 1/4] feat(substack): init feat: tweaks, style quote chore: add substack screenshots --- src/userstyles.yml | 6 + styles/substack/assets/catwalk.webp | 3 + styles/substack/assets/frappe.webp | 3 + styles/substack/assets/latte.webp | 3 + styles/substack/assets/macchiato.webp | 3 + styles/substack/assets/mocha.webp | 3 + styles/substack/catppuccin.user.css | 169 ++++++++++++++++++++++++++ 7 files changed, 190 insertions(+) create mode 100644 styles/substack/assets/catwalk.webp create mode 100644 styles/substack/assets/frappe.webp create mode 100644 styles/substack/assets/latte.webp create mode 100644 styles/substack/assets/macchiato.webp create mode 100644 styles/substack/assets/mocha.webp create mode 100644 styles/substack/catppuccin.user.css diff --git a/src/userstyles.yml b/src/userstyles.yml index dd44b7a1b2..acfb482f50 100644 --- a/src/userstyles.yml +++ b/src/userstyles.yml @@ -293,6 +293,12 @@ userstyles: readme: app-link: "https://github.com/searxng/searxng" current-maintainers: [*sekki21956, *ryanccn] + substack: + name: Substack + category: social + readme: + app-link: "https://substack.com" + current-maintainers: [*winston] tutanota: name: Tutanota category: productivity diff --git a/styles/substack/assets/catwalk.webp b/styles/substack/assets/catwalk.webp new file mode 100644 index 0000000000..1adaf78924 --- /dev/null +++ b/styles/substack/assets/catwalk.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:52fda383e12dad2144db0ad3174bd090648363616f5bb1d4437140b56325d563 +size 447910 diff --git a/styles/substack/assets/frappe.webp b/styles/substack/assets/frappe.webp new file mode 100644 index 0000000000..57c11f19e2 --- /dev/null +++ b/styles/substack/assets/frappe.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b780d19422592f9449ded1480c22905cb029e80effc65897ce9196e33a769994 +size 399696 diff --git a/styles/substack/assets/latte.webp b/styles/substack/assets/latte.webp new file mode 100644 index 0000000000..aff778d655 --- /dev/null +++ b/styles/substack/assets/latte.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:32d1bc0e7a3fa1d833e4ac390d47322368eb9e386bb75d8fc33e4f14c5f55468 +size 404206 diff --git a/styles/substack/assets/macchiato.webp b/styles/substack/assets/macchiato.webp new file mode 100644 index 0000000000..11196c2849 --- /dev/null +++ b/styles/substack/assets/macchiato.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:975aaccf87e7445506b1ae6469744625eeb6d79b92c9eae0ca05f671c1c76697 +size 412160 diff --git a/styles/substack/assets/mocha.webp b/styles/substack/assets/mocha.webp new file mode 100644 index 0000000000..48f2aab1bd --- /dev/null +++ b/styles/substack/assets/mocha.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:79c82f2cfa8872c6eb4ab673a89fea2f210ba0acd038ce2e875c04e2c5ddcd9a +size 406730 diff --git a/styles/substack/catppuccin.user.css b/styles/substack/catppuccin.user.css new file mode 100644 index 0000000000..7c2d40f345 --- /dev/null +++ b/styles/substack/catppuccin.user.css @@ -0,0 +1,169 @@ +/* ==UserStyle== +@name Substack Catppuccin +@namespace github.com/catppuccin/userstyles/styles/substack +@homepageURL https://github.com/catppuccin/userstyles/tree/main/styles/substack +@version 0.0.0 +@description Soothing pastel theme for Substack +@updateURL https://github.com/catppuccin/userstyles/raw/main/styles/substack/catppuccin.user.css +@author Catppuccin +@license MIT +@preprocessor less + +@var select lightFlavor "Light Flavor" ["latte:Latte*", "frappe:Frappé", "macchiato:Macchiato", "mocha:Mocha"] +@var select darkFlavor "Dark Flavor" ["latte:Latte", "frappe:Frappé", "macchiato:Macchiato", "mocha:Mocha*"] +@var select accentColor "Accent" ["rosewater:Rosewater", "flamingo:Flamingo", "pink:Pink", "mauve:Mauve", "red:Red", "maroon:Maroon", "peach:Peach", "yellow:Yellow", "green:Green", "teal:Teal", "blue:Blue", "sapphire:Sapphire*", "sky:Sky", "lavender:Lavender", "subtext0:Gray"] +==/UserStyle== */ +@-moz-document regexp("https:\/\/(.+\.)?substack.com/.*") { + #catppuccin(@lookup, @accent) { + @rosewater: @catppuccin[@@lookup][@rosewater]; + @flamingo: @catppuccin[@@lookup][@flamingo]; + @pink: @catppuccin[@@lookup][@pink]; + @mauve: @catppuccin[@@lookup][@mauve]; + @red: @catppuccin[@@lookup][@red]; + @maroon: @catppuccin[@@lookup][@maroon]; + @peach: @catppuccin[@@lookup][@peach]; + @yellow: @catppuccin[@@lookup][@yellow]; + @green: @catppuccin[@@lookup][@green]; + @teal: @catppuccin[@@lookup][@teal]; + @sky: @catppuccin[@@lookup][@sky]; + @sapphire: @catppuccin[@@lookup][@sapphire]; + @blue: @catppuccin[@@lookup][@blue]; + @lavender: @catppuccin[@@lookup][@lavender]; + @text: @catppuccin[@@lookup][@text]; + @subtext1: @catppuccin[@@lookup][@subtext1]; + @subtext0: @catppuccin[@@lookup][@subtext0]; + @overlay2: @catppuccin[@@lookup][@overlay2]; + @overlay1: @catppuccin[@@lookup][@overlay1]; + @overlay0: @catppuccin[@@lookup][@overlay0]; + @surface2: @catppuccin[@@lookup][@surface2]; + @surface1: @catppuccin[@@lookup][@surface1]; + @surface0: @catppuccin[@@lookup][@surface0]; + @base: @catppuccin[@@lookup][@base]; + @mantle: @catppuccin[@@lookup][@mantle]; + @crust: @catppuccin[@@lookup][@crust]; + @accentColor: @catppuccin[@@lookup][@@accent]; + @linkColor: @accentColor; + @linkHover: if( + @lookup=latte, + darken(@accentColor, 5%), + lighten(@accentColor, 5%) + ); + + html { + background-color: @base !important; + } + + :root, + .dark-mode { + --color-primary: @text; + --color-secondary: @subtext0; + --color-bg-primary: @base; + --web_bg_color: @base; + --color-bg-primary-hover: mix(@surface0, @base, 50%); + --color-bg-secondary: @mantle; + --color-bg-tertiary: @crust; + --color-dark-bg-tertiary: @crust; + --color-dark-primary: @text; + --color-bg-elevated: @surface0; + --color-bg-elevated-hover: mix(@surface1, @surface0, 50%); + --color-accent-themed: @accentColor; + --color-bg-secondary-opacity: @surface0; + --color-bg-secondary-themed: @surface0; + --color-accent-inverse-themed: @crust; + --color-light-bg-primary: @crust; + --color-accent-primary: @accentColor; + --color-accent-substack: @accentColor; + --color-accent-blue: @blue; + --color-accent-red: @red; + --color-accent-purple: @mauve; + --color-accent-facebook: @blue; + --color-light-bg-primary: @crust; + --color-accent-error: @red; + --color-detail: @surface1; + --color-dark-bg-primary: @mantle; + + // subdomains + --print_on_web_bg_color: @text; + --color-secondary-themed: @subtext0; + --print_secondary_on_web_bg_color: @subtext0; + --background_pop: @peach; + --print_pop: @peach; + --print_on_pop: @crust; + --print_secondary: @subtext0; + --web_bg_color: @base; + --color-tertiary: @crust; + --background_contrast_1: @crust; + --background_contrast_2: mix(@crust, @mantle, 50%); + --background_contrast_3: @mantle; + --background_contrast_4: mix(@mantle, @base, 33%); + --background_contrast_5: mix(@mantle, @base, 66%); + --color_theme_bg_contrast_1: @surface0; + --color_theme_bg_contrast_2: mix(@surface0, @surface1, 50%); + --color_theme_bg_contrast_3: @surface1; + --color_theme_bg_contrast_4: mix(@surface1, @surface2, 50%); + --color_theme_bg_contrast_5: @surface2; + + // used for podcast play controls + --color_theme_bg_pop_rgb: #rgbify(@accentColor) []; + --color_theme_print_on_pop: @crust; + + --color-bg-primary-rgb: #rgbify(@surface0) []; + } + + // brand colors in SVGs + // Substack orange + *[stroke="#ff6719"], + *[stroke="#FF6719"] { + stroke: @peach !important; + } + *[fill="#ff6719"], + *[fill="#FF6719"] { + fill: @peach !important; + } + + .footer-wrap .footer .footer-substack-cta { + background-color: @base; + } + + .reader-nav-top.pinned { + background-color: rgba(#rgbify(@base) [], 85%); + backdrop-filter: var(--glass); + } + + // toggle switches + .tailwind-preflight button span { + background-color: @base !important; + } + + // restack quote popup + div[class*="frontend-components-selection_popover-module"] { + * { + color: @text !important; + background: @base !important; + border-color: @surface0 !important; + stroke: @text !important; + } + } + } + + @media (prefers-color-scheme: dark) { + #catppuccin(@darkFlavor, @accentColor); + } + @media (prefers-color-scheme: light) { + #catppuccin(@lightFlavor, @accentColor); + } + + #rgbify(@color) { + @rgb-raw: red(@color), green(@color), blue(@color); + } + + // prettier-ignore + @catppuccin: { + @latte: { @rosewater: #dc8a78; @flamingo: #dd7878; @pink: #ea76cb; @mauve: #8839ef; @red: #d20f39; @maroon: #e64553; @peach: #fe640b; @yellow: #df8e1d; @green: #40a02b; @teal: #179299; @sky: #04a5e5; @sapphire: #209fb5; @blue: #1e66f5; @lavender: #7287fd; @text: #4c4f69; @subtext1: #5c5f77; @subtext0: #6c6f85; @overlay2: #7c7f93; @overlay1: #8c8fa1; @overlay0: #9ca0b0; @surface2: #acb0be; @surface1: #bcc0cc; @surface0: #ccd0da; @base: #eff1f5; @mantle: #e6e9ef; @crust: #dce0e8; }; + @frappe: { @rosewater: #f2d5cf; @flamingo: #eebebe; @pink: #f4b8e4; @mauve: #ca9ee6; @red: #e78284; @maroon: #ea999c; @peach: #ef9f76; @yellow: #e5c890; @green: #a6d189; @teal: #81c8be; @sky: #99d1db; @sapphire: #85c1dc; @blue: #8caaee; @lavender: #babbf1; @text: #c6d0f5; @subtext1: #b5bfe2; @subtext0: #a5adce; @overlay2: #949cbb; @overlay1: #838ba7; @overlay0: #737994; @surface2: #626880; @surface1: #51576d; @surface0: #414559; @base: #303446; @mantle: #292c3c; @crust: #232634; }; + @macchiato: { @rosewater: #f4dbd6; @flamingo: #f0c6c6; @pink: #f5bde6; @mauve: #c6a0f6; @red: #ed8796; @maroon: #ee99a0; @peach: #f5a97f; @yellow: #eed49f; @green: #a6da95; @teal: #8bd5ca; @sky: #91d7e3; @sapphire: #7dc4e4; @blue: #8aadf4; @lavender: #b7bdf8; @text: #cad3f5; @subtext1: #b8c0e0; @subtext0: #a5adcb; @overlay2: #939ab7; @overlay1: #8087a2; @overlay0: #6e738d; @surface2: #5b6078; @surface1: #494d64; @surface0: #363a4f; @base: #24273a; @mantle: #1e2030; @crust: #181926; }; + @mocha: { @rosewater: #f5e0dc; @flamingo: #f2cdcd; @pink: #f5c2e7; @mauve: #cba6f7; @red: #f38ba8; @maroon: #eba0ac; @peach: #fab387; @yellow: #f9e2af; @green: #a6e3a1; @teal: #94e2d5; @sky: #89dceb; @sapphire: #74c7ec; @blue: #89b4fa; @lavender: #b4befe; @text: #cdd6f4; @subtext1: #bac2de; @subtext0: #a6adc8; @overlay2: #9399b2; @overlay1: #7f849c; @overlay0: #6c7086; @surface2: #585b70; @surface1: #45475a; @surface0: #313244; @base: #1e1e2e; @mantle: #181825; @crust: #11111b; }; + } +} + +// vim:ft=less From 5d83cdde05ff0b0c527ec051e83e3ece845f2f9d Mon Sep 17 00:00:00 2001 From: winston Date: Mon, 24 Jul 2023 11:05:36 +0200 Subject: [PATCH 2/4] fix(substack): bg-primary-rgb same as hex --- styles/substack/catppuccin.user.css | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/styles/substack/catppuccin.user.css b/styles/substack/catppuccin.user.css index 7c2d40f345..4176636da0 100644 --- a/styles/substack/catppuccin.user.css +++ b/styles/substack/catppuccin.user.css @@ -2,13 +2,13 @@ @name Substack Catppuccin @namespace github.com/catppuccin/userstyles/styles/substack @homepageURL https://github.com/catppuccin/userstyles/tree/main/styles/substack -@version 0.0.0 +@version 0.1.0 @description Soothing pastel theme for Substack @updateURL https://github.com/catppuccin/userstyles/raw/main/styles/substack/catppuccin.user.css @author Catppuccin @license MIT -@preprocessor less +@preprocessor less @var select lightFlavor "Light Flavor" ["latte:Latte*", "frappe:Frappé", "macchiato:Macchiato", "mocha:Mocha"] @var select darkFlavor "Dark Flavor" ["latte:Latte", "frappe:Frappé", "macchiato:Macchiato", "mocha:Mocha*"] @var select accentColor "Accent" ["rosewater:Rosewater", "flamingo:Flamingo", "pink:Pink", "mauve:Mauve", "red:Red", "maroon:Maroon", "peach:Peach", "yellow:Yellow", "green:Green", "teal:Teal", "blue:Blue", "sapphire:Sapphire*", "sky:Sky", "lavender:Lavender", "subtext0:Gray"] @@ -58,6 +58,7 @@ --color-primary: @text; --color-secondary: @subtext0; --color-bg-primary: @base; + --color-bg-primary-rgb: #rgbify(@base) []; --web_bg_color: @base; --color-bg-primary-hover: mix(@surface0, @base, 50%); --color-bg-secondary: @mantle; @@ -106,8 +107,6 @@ // used for podcast play controls --color_theme_bg_pop_rgb: #rgbify(@accentColor) []; --color_theme_print_on_pop: @crust; - - --color-bg-primary-rgb: #rgbify(@surface0) []; } // brand colors in SVGs From 579a78d005a3b2eb9fdc779f314d4489a67e53fe Mon Sep 17 00:00:00 2001 From: winston Date: Mon, 24 Jul 2023 11:20:41 +0200 Subject: [PATCH 3/4] chore(substack): update assets --- styles/substack/assets/catwalk.webp | 4 ++-- styles/substack/assets/frappe.webp | 4 ++-- styles/substack/assets/latte.webp | 4 ++-- styles/substack/assets/macchiato.webp | 4 ++-- styles/substack/assets/mocha.webp | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/styles/substack/assets/catwalk.webp b/styles/substack/assets/catwalk.webp index 1adaf78924..6c4cafae26 100644 --- a/styles/substack/assets/catwalk.webp +++ b/styles/substack/assets/catwalk.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:52fda383e12dad2144db0ad3174bd090648363616f5bb1d4437140b56325d563 -size 447910 +oid sha256:938ff1118859e61e4034c4a3dd753d0a52d12b5e627ffa6caf0d1695c3c64837 +size 447708 diff --git a/styles/substack/assets/frappe.webp b/styles/substack/assets/frappe.webp index 57c11f19e2..ecfe7fddba 100644 --- a/styles/substack/assets/frappe.webp +++ b/styles/substack/assets/frappe.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b780d19422592f9449ded1480c22905cb029e80effc65897ce9196e33a769994 -size 399696 +oid sha256:0d102511135ceee31e8834f301720740fd8c49501415579e21cd8307e8da8dd8 +size 398320 diff --git a/styles/substack/assets/latte.webp b/styles/substack/assets/latte.webp index aff778d655..0bf266f294 100644 --- a/styles/substack/assets/latte.webp +++ b/styles/substack/assets/latte.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:32d1bc0e7a3fa1d833e4ac390d47322368eb9e386bb75d8fc33e4f14c5f55468 -size 404206 +oid sha256:58da45e27abbed50db07f8fce9d406b4ded3d436c28a9cead3aead3f1a12a2c1 +size 404810 diff --git a/styles/substack/assets/macchiato.webp b/styles/substack/assets/macchiato.webp index 11196c2849..6a0484b7dc 100644 --- a/styles/substack/assets/macchiato.webp +++ b/styles/substack/assets/macchiato.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:975aaccf87e7445506b1ae6469744625eeb6d79b92c9eae0ca05f671c1c76697 -size 412160 +oid sha256:38f19104d501b2ed56bfcbc0f22f08a4bd7bc783625b0c50540b524dde49c54c +size 411350 diff --git a/styles/substack/assets/mocha.webp b/styles/substack/assets/mocha.webp index 48f2aab1bd..16d32085b4 100644 --- a/styles/substack/assets/mocha.webp +++ b/styles/substack/assets/mocha.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:79c82f2cfa8872c6eb4ab673a89fea2f210ba0acd038ce2e875c04e2c5ddcd9a -size 406730 +oid sha256:c3f2be5053c8ad4645ae2eda6355965728e5c449935c1510554bbedf534d6df9 +size 405736 From f934cb41025f0f6803a9999d2548005efb00924b Mon Sep 17 00:00:00 2001 From: winston Date: Mon, 24 Jul 2023 11:25:03 +0200 Subject: [PATCH 4/4] refactor(substack): accentColor shenanigans --- styles/substack/catppuccin.user.css | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/styles/substack/catppuccin.user.css b/styles/substack/catppuccin.user.css index 4176636da0..010bb4a86c 100644 --- a/styles/substack/catppuccin.user.css +++ b/styles/substack/catppuccin.user.css @@ -14,7 +14,7 @@ @var select accentColor "Accent" ["rosewater:Rosewater", "flamingo:Flamingo", "pink:Pink", "mauve:Mauve", "red:Red", "maroon:Maroon", "peach:Peach", "yellow:Yellow", "green:Green", "teal:Teal", "blue:Blue", "sapphire:Sapphire*", "sky:Sky", "lavender:Lavender", "subtext0:Gray"] ==/UserStyle== */ @-moz-document regexp("https:\/\/(.+\.)?substack.com/.*") { - #catppuccin(@lookup, @accent) { + #catppuccin(@lookup, @accent-color) { @rosewater: @catppuccin[@@lookup][@rosewater]; @flamingo: @catppuccin[@@lookup][@flamingo]; @pink: @catppuccin[@@lookup][@pink]; @@ -41,13 +41,7 @@ @base: @catppuccin[@@lookup][@base]; @mantle: @catppuccin[@@lookup][@mantle]; @crust: @catppuccin[@@lookup][@crust]; - @accentColor: @catppuccin[@@lookup][@@accent]; - @linkColor: @accentColor; - @linkHover: if( - @lookup=latte, - darken(@accentColor, 5%), - lighten(@accentColor, 5%) - ); + @accent: @catppuccin[@@lookup][@@accent-color]; html { background-color: @base !important; @@ -67,13 +61,13 @@ --color-dark-primary: @text; --color-bg-elevated: @surface0; --color-bg-elevated-hover: mix(@surface1, @surface0, 50%); - --color-accent-themed: @accentColor; + --color-accent-themed: @accent; --color-bg-secondary-opacity: @surface0; --color-bg-secondary-themed: @surface0; --color-accent-inverse-themed: @crust; --color-light-bg-primary: @crust; - --color-accent-primary: @accentColor; - --color-accent-substack: @accentColor; + --color-accent-primary: @accent; + --color-accent-substack: @accent; --color-accent-blue: @blue; --color-accent-red: @red; --color-accent-purple: @mauve; @@ -105,7 +99,7 @@ --color_theme_bg_contrast_5: @surface2; // used for podcast play controls - --color_theme_bg_pop_rgb: #rgbify(@accentColor) []; + --color_theme_bg_pop_rgb: #rgbify(@accent) []; --color_theme_print_on_pop: @crust; }