From a00371bceb0a58b6dca4ced83ab7cfd263962296 Mon Sep 17 00:00:00 2001
From: uncenter <47499684+uncenter@users.noreply.github.com>
Date: Sun, 24 Mar 2024 13:32:55 -0400
Subject: [PATCH 01/82] fix(twitch): chat paused button (#707)
---
styles/twitch/catppuccin.user.css | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/styles/twitch/catppuccin.user.css b/styles/twitch/catppuccin.user.css
index 33aa1a26b1..10b1222c99 100644
--- a/styles/twitch/catppuccin.user.css
+++ b/styles/twitch/catppuccin.user.css
@@ -2,7 +2,7 @@
@name Twitch Catppuccin
@namespace github.com/catppuccin/userstyles/styles/twitch
@homepageURL https://github.com/catppuccin/userstyles/tree/main/styles/twitch
-@version 1.1.19
+@version 1.1.20
@updateURL https://github.com/catppuccin/userstyles/raw/main/styles/twitch/catppuccin.user.css
@supportURL https://github.com/catppuccin/userstyles/issues?q=is%3Aopen+is%3Aissue+label%3Atwitch
@description Soothing pastel theme for Twitch
@@ -593,6 +593,9 @@
--color-text-tooltip: @base !important;
--color-background-tooltip: @text !important;
--color-hinted-grey-2: @surface0;
+ --color-background-overlay-alt: @mantle;
+ --color-background-button-overlay-text-hover: @crust;
+ --color-border-overlay: @surface0;
}
}
}
From ce9ec080e431d687f2187a39d66096c8e28e4090 Mon Sep 17 00:00:00 2001
From: "Gen :)"
Date: Sun, 24 Mar 2024 13:26:21 -0700
Subject: [PATCH 02/82] fix(instagram): assorted fixes (#699)
fix(instagram): assorted fixes (you're all caught up checkbox, story progress bar, dm message timestamp and more)
---
styles/instagram/catppuccin.user.css | 260 +++++++++++++++------------
1 file changed, 145 insertions(+), 115 deletions(-)
diff --git a/styles/instagram/catppuccin.user.css b/styles/instagram/catppuccin.user.css
index 21095191f9..6f0d257713 100644
--- a/styles/instagram/catppuccin.user.css
+++ b/styles/instagram/catppuccin.user.css
@@ -2,7 +2,7 @@
@name Instagram Catppuccin
@namespace github.com/catppuccin/userstyles/styles/instagram
@homepageURL https://github.com/catppuccin/userstyles/tree/main/styles/instagram
-@version 0.1.9
+@version 0.2.0
@updateURL https://github.com/catppuccin/userstyles/raw/main/styles/instagram/catppuccin.user.css
@supportURL https://github.com/catppuccin/userstyles/issues?q=is%3Aopen+is%3Aissue+label%3Ainstagram
@description Soothing pastel theme for Instagram
@@ -13,23 +13,18 @@
@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"]
-
-@var text scrollbar_width "Scrollbar width" 8px
==/UserStyle== */
@-moz-document domain('instagram.com') {
- @rgb-raw: red;
#rgbify(@color) {
@rgb-raw: red(@color), green(@color), blue(@color);
}
-
._aa4d {
#catppuccin(@darkFlavor, @accentColor);
}
._aa4c {
#catppuccin(@lightFlavor, @accentColor);
}
-
#catppuccin(@lookup, @accent) {
@rosewater: @catppuccin[@@lookup][@rosewater];
@flamingo: @catppuccin[@@lookup][@flamingo];
@@ -58,72 +53,62 @@
@mantle: @catppuccin[@@lookup][@mantle];
@crust: @catppuccin[@@lookup][@crust];
@accent-color: @catppuccin[@@lookup][@@accent];
+ @text-filter: @catppuccin[@@lookup][@text-filter];
+ @dark-color: if(@lookup = latte, @text, @crust);
+ @light-color: if(@lookup = latte, @crust, @text);
+
+ --web-always-black: #rgbify(@dark-color) [];
+ --web-always-white: #rgbify(@light-color) [];
+ --always-white: #rgbify(@light-color) [];
+ --overlay-alpha-80: fadeout(@dark-color, 50);
+ --always-dark-overlay: fadeout(@surface0, 50);
+ --grey-9: #rgbify(@text) [];
+ --ig-primary-background: #rgbify(@base) [];
+ --ig-secondary-background: #rgbify(@surface0) [];
+ --ig-banner-background: #rgbify(@crust) [];
+ --ig-highlight-background: #rgbify(@surface0) [];
+ --ig-elevated-background: #rgbify(@crust) [];
+ --ig-elevated-highlight-background: #rgbify(@surface0) [];
+ --ig-hover-overlay: #rgbify(@text) [], 0.1;
+ --hover-overlay: fadeout(@surface0, 80);
+ --ig-text-on-color: #rgbify(@crust) [];
+ --ig-badge: #rgbify(@accent-color) [];
+ --ig-primary-button: #rgbify(@accent-color) [];
+ --ig-primary-button-hover: fadeout(@accent-color, 20);
+ --ig-secondary-button-background: #rgbify(@surface0) [];
+ --ig-secondary-button-hover: #rgbify(@surface1) [];
+ --ig-secondary-button: #rgbify(@text) [];
+ --ig-primary-text: #rgbify(@text) [];
+ --ig-secondary-text: #rgbify(@subtext0) [];
+ --ig-tertiary-text: #rgbify(@subtext0) [];
+ --wbloks-primary-text: @text;
+ --ig-text-on-media: #rgbify(@text) [];
+ --ig-separator: #rgbify(@surface0) [];
+ --chat-admin-text-color: #rgbify (@subtext0) [];
+ --ig-elevated-separator: #rgbify(@surface0) [];
+ --post-separator: #rgbify(@overlay0) [];
+ --ig-stroke: #rgbify(@overlay0) [];
+ --grey-2: #rgbify(@overlay0) [];
+ --ig-link: #rgbify(@accent-color) [];
+ --ig-error-or-destructive: #rgbify(@maroon) [];
+ --ig-success: #rgbify(@green) [];
+ --blue-2: #rgbify(@blue) [];
+ --ig-close-friends-refreshed: #rgbify(@green) [];
+ --ig-text-input-border-hover-prism: #rgbify(@surface1) [];
+ scrollbar-color: @accent-color @crust;
- @text_filter: @catppuccin[@@lookup][@text_filter];
- @dark_color: if(@lookup=latte, @text, @crust);
- @light_color: if(@lookup=latte, @crust, @text);
-
- * {
- --web-always-black: #rgbify(@dark_color) [];
- --web-always-white: #rgbify(@light_color) [];
- --always-white: #rgbify(@light_color) [];
- --overlay-alpha-80: fadeout(@dark_color, 50);
- --always-dark-overlay: fadeout(@surface0, 50);
-
- --ig-primary-background: #rgbify(@base) [];
- --ig-secondary-background: #rgbify(@surface0) [];
- --ig-banner-background: #rgbify(@crust) [];
- --ig-highlight-background: #rgbify(@surface0) [];
- --ig-elevated-background: #rgbify(@crust) [];
- --ig-elevated-highlight-background: #rgbify(@surface0) [];
- --ig-hover-overlay: fadeout(@surface0, 50);
- --hover-overlay: fadeout(@surface0, 80);
-
- --ig-text-on-color: #rgbify(@crust) [];
-
- --ig-badge: #rgbify(@accent-color) [];
-
- --ig-primary-button: #rgbify(@accent-color) [];
- --ig-primary-button-hover: fadeout(@accent-color, 20);
-
- --ig-secondary-button-background: #rgbify(@surface0) [];
- --ig-secondary-button-hover: #rgbify(@surface1) [];
- --ig-secondary-button: #rgbify(@text) [];
-
- --ig-primary-text: #rgbify(@text) [];
- --ig-secondary-text: #rgbify(@subtext0) [];
- --ig-tertiary-text: #rgbify(@subtext0) [];
- --wbloks-primary-text: @text;
- --ig-text-on-media: #rgbify(@text) [];
-
- --ig-separator: #rgbify(@overlay0) [];
- --post-separator: #rgbify(@overlay0) [];
- --ig-elevated-separator: #rgbify(@overlay0) [];
- --ig-stroke: #rgbify(@overlay0) [];
- --grey-2: #rgbify(@overlay0) [];
-
- --ig-link: #rgbify(@accent-color) [];
- --ig-error-or-destructive: #rgbify(@maroon) [];
- --ig-success: #rgbify(@green) [];
- --blue-2: #rgbify(@blue) [];
-
- --ig-text-input-border-hover-prism: #rgbify(@surface1) [];
-
- scrollbar-width: none;
- scrollbar-color: @accent-color @crust;
- }
//placehoder textcolor
.xh8yej3 {
color: @subtext0 !important;
}
// Text selection
*::selection {
- color: @dark_color;
+ color: @dark-color;
background-color: @accent-color;
- } // Sidebar
+ }
+ /* Sidebar */
.x1xgvd2v {
background-color: @crust !important;
-
&[style="transform: translateX(0px);"] {
background-color: @mantle !important;
}
@@ -135,28 +120,35 @@
stroke: @text;
}
- // Posts
+ /* story progress bar */
+ ._ac3p {
+ background-color: @accent-color !important;
+ }
+
+ /* Posts */
._aggc {
background-color: @mantle;
border-color: @overlay0 !important;
border-radius: var(--modal-border-radius);
- box-shadow: 0 3px 5px -1px fadeout(@dark_color, 20);
+ box-shadow: 0 3px 5px -1px fadeout(@dark-color, 20);
box-sizing: border-box;
}
-
._aatc ._aasi,
._ae1i,
._aggc textarea.xvbhtw8 {
background-color: @mantle;
- } // Icons
+ }
+
+ /* Icons */
svg {
color: @text;
fill: @text;
}
-
svg[aria-label="Unlike"] {
fill: @accent-color;
- } // The close icon on the dark wrapper
+ }
+
+ /* The close icon on the dark wrapper */
svg[aria-label="Close"] {
color: var(--web-always-white);
}
@@ -164,7 +156,7 @@
fill: @accent-color;
}
- //Share box
+ /* Share box */
.xzloghq {
background-color: @blue;
&:hover {
@@ -174,20 +166,18 @@
}
.xk5f4mz {
background-color: @mantle;
-
&:hover {
background-color: @accent-color;
}
}
.x3nfvp2 {
- color: @text;
+ color: @text !important;
&:hover {
- color: @mantle;
+ color: @crust;
}
}
- //all toggle sliders
-
+ /* Toggle sliders */
.x1r7x56h {
background-color: @accent-color;
}
@@ -200,19 +190,14 @@
.x1psfjxj {
background-color: @text;
}
-
span[data-bloks-name="bk.components.TextSpan"] {
color: @accent-color !important;
}
-
- // Log In With Facebook text
+ /* Log In With Facebook text */
._ab37 {
color: @blue;
}
-
- // Excluded:
- // - _9ys7, _9_1f, _9ys8 (verified icon)
-
+ /* Excluded: - _9ys7, _9_1f, _9ys8 (verified icon) */
[style*='background-image: url("https://static.cdninstagram.com/rsrc.php/v3/y4/r/ewSyA8IItw_.png")'],
._9zkj,
._a3ds,
@@ -494,8 +479,10 @@
._9_1l,
._9_1m,
._a9pw {
- filter: @text_filter;
- } // Custom icons
+ filter: @text-filter;
+ }
+
+ /* Custom icons */
@instagram_gradient: radial-gradient(
circle at 30% 107%,
@yellow 0%,
@@ -504,17 +491,30 @@
@mauve 60%,
@blue 90%
);
+ /* "All caught up" icon */
+ img[src="/images/instagram/xig/web/illo-confirm-refresh-light.png"] {
+ @svg: escape(
+ ' '
+ );
+ height: 0 !important;
+ width: 0 !important;
+ padding-left: 96px !important;
+ padding-top: 96px !important;
+ background: url("data:image/svg+xml,@{svg}") no-repeat !important;
+ }
[style*='background-image: url("https://static.cdninstagram.com/rsrc.php/v3/y4/r/ewSyA8IItw_.png")']
{
- // No photo icon
+ /* No photo icon */
&[style*="background-position: 0px -97px"] {
filter: none;
background: @mauve !important;
background: @instagram_gradient !important;
mask-image: url("https://static.cdninstagram.com/rsrc.php/v3/y4/r/ewSyA8IItw_.png");
mask-position: 0 -97px;
- } // Private page icon
+ }
+
+ /* Private page icon */
&[style*="background-position: -49px -97px"] {
filter: none;
background: @mauve !important;
@@ -530,18 +530,28 @@
mask-image: url("https://static.cdninstagram.com/rsrc.php/v3/y4/r/ewSyA8IItw_.png");
mask-position: -49px 0;
}
- } // Post swipe icons
+ }
+
+ /* Post swipe icons */
._aaqh {
background-color: @surface0;
- } // Inside primary buttons
+ }
+
+ /* Inside primary buttons */
.xzloghq,
._acas:not(._acao) {
&,
svg {
- color: @base;
- fill: @base;
+ color: @crust !important;
+ fill: @mantle;
}
- } // Secondary buttons
+ }
+ ._acas:not(._acao):hover {
+ background-color: @surface0 !important;
+ color: @accent-color !important;
+ }
+
+ /* Secondary buttons */
.x1gjpkn9,
._acat,
._acap {
@@ -553,23 +563,27 @@
}
}
}
- // Profile banner
+
+ /* Profile banner */
div:has(> .x1mu97ne) {
background-color: @crust;
border-color: @overlay0;
- box-shadow: 0 10px 35px 2px fadeout(@dark_color, 0.7);
+ box-shadow: 0 10px 35px 2px fadeout(@dark-color, 0.7);
}
- // Dialog overlay
+
+ /* Dialog overlay */
.x7r02ix[role="dialog"] {
- box-shadow: 0 5px 10px 0 fadeout(@dark_color, 0.5);
+ box-shadow: 0 5px 10px 0 fadeout(@dark-color, 0.5);
}
- // Input placeholders
+
+ /* Input placeholders */
._ac4d::placeholder,
._aauy::placeholder,
textarea::placeholder {
color: @subtext0;
}
- // Settings
+
+ /* Settings */
._ab81 {
background-color: @mantle;
}
@@ -579,28 +593,32 @@
._aav4 {
background-color: @crust;
}
- // Bloks
+
+ /* Bloks */
.wbloks_1[data-bloks-name="bk.components.Collection"] {
background-color: @base !important;
}
div[data-bloks-name="bk.components.Flexbox"],
.wbloks_1[data-bloks-name="bk.components.Flexbox"] {
- // Radios have left padding
+ /* Radios have left padding */
padding-left: 0 !important;
- // The heading
+
+ /* The heading */
&[style*="background: rgb(0\, 0\, 0)"],
&[style*="background: rgb(255\, 255\, 255)"] {
background-color: @base !important;
}
- // Radios
+
+ /* Radios */
&[style*="border-radius: 10.5px"],
&[style*="border-radius: 12px"],
&[style*="border-radius: 4px"] {
- // Selected radio
+ /* Selected radio */
&[style*="background: rgb(0\, 149\, 246)"] {
background-color: @accent-color !important;
}
- // Not selected radio
+
+ /* Not selected radio */
&[style*="background: rgb(219\, 219\, 219)"],
&[style*="background: rgb(38\, 38\, 38)"],
&[style*="background: rgb(54\, 54\, 54)"],
@@ -608,7 +626,8 @@
background-color: @surface0 !important;
}
}
- // That "border"
+
+ /* That "border" */
&[style*="background: rgb(38\, 38\, 38)"] {
display: none;
}
@@ -626,19 +645,21 @@
&[style*="color: rgb(142\, 142\, 142)"] {
color: @subtext0 !important;
}
- } // Map pop-ups
+ }
+
+ /* Map pop-ups */
.leaflet-popup-content-wrapper,
.leaflet-popup-tip {
background-color: @mantle;
- box-shadow: 0 5px 15px fadeout(@dark_color, 0.4);
+ box-shadow: 0 5px 15px fadeout(@dark-color, 0.4);
* {
color: @text !important;
}
}
- // Scrollbar
+
+ /* Scrollbar */
::-webkit-scrollbar {
- width: @scrollbar_width;
background-color: @crust;
}
@@ -683,7 +704,8 @@
@mantle: @catppuccin[@@lookup][@mantle];
@crust: @catppuccin[@@lookup][@crust];
@accent-color: @catppuccin[@@lookup][@@accent];
- // Chat background
+
+ /* Chat background */
.xnz67gz {
background-color: @base;
}
@@ -694,15 +716,23 @@
.xvbhtw8 {
background-color: @mantle;
}
-
+ .x186z157,
+ .xk50ysn,
+ .xi81zsa {
+ color: @subtext0 !important;
+ }
._aa5c,
._aa4j,
._abyk {
background-color: @crust;
- } // New Chat Button
+ }
+
+ /* New Chat Button */
.xk5f4mz {
background-color: @surface0;
- } // Chat button
+ }
+
+ /* Chat button */
.x1i10hfl:hover {
background-color: @surface0;
color: @text;
@@ -714,19 +744,19 @@
@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;
- @text_filter: brightness(0) saturate(100%) invert(28%) sepia(17%) saturate(835%) hue-rotate(196deg) brightness(97%) contrast(85%);
+ @text-filter: brightness(0) saturate(100%) invert(28%) sepia(17%) saturate(835%) hue-rotate(196deg) brightness(97%) contrast(85%);
};
@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;
- @text_filter: brightness(0) saturate(100%) invert(84%) sepia(5%) saturate(1519%) hue-rotate(192deg) brightness(100%) contrast(93%);
+ @text-filter: brightness(0) saturate(100%) invert(84%) sepia(5%) saturate(1519%) hue-rotate(192deg) brightness(100%) contrast(93%);
};
@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;
- @text_filter: brightness(0) saturate(100%) invert(80%) sepia(18%) saturate(377%) hue-rotate(192deg) brightness(103%) contrast(92%);
+ @text-filter: brightness(0) saturate(100%) invert(80%) sepia(18%) saturate(377%) hue-rotate(192deg) brightness(103%) contrast(92%);
};
@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;
- @text_filter: brightness(0) saturate(100%) invert(85%) sepia(6%) saturate(1356%) hue-rotate(194deg) brightness(103%) contrast(91%);
+ @text-filter: brightness(0) saturate(100%) invert(85%) sepia(6%) saturate(1356%) hue-rotate(194deg) brightness(103%) contrast(91%);
};
}
From 92adf6659f426532e5ea757447f4443c77fd0a44 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 24 Mar 2024 20:26:53 +0000
Subject: [PATCH 03/82] style: format code with prettier
---
styles/instagram/catppuccin.user.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/styles/instagram/catppuccin.user.css b/styles/instagram/catppuccin.user.css
index 6f0d257713..1f4a2dac38 100644
--- a/styles/instagram/catppuccin.user.css
+++ b/styles/instagram/catppuccin.user.css
@@ -491,7 +491,7 @@
@mauve 60%,
@blue 90%
);
- /* "All caught up" icon */
+ /* "All caught up" icon */
img[src="/images/instagram/xig/web/illo-confirm-refresh-light.png"] {
@svg: escape(
' '
From 327b59a418edd7808c64a10cf357f20a9cd5a951 Mon Sep 17 00:00:00 2001
From: Hammy <58985301+sgoudham@users.noreply.github.com>
Date: Sun, 24 Mar 2024 21:25:55 +0000
Subject: [PATCH 04/82] ci: add deploy website workflow (#702)
---
.github/workflows/website.yml | 12 ++++++++++++
1 file changed, 12 insertions(+)
create mode 100644 .github/workflows/website.yml
diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml
new file mode 100644
index 0000000000..10eed2e679
--- /dev/null
+++ b/.github/workflows/website.yml
@@ -0,0 +1,12 @@
+name: Deploy Website
+
+on:
+ workflow_dispatch:
+ push:
+ branches: ["main"]
+ paths: ["scripts/userstyles.yml"]
+
+jobs:
+ deploy:
+ uses: catppuccin/catppuccin/.github/workflows/website.yml@main
+# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json
From 651d72db4107799d352322e5795941bfbfa202e9 Mon Sep 17 00:00:00 2001
From: Hammy <58985301+sgoudham@users.noreply.github.com>
Date: Mon, 25 Mar 2024 01:43:59 +0000
Subject: [PATCH 05/82] ci(website): dont bother with reusing workflow (#708)
---
.github/workflows/website.yml | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml
index 10eed2e679..82a190a089 100644
--- a/.github/workflows/website.yml
+++ b/.github/workflows/website.yml
@@ -8,5 +8,13 @@ on:
jobs:
deploy:
- uses: catppuccin/catppuccin/.github/workflows/website.yml@main
+ runs-on: ubuntu-latest
+ environment: website
+ name: Vercel Deploy
+ steps:
+ - name: Deploy via cURL
+ shell: bash
+ env:
+ DEPLOY_HOOK: ${{ secrets.VERCEL_DEPLOY_HOOK }}
+ run: curl -X POST "$DEPLOY_HOOK"
# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json
From d7a317341651da8aa7b6d013ac368ee831c21c6a Mon Sep 17 00:00:00 2001
From: uncenter <47499684+uncenter@users.noreply.github.com>
Date: Mon, 25 Mar 2024 01:54:21 -0400
Subject: [PATCH 06/82] chore: add icons for some userstyles (#709)
---
scripts/userstyles.yml | 3 +++
1 file changed, 3 insertions(+)
diff --git a/scripts/userstyles.yml b/scripts/userstyles.yml
index 44e656c77c..7c350c12f5 100644
--- a/scripts/userstyles.yml
+++ b/scripts/userstyles.yml
@@ -211,6 +211,7 @@ userstyles:
chess.com:
name: Chess.com
categories: [game, education]
+ icon: chessdotcom
color: green
readme:
app-link: "https://chess.com"
@@ -383,6 +384,7 @@ userstyles:
inoreader:
name: inoreader
categories: [productivity]
+ icon: inoreader
color: blue
readme:
app-link: "https://inoreader.com"
@@ -510,6 +512,7 @@ userstyles:
migadu-webmail:
name: Migadu Webmail
categories: [email_client, productivity]
+ icon: migadu
color: blue
readme:
app-link: https://webmail.migadu.com/
From ca6ffb05d393487f1f755c7d42b2bc6dc44b1c58 Mon Sep 17 00:00:00 2001
From: uncenter <47499684+uncenter@users.noreply.github.com>
Date: Mon, 25 Mar 2024 09:21:11 -0400
Subject: [PATCH 07/82] feat(twitch): predictions, inputs, pause/play button,
ad text overlay (#711)
* feat(twitch): predictions, inputs, pause/play button, ad text overlay
* chore(twitch): bump minor
---
styles/twitch/catppuccin.user.css | 50 ++++++++++++++++++++++++++++---
1 file changed, 46 insertions(+), 4 deletions(-)
diff --git a/styles/twitch/catppuccin.user.css b/styles/twitch/catppuccin.user.css
index 10b1222c99..a5865fabd9 100644
--- a/styles/twitch/catppuccin.user.css
+++ b/styles/twitch/catppuccin.user.css
@@ -2,7 +2,7 @@
@name Twitch Catppuccin
@namespace github.com/catppuccin/userstyles/styles/twitch
@homepageURL https://github.com/catppuccin/userstyles/tree/main/styles/twitch
-@version 1.1.20
+@version 1.2.0
@updateURL https://github.com/catppuccin/userstyles/raw/main/styles/twitch/catppuccin.user.css
@supportURL https://github.com/catppuccin/userstyles/issues?q=is%3Aopen+is%3Aissue+label%3Atwitch
@description Soothing pastel theme for Twitch
@@ -92,8 +92,7 @@
div.hype-train-progress-bar-info-view__level-container p,
div.hype-train-approaching-view__leftSide p,
div.hype-train-expanded-layout p,
- div.hype-train-expanded-layout svg,
- .CoreText-sc-1txzju1-0 {
+ div.hype-train-expanded-layout svg {
color: @text;
}
@@ -596,7 +595,50 @@
--color-background-overlay-alt: @mantle;
--color-background-button-overlay-text-hover: @crust;
--color-border-overlay: @surface0;
- }
+ --color-background-button-disabled: @surface0;
+ --color-text-button-disabled: @subtext0;
+ }
+
+ /* Predictions */
+ .fixed-prediction-button {
+ color: @text !important;
+
+ .channel-points-icon svg {
+ color: @text !important;
+ }
+ }
+ [style*="rgb(255, 255, 255)"] {
+ color: @base !important;
+ }
+ [style="color: rgb(56, 122, 255);"] {
+ color: @blue !important;
+ }
+ [style="color: rgb(245, 0, 155);"] {
+ color: @pink !important;
+ }
+ .fixed-prediction-button--blue, [style*="background-color: rgb(56, 122, 255);"], [style*="background: rgb(56, 122, 255);"] {
+ background-color: @blue !important;
+ }
+ .fixed-prediction-button--pink, [style*="background-color: rgb(245, 0, 155);"], [style*="background: rgb(245, 0, 155);"] {
+ background-color: @pink !important;
+ }
+
+ input[disabled] {
+ background-color: @surface0;
+ }
+ .chat-wysiwyg-input__placeholder {
+ color: @subtext0;
+ }
+
+ button[aria-label="Play"], button[aria-label="Pause"] {
+ & + div svg {
+ color: @subtext0;
+ }
+ }
+
+ [data-a-target="video-ad-label"], [data-a-target="video-ad-countdown"] {
+ color: @text !important;
+ }
}
}
@-moz-document domain("dashboard.twitch.tv") {
From 5ae5ade89ec7ff168113ad5fc7f6971d41a0cf5a Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 25 Mar 2024 13:21:42 +0000
Subject: [PATCH 08/82] style: format code with prettier
---
styles/twitch/catppuccin.user.css | 82 +++++++++++++++++--------------
1 file changed, 44 insertions(+), 38 deletions(-)
diff --git a/styles/twitch/catppuccin.user.css b/styles/twitch/catppuccin.user.css
index a5865fabd9..238eeb07f7 100644
--- a/styles/twitch/catppuccin.user.css
+++ b/styles/twitch/catppuccin.user.css
@@ -598,47 +598,53 @@
--color-background-button-disabled: @surface0;
--color-text-button-disabled: @subtext0;
}
-
- /* Predictions */
- .fixed-prediction-button {
- color: @text !important;
-
- .channel-points-icon svg {
- color: @text !important;
- }
- }
- [style*="rgb(255, 255, 255)"] {
- color: @base !important;
- }
- [style="color: rgb(56, 122, 255);"] {
- color: @blue !important;
- }
- [style="color: rgb(245, 0, 155);"] {
- color: @pink !important;
- }
- .fixed-prediction-button--blue, [style*="background-color: rgb(56, 122, 255);"], [style*="background: rgb(56, 122, 255);"] {
- background-color: @blue !important;
- }
- .fixed-prediction-button--pink, [style*="background-color: rgb(245, 0, 155);"], [style*="background: rgb(245, 0, 155);"] {
- background-color: @pink !important;
- }
- input[disabled] {
- background-color: @surface0;
- }
- .chat-wysiwyg-input__placeholder {
- color: @subtext0;
- }
-
- button[aria-label="Play"], button[aria-label="Pause"] {
- & + div svg {
- color: @subtext0;
- }
+ /* Predictions */
+ .fixed-prediction-button {
+ color: @text !important;
+
+ .channel-points-icon svg {
+ color: @text !important;
}
-
- [data-a-target="video-ad-label"], [data-a-target="video-ad-countdown"] {
- color: @text !important;
+ }
+ [style*="rgb(255, 255, 255)"] {
+ color: @base !important;
+ }
+ [style="color: rgb(56, 122, 255);"] {
+ color: @blue !important;
+ }
+ [style="color: rgb(245, 0, 155);"] {
+ color: @pink !important;
+ }
+ .fixed-prediction-button--blue,
+ [style*="background-color: rgb(56, 122, 255);"],
+ [style*="background: rgb(56, 122, 255);"] {
+ background-color: @blue !important;
+ }
+ .fixed-prediction-button--pink,
+ [style*="background-color: rgb(245, 0, 155);"],
+ [style*="background: rgb(245, 0, 155);"] {
+ background-color: @pink !important;
+ }
+
+ input[disabled] {
+ background-color: @surface0;
+ }
+ .chat-wysiwyg-input__placeholder {
+ color: @subtext0;
+ }
+
+ button[aria-label="Play"],
+ button[aria-label="Pause"] {
+ & + div svg {
+ color: @subtext0;
}
+ }
+
+ [data-a-target="video-ad-label"],
+ [data-a-target="video-ad-countdown"] {
+ color: @text !important;
+ }
}
}
@-moz-document domain("dashboard.twitch.tv") {
From aa52245cd5ee1c88bfc68fc78d1b6e986c13345a Mon Sep 17 00:00:00 2001
From: uncenter <47499684+uncenter@users.noreply.github.com>
Date: Mon, 25 Mar 2024 09:22:13 -0400
Subject: [PATCH 09/82] feat: catppuccin loading gif, additional vars (#712)
---
styles/github/catppuccin.user.css | 30 +++++++++++++++++++++++-------
1 file changed, 23 insertions(+), 7 deletions(-)
diff --git a/styles/github/catppuccin.user.css b/styles/github/catppuccin.user.css
index ad02fc177c..f0a3c8898d 100644
--- a/styles/github/catppuccin.user.css
+++ b/styles/github/catppuccin.user.css
@@ -2,7 +2,7 @@
@name GitHub Catppuccin
@namespace github.com/catppuccin/userstyles/styles/github
@homepageURL https://github.com/catppuccin/userstyles/tree/main/styles/github
-@version 1.4.1
+@version 1.5.0
@updateURL https://github.com/catppuccin/userstyles/raw/main/styles/github/catppuccin.user.css
@supportURL https://github.com/catppuccin/userstyles/issues?q=is%3Aopen+is%3Aissue+label%3Agithub
@description Soothing pastel theme for GitHub
@@ -295,7 +295,7 @@
--control-bgColor-rest: #21262d;
--control-bgColor-hover: #292e36;
--control-bgColor-active: #31363e;
- --control-bgColor-disabled: #21262db3;
+ --control-bgColor-disabled: fade(@mantle, 60%);
--control-bgColor-selected: #161b22;
--control-fgColor-rest: #c9d1d9;
--control-fgColor-placeholder: #484f58;
@@ -326,10 +326,10 @@
--control-checked-bgColor-disabled: #6e7681;
--control-checked-fgColor-rest: @text;
--control-checked-fgColor-disabled: #010409;
- --control-checked-borderColor-rest: #1f6feb;
- --control-checked-borderColor-hover: #2a7aef;
- --control-checked-borderColor-active: #3685f3;
- --control-checked-borderColor-disabled: #6e7681;
+ --control-checked-borderColor-rest: @blue;
+ --control-checked-borderColor-hover: @sapphire;
+ --control-checked-borderColor-active: @sky;
+ --control-checked-borderColor-disabled: @surface0;
--controlTrack-bgColor-rest: @surface0;
--controlTrack-bgColor-hover: @surface1;
--controlTrack-bgColor-active: @surface2;
@@ -425,7 +425,7 @@
--buttonCounter-danger-fgColor-hover: @text;
--buttonCounter-danger-fgColor-disabled: fade(@red, 50%);
--focus-outlineColor: @blue;
- --menu-bgColor-active: #161b22;
+ --menu-bgColor-active: @mantle;
--overlay-bgColor: @mantle;
--overlay-borderColor: @surface0;
--overlay-backdrop-bgColor: #161b2266;
@@ -672,6 +672,22 @@
);
background-image: url("data:image/svg+xml,@{svg}");
}
+
+ picture:has(img[src="https://github.githubassets.com/assets/mona-loading-default-c3c7aad1282f.gif"])
+ {
+ justify-content: center;
+ display: flex;
+
+ img {
+ display: block;
+ box-sizing: border-box;
+ background: url("https://giscus.catppuccin.com/assets/loading_48x48.gif")
+ no-repeat;
+ width: 48px;
+ height: 48px;
+ padding-left: 48px;
+ }
+ }
}
}
From df7c862155deec60a4c3dd574ae59d896080d57b Mon Sep 17 00:00:00 2001
From: uncenter <47499684+uncenter@users.noreply.github.com>
Date: Mon, 25 Mar 2024 11:15:45 -0400
Subject: [PATCH 10/82] fix(github): use accent on radio buttons (#714)
---
styles/github/catppuccin.user.css | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/styles/github/catppuccin.user.css b/styles/github/catppuccin.user.css
index f0a3c8898d..0939986188 100644
--- a/styles/github/catppuccin.user.css
+++ b/styles/github/catppuccin.user.css
@@ -326,9 +326,9 @@
--control-checked-bgColor-disabled: #6e7681;
--control-checked-fgColor-rest: @text;
--control-checked-fgColor-disabled: #010409;
- --control-checked-borderColor-rest: @blue;
- --control-checked-borderColor-hover: @sapphire;
- --control-checked-borderColor-active: @sky;
+ --control-checked-borderColor-rest: @accent-color;
+ --control-checked-borderColor-hover: @accent-color;
+ --control-checked-borderColor-active: @accent-color;
--control-checked-borderColor-disabled: @surface0;
--controlTrack-bgColor-rest: @surface0;
--controlTrack-bgColor-hover: @surface1;
From 3332e4c7a52c759d0b09a6951daf23009926ac55 Mon Sep 17 00:00:00 2001
From: uncenter <47499684+uncenter@users.noreply.github.com>
Date: Tue, 26 Mar 2024 12:31:57 -0400
Subject: [PATCH 11/82] chore(openmediavault): use correct brand name spelling
(#716)
---
scripts/userstyles.yml | 2 +-
styles/openmediavault/catppuccin.user.css | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/scripts/userstyles.yml b/scripts/userstyles.yml
index 7c350c12f5..bbd16179f4 100644
--- a/scripts/userstyles.yml
+++ b/scripts/userstyles.yml
@@ -561,7 +561,7 @@ userstyles:
app-link: "https://www.npmjs.com/"
current-maintainers: [*uncenter]
openmediavault:
- name: OpenMediaVault
+ name: openmediavault
categories: [productivity]
color: sky
readme:
diff --git a/styles/openmediavault/catppuccin.user.css b/styles/openmediavault/catppuccin.user.css
index 0f8ccfe182..4e77dbaef9 100644
--- a/styles/openmediavault/catppuccin.user.css
+++ b/styles/openmediavault/catppuccin.user.css
@@ -1,11 +1,11 @@
/* ==UserStyle==
-@name OpenMediaVault Catppuccin
+@name openmediavault Catppuccin
@namespace github.com/catppuccin/userstyles/styles/openmediavault
@homepageURL https://github.com/catppuccin/userstyles/tree/main/styles/openmediavault
@version 0.0.1
@updateURL https://github.com/catppuccin/userstyles/raw/main/styles/openmediavault/catppuccin.user.css
@supportURL https://github.com/catppuccin/userstyles/issues?q=is%3Aopen+is%3Aissue+label%3Aopenmediavault
-@description Soothing pastel theme for OpenMediaVault
+@description Soothing pastel theme for openmediavault
@author Catppuccin
@license MIT
From 6ff143686a41728b3b8aabf386015c7066a7dfff Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 26 Mar 2024 16:32:20 +0000
Subject: [PATCH 12/82] chore: generate health files
---
.github/labels.yml | 2 +-
README.md | 2 +-
styles/openmediavault/README.md | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.github/labels.yml b/.github/labels.yml
index a9f3f0c145..55d25f19ca 100644
--- a/.github/labels.yml
+++ b/.github/labels.yml
@@ -153,7 +153,7 @@
description: npm
color: '#ed8796'
- name: openmediavault
- description: OpenMediaVault
+ description: openmediavault
color: '#91d7e3'
- name: paste.rs
description: paste.rs
diff --git a/README.md b/README.md
index 15f7d443a0..4a93463ad2 100644
--- a/README.md
+++ b/README.md
@@ -143,7 +143,7 @@ See [CONTRIBUTING.md](docs/CONTRIBUTING.md).
- [homepage](styles/homepage)
- [inoreader](styles/inoreader)
- [Microsoft Word](styles/microsoft-word)
-- [OpenMediaVault](styles/openmediavault)
+- [openmediavault](styles/openmediavault)
- [Proton](styles/proton)
- [Stylus](styles/stylus)
- [Syncthing](styles/syncthing)
diff --git a/styles/openmediavault/README.md b/styles/openmediavault/README.md
index 5f7a74b7a0..2dc5fd0bbe 100644
--- a/styles/openmediavault/README.md
+++ b/styles/openmediavault/README.md
@@ -4,7 +4,7 @@
From 602e34ce4b03291ce8ba69b8187012fb87e76227 Mon Sep 17 00:00:00 2001
From: Isabel
Date: Tue, 26 Mar 2024 19:18:21 +0000
Subject: [PATCH 13/82] docs(codeberg): remove old faq (#717)
---
scripts/userstyles.yml | 3 ---
1 file changed, 3 deletions(-)
diff --git a/scripts/userstyles.yml b/scripts/userstyles.yml
index bbd16179f4..10aa30f670 100644
--- a/scripts/userstyles.yml
+++ b/scripts/userstyles.yml
@@ -232,9 +232,6 @@ userstyles:
color: blue
readme:
app-link: "https://codeberg.org"
- faq:
- - question: "How do I change the accent color?"
- answer: "Changing `--color-primary` to any other color should change the accent color in most places."
current-maintainers: [*justtobbi]
crowdin:
name: Crowdin
From 32477e7fff2b79abea2252c23258bf2af8e82170 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 26 Mar 2024 19:18:43 +0000
Subject: [PATCH 14/82] chore: generate health files
---
styles/codeberg/README.md | 3 ---
1 file changed, 3 deletions(-)
diff --git a/styles/codeberg/README.md b/styles/codeberg/README.md
index 29da0ce82c..dd497beebc 100644
--- a/styles/codeberg/README.md
+++ b/styles/codeberg/README.md
@@ -18,9 +18,6 @@
-## ๐ FAQ
-- Q: How do I change the accent color?\
- A: Changing `--color-primary` to any other color should change the accent color in most places.
## ๐ Current Maintainer
- [justTOBBI](https://github.com/justTOBBI)
From 6d68347c1f66d5a33d14f461bfda80024f65a292 Mon Sep 17 00:00:00 2001
From: Isabel
Date: Tue, 26 Mar 2024 20:47:54 +0000
Subject: [PATCH 15/82] chore(codeberg): use the ctp/gitea pages deployment
urls (#720)
chore(codeberg): use the ctp/gitea pages deployment
---
styles/codeberg/catppuccin.user.css | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/styles/codeberg/catppuccin.user.css b/styles/codeberg/catppuccin.user.css
index 58cf824ace..870b13515d 100644
--- a/styles/codeberg/catppuccin.user.css
+++ b/styles/codeberg/catppuccin.user.css
@@ -2,7 +2,7 @@
@name Codeberg Catppuccin
@namespace github.com/catppuccin/userstyles/styles/codeberg
@homepageURL https://github.com/catppuccin/userstyles/tree/main/styles/codeberg
-@version 1.0.2
+@version 1.0.3
@updateURL https://github.com/catppuccin/userstyles/raw/main/styles/codeberg/catppuccin.user.css
@supportURL https://github.com/catppuccin/userstyles/issues?q=is%3Aopen+is%3Aissue+label%3Acodeberg
@description Soothing pastel theme for Codeberg
@@ -16,10 +16,10 @@
==/UserStyle== */
@-moz-document domain('codeberg.org') {
@import (css)
- url("https://git.isabelroses.com/assets/css/theme-catppuccin-@{lightFlavor}-@{accentColor}.css")
+ url("https://catppuccin.github.io/gitea/theme-catppuccin-@{lightFlavor}-@{accentColor}.css")
(prefers-color-scheme: light);
@import (css)
- url("https://git.isabelroses.com/assets/css/theme-catppuccin-@{darkFlavor}-@{accentColor}.css")
+ url("https://catppuccin.github.io/gitea/theme-catppuccin-@{darkFlavor}-@{accentColor}.css")
(prefers-color-scheme: dark);
#catppuccin(@lookup, @accent) {
From 30fee4e8170b5db8beb351f8185fe6b92541c6fa Mon Sep 17 00:00:00 2001
From: uncenter <47499684+uncenter@users.noreply.github.com>
Date: Tue, 26 Mar 2024 16:48:04 -0400
Subject: [PATCH 16/82] fix(github): top nav bar when logged out (#719)
---
styles/github/catppuccin.user.css | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/styles/github/catppuccin.user.css b/styles/github/catppuccin.user.css
index 0939986188..bb9d4a63ae 100644
--- a/styles/github/catppuccin.user.css
+++ b/styles/github/catppuccin.user.css
@@ -2,7 +2,7 @@
@name GitHub Catppuccin
@namespace github.com/catppuccin/userstyles/styles/github
@homepageURL https://github.com/catppuccin/userstyles/tree/main/styles/github
-@version 1.5.0
+@version 1.5.1
@updateURL https://github.com/catppuccin/userstyles/raw/main/styles/github/catppuccin.user.css
@supportURL https://github.com/catppuccin/userstyles/issues?q=is%3Aopen+is%3Aissue+label%3Agithub
@description Soothing pastel theme for GitHub
@@ -688,6 +688,18 @@
padding-left: 48px;
}
}
+
+ /* Header when logged out */
+ .HeaderMenu-link {
+ color: var(--fgColor-default);
+
+ &:hover {
+ color: var(--fgColor-default);
+ }
+ }
+ .header-search-button.placeholder {
+ color: @subtext0;
+ }
}
}
From e3715949445194aa92268df6c0e0f2da4bd3ce08 Mon Sep 17 00:00:00 2001
From: uncenter <47499684+uncenter@users.noreply.github.com>
Date: Tue, 26 Mar 2024 17:58:59 -0400
Subject: [PATCH 17/82] fix(migadu-webmail): email address field (#721)
---
styles/migadu-webmail/catppuccin.user.css | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/styles/migadu-webmail/catppuccin.user.css b/styles/migadu-webmail/catppuccin.user.css
index 33d91197ac..510b3e1bcd 100644
--- a/styles/migadu-webmail/catppuccin.user.css
+++ b/styles/migadu-webmail/catppuccin.user.css
@@ -2,7 +2,7 @@
@name Migadu Webmail Catppuccin
@namespace github.com/catppuccin/userstyles/styles/migadu-webmail
@homepageURL https://github.com/catppuccin/userstyles/tree/main/styles/migadu-webmail
-@version 0.0.4
+@version 0.0.5
@updateURL https://github.com/catppuccin/userstyles/raw/main/styles/migadu-webmail/catppuccin.user.css
@supportURL https://github.com/catppuccin/userstyles/issues?q=is%3Aopen+is%3Aissue+label%3Amigadu-webmail
@description Soothing pastel theme for Migadu Webmail
@@ -432,6 +432,18 @@
border-color: @text;
color: @text;
}
+ /* Email address field */
+ .emailaddresses {
+ li[draggable] {
+ background-color: @mantle;
+ border-color: @surface0;
+ box-shadow: 0 1px 0 fade(@mantle, 75%) inset;
+ color: @text;
+ }
+ li a {
+ color: @surface0;
+ }
+ }
}
@media (prefers-color-scheme: light) {
From 757445df0a79b338161b5ace56ea9b74281c5154 Mon Sep 17 00:00:00 2001
From: nullishamy
Date: Thu, 28 Mar 2024 20:21:01 +0000
Subject: [PATCH 18/82] ci: fix path bugs on windows (#726)
---
scripts/deps.ts | 7 ++++++-
scripts/lint/metadata.ts | 3 +++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/scripts/deps.ts b/scripts/deps.ts
index 0629c531a0..d7504204a0 100644
--- a/scripts/deps.ts
+++ b/scripts/deps.ts
@@ -6,7 +6,12 @@ import userStylesSchema from "@/userstyles.schema.json" with {
};
import { join } from "std/path/mod.ts";
-const ROOT = new URL(".", import.meta.url).pathname;
+
+const ROOT = import.meta.dirname;
+if (!ROOT) {
+ throw new Error("ROOT was not located.");
+}
+
/**
* absolute path to the repository
*/
diff --git a/scripts/lint/metadata.ts b/scripts/lint/metadata.ts
index 30df942b68..dad85d23fb 100644
--- a/scripts/lint/metadata.ts
+++ b/scripts/lint/metadata.ts
@@ -16,6 +16,9 @@ export const verifyMetadata = async (
userstyle: string,
userstyles: Userstyles,
) => {
+ // `usercss-meta` prohibits any '\r' characters, which seem to be present on Windows.
+ content = content.replaceAll("\r\n", "\n");
+
const assert = assertions(userstyle, userstyles);
const file = relative(REPO_ROOT, entry.path);
From 4481036b63e38e8a6de7a65cc321a52be807cdac Mon Sep 17 00:00:00 2001
From: Isabel
Date: Thu, 28 Mar 2024 20:32:15 +0000
Subject: [PATCH 19/82] chore: remove old note (#727)
---
scripts/userstyles.yml | 3 ---
1 file changed, 3 deletions(-)
diff --git a/scripts/userstyles.yml b/scripts/userstyles.yml
index 10aa30f670..f79983d8ce 100644
--- a/scripts/userstyles.yml
+++ b/scripts/userstyles.yml
@@ -477,9 +477,6 @@ userstyles:
faq:
- question: "**The theme does not look the same as the preview?**"
answer: "Your Mastodon instance may be using its own custom CSS, which is changing the look of the theme."
- - question: "**The theme is not working?**"
- answer: |
- One solution might be changing the theme to either light or dark via **Preferences** > **Appearance** > **Site theme**.
current-maintainers: [*isabelroses]
past-maintainers: [*andreasgrafen]
mdn:
From 63152f502ccaecf6a02ef1fd7da3a11ec79ceaee Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 28 Mar 2024 20:32:38 +0000
Subject: [PATCH 20/82] chore: generate health files
---
styles/mastodon/README.md | 3 ---
1 file changed, 3 deletions(-)
diff --git a/styles/mastodon/README.md b/styles/mastodon/README.md
index b023cc77f6..cedeee5e3e 100644
--- a/styles/mastodon/README.md
+++ b/styles/mastodon/README.md
@@ -28,9 +28,6 @@ If the theme isn't being applied to your instance, go to the userstyle's **Setti
## ๐ FAQ
- Q: **The theme does not look the same as the preview?**\
A: Your Mastodon instance may be using its own custom CSS, which is changing the look of the theme.
-- Q: **The theme is not working?**\
- A: One solution might be changing the theme to either light or dark via **Preferences** > **Appearance** > **Site theme**.
-
## ๐ Current Maintainer
- [Isabel](https://github.com/isabelroses)
From b7b42117ecd5433a34fc3f89aa30b593e3339a7f Mon Sep 17 00:00:00 2001
From: Isabel
Date: Thu, 28 Mar 2024 20:44:46 +0000
Subject: [PATCH 21/82] docs: instance based websites (#724)
* chore: add docs on instance based websites
* fix: typo
* chore: remove redundant notes
* chore: change wording
* style: single line
* chore: wording
Co-authored-by: uncenter <47499684+uncenter@users.noreply.github.com>
* chore: more wordings
Co-authored-by: uncenter <47499684+uncenter@users.noreply.github.com>
* revert: unintended changes
* chore: imrove rendering and accuracy
Co-authored-by: uncenter <47499684+uncenter@users.noreply.github.com>
---------
Co-authored-by: uncenter <47499684+uncenter@users.noreply.github.com>
---
README.md | 7 +++++++
scripts/userstyles.yml | 12 ------------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/README.md b/README.md
index 4a93463ad2..97d1f8c77c 100644
--- a/README.md
+++ b/README.md
@@ -57,6 +57,13 @@ See instructions on the [GitHub release page](https://github.com/catppuccin/user
- Replacing `` with the name of the userstyle.
3. Enjoy!
+> [!TIP]
+> For decentralized or self-hosted applications, you can apply a theme to one or multiple instances across updates by following the instructions below.
+> 1. Open the Stylus "Manage" page.
+> 2. Click on the userstyle's name in the list.
+> 3. Click on **Style settings** in the left panel.
+> 4. Enter the URL patterns for your instance(s) in the text box labeled **Custom included sites**.
+
## ๐ Contributing
diff --git a/scripts/userstyles.yml b/scripts/userstyles.yml
index f79983d8ce..fcfc5a2862 100644
--- a/scripts/userstyles.yml
+++ b/scripts/userstyles.yml
@@ -468,12 +468,6 @@ userstyles:
color: lavender
readme:
app-link: "https://github.com/mastodon/mastodon"
- usage: |+
- This userstyle is applied by default on a few commonly used Mastodon servers, listed at the top:
- ```css
- @-moz-document domain("mastodon.social"), domain("mstdn.social"), domain("fosstodon.org"), domain("piaille.fr"), domain("tech.lgbt") {
- ```
- If the theme isn't being applied to your instance, go to the userstyle's **Settings > Custom included sites** and add your instance to the list, for instance, `*://floss.social/*`.
faq:
- question: "**The theme does not look the same as the preview?**"
answer: "Your Mastodon instance may be using its own custom CSS, which is changing the look of the theme."
@@ -641,12 +635,6 @@ userstyles:
icon: searxng
color: blue
readme:
- usage: |+
- This userstyle is applied by default on a few commonly used Searxng servers, listed at the top:
- ```css
- @-moz-document url-prefix("https://searx.baczek.me/"), url-prefix("https://searx.be/") {
- ```
- If the theme isn't being applied to your instance, go to the userstyle's **Settings > Custom included sites** and add your instance to the list, for instance, `*://searxng.example.com/*`.
app-link: "https://github.com/searxng/searxng"
current-maintainers: [*sekki21956, *ryanccn]
snapchat-web:
From cc8dce70d341e983bdc2210a0f7ee9085819c81a Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 28 Mar 2024 20:45:10 +0000
Subject: [PATCH 22/82] chore: generate health files
---
styles/mastodon/README.md | 7 -------
styles/searxng/README.md | 7 -------
2 files changed, 14 deletions(-)
diff --git a/styles/mastodon/README.md b/styles/mastodon/README.md
index cedeee5e3e..52e3d7988f 100644
--- a/styles/mastodon/README.md
+++ b/styles/mastodon/README.md
@@ -17,13 +17,6 @@
-## Usage
-This userstyle is applied by default on a few commonly used Mastodon servers, listed at the top:
-```css
-@-moz-document domain("mastodon.social"), domain("mstdn.social"), domain("fosstodon.org"), domain("piaille.fr"), domain("tech.lgbt") {
-```
-If the theme isn't being applied to your instance, go to the userstyle's **Settings > Custom included sites** and add your instance to the list, for instance, `*://floss.social/*`.
-
## ๐ FAQ
- Q: **The theme does not look the same as the preview?**\
diff --git a/styles/searxng/README.md b/styles/searxng/README.md
index 88f3b9bbb5..8e68504bf3 100644
--- a/styles/searxng/README.md
+++ b/styles/searxng/README.md
@@ -17,13 +17,6 @@
-## Usage
-This userstyle is applied by default on a few commonly used Searxng servers, listed at the top:
-```css
-@-moz-document url-prefix("https://searx.baczek.me/"), url-prefix("https://searx.be/") {
-```
-If the theme isn't being applied to your instance, go to the userstyle's **Settings > Custom included sites** and add your instance to the list, for instance, `*://searxng.example.com/*`.
-
## ๐ Current Maintainers
From 2167d05f478c4fb910152ded8f6c78dfba7ef226 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 28 Mar 2024 20:45:14 +0000
Subject: [PATCH 23/82] style: format code with prettier
---
README.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/README.md b/README.md
index 97d1f8c77c..d8b43c1601 100644
--- a/README.md
+++ b/README.md
@@ -59,6 +59,7 @@ See instructions on the [GitHub release page](https://github.com/catppuccin/user
> [!TIP]
> For decentralized or self-hosted applications, you can apply a theme to one or multiple instances across updates by following the instructions below.
+>
> 1. Open the Stylus "Manage" page.
> 2. Click on the userstyle's name in the list.
> 3. Click on **Style settings** in the left panel.
From d7dbf5681768006ff1a0252f00795f91ba7567dd Mon Sep 17 00:00:00 2001
From: Isabel
Date: Thu, 28 Mar 2024 20:57:19 +0000
Subject: [PATCH 24/82] chore(libreddit/redlib): add more instances (#728)
* chore(libreddit/redlib): add some more redlib domains
* chore: bump vers
---
styles/libreddit/catppuccin.user.css | 25 +++++++++++++++++++++++--
1 file changed, 23 insertions(+), 2 deletions(-)
diff --git a/styles/libreddit/catppuccin.user.css b/styles/libreddit/catppuccin.user.css
index 5a1eff45a9..6fb04e923d 100644
--- a/styles/libreddit/catppuccin.user.css
+++ b/styles/libreddit/catppuccin.user.css
@@ -2,7 +2,7 @@
@name Libreddit/Redlib Catppuccin
@namespace github.com/catppuccin/userstyles/styles/libreddit
@homepageURL https://github.com/catppuccin/userstyles/tree/main/styles/libreddit
-@version 2.0.4
+@version 2.0.5
@updateURL https://github.com/catppuccin/userstyles/raw/main/styles/libreddit/catppuccin.user.css
@supportURL https://github.com/catppuccin/userstyles/issues?q=is%3Aopen+is%3Aissue+label%3Alibreddit
@description Soothing pastel theme for Libreddit and Redlib
@@ -74,7 +74,28 @@ domain("libreddit.mha.fi"),
domain("libreddit.foss.wtf"),
domain("libreddit.encrypted-data.xyz"),
domain("libreddit.eu.org"),
-domain("l.opnxng.com") {
+domain("l.opnxng.com"),
+domain("safereddit.com"),
+domain("libreddit.projectsegfau.lt"),
+domain("libreddit.bus-hit.me"),
+domain("reddit.invak.id"),
+domain("redlib.catsarch.com"),
+domain("reddit.idevicehacked.com"),
+domain("redlib.freedit.eu"),
+domain("redlib.perennialte.ch"),
+domain("redlib.tux.pizza"),
+domain("redlib.vimmer.dev"),
+domain("libreddit.privacydev.net"),
+domain("lr.n8pjl.ca"),
+domain("reddit.owo.si"),
+domain("redlib.ducks.party"),
+domain("red.ngn.tf"),
+domain("redlib.dnfetheus.xyz"),
+domain("redlib.cow.rip"),
+domain("libreddit.eu.org"),
+domain("r.darrennathanael.com"),
+domain("redlib.kittywi.re"),
+domain("redlib.privacyredirect.com") {
/* 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; };
From 940fe22fc57b49d6b097e5394ccd583fca53e7df Mon Sep 17 00:00:00 2001
From: uncenter <47499684+uncenter@users.noreply.github.com>
Date: Thu, 28 Mar 2024 20:33:35 -0400
Subject: [PATCH 25/82] feat(instagram): theme story ring around profile
picture (#729)
* feat(instagram): theme story ring around profile picture
* chore(instagram): bump version
* fix(instagram): smaller seen ring
---
styles/instagram/catppuccin.user.css | 24 +++++++++++++++++++++++-
1 file changed, 23 insertions(+), 1 deletion(-)
diff --git a/styles/instagram/catppuccin.user.css b/styles/instagram/catppuccin.user.css
index 1f4a2dac38..12c08936ad 100644
--- a/styles/instagram/catppuccin.user.css
+++ b/styles/instagram/catppuccin.user.css
@@ -2,7 +2,7 @@
@name Instagram Catppuccin
@namespace github.com/catppuccin/userstyles/styles/instagram
@homepageURL https://github.com/catppuccin/userstyles/tree/main/styles/instagram
-@version 0.2.0
+@version 0.2.1
@updateURL https://github.com/catppuccin/userstyles/raw/main/styles/instagram/catppuccin.user.css
@supportURL https://github.com/catppuccin/userstyles/issues?q=is%3Aopen+is%3Aissue+label%3Ainstagram
@description Soothing pastel theme for Instagram
@@ -125,6 +125,28 @@
background-color: @accent-color !important;
}
+ /* Story seen / not seen ring */
+ button:has(canvas + span > img[alt$="'s profile picture"]) {
+ canvas {
+ display: none;
+ }
+
+ span {
+ outline-style: solid;
+ outline-offset: 0.15rem;
+ }
+
+
+ &[aria-label^="Story by"][aria-label$="not seen"] span {
+ outline-color: @mauve;
+ outline-width: 0.2rem;
+ }
+ &[aria-label^="Story by"]:not([aria-label$="not seen"]) span {
+ outline-color: @surface2;
+ outline-width: 0.075rem;
+ }
+ }
+
/* Posts */
._aggc {
background-color: @mantle;
From 6627bd93cb2040ebc4a94ae81ba94cab9ce5dc49 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2024 00:34:03 +0000
Subject: [PATCH 26/82] style: format code with prettier
---
styles/instagram/catppuccin.user.css | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/styles/instagram/catppuccin.user.css b/styles/instagram/catppuccin.user.css
index 12c08936ad..fb2273197b 100644
--- a/styles/instagram/catppuccin.user.css
+++ b/styles/instagram/catppuccin.user.css
@@ -130,13 +130,12 @@
canvas {
display: none;
}
-
+
span {
outline-style: solid;
outline-offset: 0.15rem;
}
-
-
+
&[aria-label^="Story by"][aria-label$="not seen"] span {
outline-color: @mauve;
outline-width: 0.2rem;
From c82ce4d166cac7bbc834362f9bc3412f999ba3a8 Mon Sep 17 00:00:00 2001
From: Isabel
Date: Fri, 29 Mar 2024 01:00:14 +0000
Subject: [PATCH 27/82] docs: the PR to end all PRs maybe (#681)
Co-authored-by: Hamothy <58985301+sgoudham@users.noreply.github.com>
Co-authored-by: uncenter <47499684+uncenter@users.noreply.github.com>
---
docs/CONTRIBUTING.md | 61 ++++++++++----
docs/how-to-write-a-userstyle.md | 13 +++
docs/tips-and-tricks.md | 31 ++++++-
docs/userstyle-creation.md | 91 ++------------------
docs/userstylesyml.md | 140 +++++++++++++++++++++++++++++++
5 files changed, 236 insertions(+), 100 deletions(-)
create mode 100644 docs/userstylesyml.md
diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
index 6fe7c4188c..ae84cf3b77 100644
--- a/docs/CONTRIBUTING.md
+++ b/docs/CONTRIBUTING.md
@@ -12,22 +12,51 @@ request.
It is important to note that there are **two types of PRs** for this repository:
-1. **New Userstyles:** Please see [userstyle-creation.md](userstyle-creation.md).
-2. **Other improvements:** These should follow the recommendations below, to help
- improve the chances of a merged PR.
-
-## General Recommendations
-
-- Create a
- [topic branch](https://git-scm.com/book/en/v2/Git-Branching-Branching-Workflows#_topic_branch)
- on your fork for your specific PR.
-- Catppuccin uses the [Conventional Commits
- ](https://www.conventionalcommits.org/en/v1.0.0/) standard for creating explicit and meaningful commit messages. This repository requires pull request _titles_ to be in the conventional commit format, however we do not require it for individual commits within a pull request.
-- Update the version in the `==UserStyle==` header of the `catppuccin.user.css` file. This is to enable version control of the style.
+1. **New Userstyles:** Please see [userstyle-creation.md](./userstyle-creation.md).
+2. **Other improvements:** These should follow the recommendations below, to help improve the chances of a merged PR.
+
+## Recommendations
+
+### Root Variables
+
+While writing a userstyle, you may have come across [custom properties / CSS variables](https://developer.mozilla.org/en-US/docs/Web/CSS/--*), typically wrapped in a `:root` selector. We refer to these variables as "root variables", and they can be thought of as global variables used all across a website. For Catppuccin userstyles, we prefer that these variables are themed (if they exist) rather than individual elements. As the website hopefully uses these variables themselves, it saves yourself a lot of work in theming and maintaining the userstyle.
+
+### Opinionated Changes
+
+When writing or updating a userstyle, it is important to keep in mind that different users have different preferences. To avoid lengthy discussion over user interface aesthetics, we have a set of rules for what a userstyle may include; importantly, **changes to font or layout (padding, margin, hiding/moving elements) are prohibited.**
+
+
+### General Recommendations
+
+- Create a [topic branch](https://git-scm.com/book/en/v2/Git-Branching-Branching-Workflows#_topic_branch) on your fork for your specific PR.
+- Catppuccin uses the [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/)
+ standard for creating explicit and meaningful commit messages. This repository
+ requires pull request _titles_ to be in the conventional commit format,
+ however we do not require it for individual commits within a pull request.
+- Update the version in the `==UserStyle==` header of the `catppuccin.user.css`
+ file. This is to enable version control of the style.
- If it's your first time contributing to a project then you should look to the
- popular
- [first-contributions](https://github.com/firstcontributions/first-contributions)
+ popular [first-contributions](https://github.com/firstcontributions/first-contributions)
repository on GitHub. This will give you hands-on experience with the features
- of GitHub required to make a contribution. As always, feel free to join our
- [Discord](https://discord.com/servers/catppuccin-907385605422448742) to ask
+ of GitHub required to make a contribution. As always, feel free to join our [Discord](https://discord.com/servers/catppuccin-907385605422448742) to ask
any questions and clarify your understanding, we are more than happy to help!
+- Changes to docs may need to use [marksman](https://github.com/artempyanykh/marksman) to generate the table of contents.
+
+## Pull Request Review Process
+
+```mermaid
+graph TD;
+ A[New userstyle];
+ B[Other improvements];
+ A --> C[Review by userstyles staff];
+ B --> D[Review by maintainer];
+ C --> E{Feedback};
+ D --> F{Feedback};
+ E -->|Changes made| E;
+ F -->|Changes made| F;
+ E -->|Approved by userstyles staff| K;
+ F -->|Approved by maintainer or userstyles staff| L[Merged by maintainer];
+ K[Waiting period*] --> M[Merged by userstyles staff];
+```
+
+*A waiting period is usually started if a website is particularly complex or for any other reason could not be thoroughly/completely tested. Waiting periods typically last between 1 and 2 days.
diff --git a/docs/how-to-write-a-userstyle.md b/docs/how-to-write-a-userstyle.md
index f1b792d056..57495f3502 100644
--- a/docs/how-to-write-a-userstyle.md
+++ b/docs/how-to-write-a-userstyle.md
@@ -8,6 +8,19 @@
+### Table of Contents
+
+
+- [Prerequisites](#prerequisites)
+- [Setup](#setup)
+ - [Usercss Metadata](#usercss-metadata)
+ - [`@-moz-document`](#moz-document)
+ - [The lookup table](#the-lookup-table)
+- [The `#catppuccin` mixin](#the-catppuccin-mixin)
+ - [Applying the theme](#applying-the-theme)
+ - [Putting it all together](#putting-it-all-together)
+
+
### Prerequisites
- [Stylus](https://github.com/openstyles/stylus) ([Firefox](https://addons.mozilla.org/en-GB/firefox/addon/styl-us/) / [Chrome](https://chrome.google.com/webstore/detail/stylus/clngdbkpkpeebahjckkjfobafhncgmne)
diff --git a/docs/tips-and-tricks.md b/docs/tips-and-tricks.md
index 71116aed61..b3a662bee6 100644
--- a/docs/tips-and-tricks.md
+++ b/docs/tips-and-tricks.md
@@ -4,6 +4,20 @@
+### Table of Contents
+
+
+- [How can I see my changes in real time?](#how-can-i-see-my-changes-in-real-time)
+- [How can I hide sensitive information in preview screenshots?](#how-can-i-hide-sensitive-information-in-preview-screenshots)
+- [How do I convert preview images to WebP?](#how-do-i-convert-preview-images-to-webp)
+ - [Installation](#installation)
+ - [Usage](#usage)
+- [How do I theme images and SVGs?](#how-do-i-theme-images-and-svgs)
+ - [SVG background images](#svg-background-images)
+ - [` ` elements](#img-elements)
+- [How do I set a variable to RGB values?](#how-do-i-set-a-variable-to-rgb-values)
+
+
### How can I see my changes in real time?
See [Stylus Wiki - Initial installation and live reload](https://github.com/openstyles/stylus/wiki/Writing-UserCSS#initial-installation-and-live-reload).
@@ -36,8 +50,8 @@ The Catppuccin project prefers to use the [WebP image format](https://en.wikiped
| Method | Instructions |
| ------------------------------------- | -------------------------------------------------------------------------------------- |
-| [Homebrew](https://brew.sh/) | `brew install webp` [[view cask]](https://formulae.brew.sh/formula/webp) |
-| [MacPorts](https://www.macports.org/) | `sudo port install webp` [[view port]](https://ports.macports.org/port/webp/) |
+| [Homebrew](https://brew.sh/) | `brew install webp` [[view cask]](https://formulae.brew.sh/formula/webp) |
+| [MacPorts](https://www.macports.org/) | `sudo port install webp` [[view port]](https://ports.macports.org/port/webp/) |
| Binaries | See https://storage.googleapis.com/downloads.webmproject.org/releases/webp/index.html. |
#### Usage
@@ -120,3 +134,16 @@ img.twitter-icon {
background: url("data:image/svg+xml,@{svg}") no-repeat !important;
}
```
+
+
+### How do I set a variable to RGB values?
+
+You can use the following snippet to get the raw RGB values from a color.
+
+```less
+#rgbify(@color) {
+ @rgb-raw: red(@color), green(@color), blue(@color);
+}
+
+--ctp-base: #rgbify(@base) []; // -> 30, 30, 46
+```
diff --git a/docs/userstyle-creation.md b/docs/userstyle-creation.md
index c3e168329e..02720da458 100644
--- a/docs/userstyle-creation.md
+++ b/docs/userstyle-creation.md
@@ -8,14 +8,16 @@
+### Table of Contents
+
+
+- [Requesting Userstyles](#requesting-userstyles)
+- [Creating Userstyles](#creating-userstyles)
+
+
### Requesting Userstyles
-To request a website to be themed, please create a
-[Port Request](https://github.com/catppuccin/catppuccin/discussions/new?category=port-requests)
-discussion on [catppuccin/catppuccin](https://github.com/catppuccin/catppuccin).
-While this may seem odd, this ensures to keep all of our requests in one place
-and makes it easier for all people to request what they want without needing to
-learn what "Stylus" exactly is.
+To request a website to be themed, please create a [Port Request](https://github.com/catppuccin/catppuccin/discussions/new?category=port-requests) discussion on [catppuccin/catppuccin](https://github.com/catppuccin/catppuccin). While this may seem odd, this ensures to keep all of our requests in one place and makes it easier for all people to request what they want without needing to learn what "Stylus" exactly is.
**If you have already created a userstyle, please raise a
[Pull Request](https://github.com/catppuccin/userstyles/compare)!**
@@ -38,7 +40,7 @@ To create a userstyle, follow the instructions listed below:
userstyles based on the template.**
5. [Write the userstyle](./how-to-write-a-userstyle.md).
6. Edit the [`userstyles.yml`](../scripts/userstyles.yml) file and put in the details
- of your port. **More details given below.**
+ of your port. **More details given in [`userstylesyml.md`](./userstylesyml.md).**
7. Create your image preview.
- Take a screenshot of the themed website in each flavor, and then convert all four images [to WebP](./tips-and-tricks.md#how-do-i-convert-preview-images-to-webp) (e.g. `mocha.webp`,
`macchiato.webp`, `frappe.webp` & `latte.webp`).
@@ -47,78 +49,3 @@ To create a userstyle, follow the instructions listed below:
`styles//preview.webp`.**
8. Raise a [pull request](https://github.com/catppuccin/userstyles/compare),
making sure to read and fill out the template properly. The title of your pull request should follow the format of `feat(): init`.
-
-
-
-### `userstyles.yml`
-
-**Please note that the `README`s for each port are auto-generated by scripts
-defined in [`scripts/generate/`](../scripts/generate)**, along with many other parts of
-this repository. This file, [`userstyles.yml`](../scripts/userstyles.yml), is responsible for holding the
-necessary data to auto-generate everything.
-
-[`userstyles.schema.json`](../scripts/userstyles.schema.json) is the schema
-specification for this file. The fields in the following instructions are based
-on the schema:
-
-1. Add your name to the list of collaborators.
-
- ```yaml
- collaborators:
- - &
- name:
- url: https://github.com/
- ```
-
-2. Locate the `userstyles` section and add your port to the list.
-
- You should make changes to everything wrapped in `<>` and remove the `<>`
- characters. If you need help with any of the fields, you should refer to
- other ports in the `userstyle.yml` file. If you would like extra guidance,
- you can ask for help in the pull request or join our
- [Discord](https://discord.com/servers/catppuccin-907385605422448742).
-
- `Required Fields:`
-
- ```yaml
- :
- name:
- # Up to 3 categories are allowed, and having at least one is required.
- # The first category is considered the "primary" category and impacts where the userstyle appears on the README.
- categories: []
- color:
- readme:
- app-link:
- current-maintainers: [*]
- ```
-
- `All Fields:`
-
- These extra `usage` & `faq` keys will ensure that you can add important
- information about the port to the README.
-
- The `icon` key is best explained the schema specification itself.
-
- The `past-maintainers` key is a list of people who have maintained the port
- in the past. We encourage all maintainers to add/remove themselves from this
- list as they see fit.
-
- Remember that these 5 fields are **optional**.
-
- ```yaml
- :
- name:
- categories: [, , ]
- color:
- icon: # OPTIONAL
- readme:
- app-link: ""
- usage: |+ # OPTIONAL
- > [!NOTE]
- >
- faq: # OPTIONAL
- - question:
- answer:
- current-maintainers: [*]
- past-maintainers: [*] # OPTIONAL
- ```
diff --git a/docs/userstylesyml.md b/docs/userstylesyml.md
new file mode 100644
index 0000000000..22327c83a3
--- /dev/null
+++ b/docs/userstylesyml.md
@@ -0,0 +1,140 @@
+
+
๐ userstyles.yml
+
+
+
+ The userstyles.yml
file is responsible for tracking all information about each userstyle.
+
+
+
+
+### Table of Contents
+
+
+- [Adding a new userstyle](#adding-a-new-userstyle)
+- [Adding yourself as a maintainer](#adding-yourself-as-a-maintainer)
+- [Removing yourself as a maintainer](#removing-yourself-as-a-maintainer)
+
+
+### Adding a new userstyle
+
+[`userstyles.schema.json`](../scripts/userstyles.schema.json) is the schema
+specification for `userstyles.yml`. The properties in the following instructions are based
+on the schema. Please refer to it for clarification.
+
+1. See [Adding yourself as a maintainer](#adding-yourself-as-a-maintainer).
+
+2. Locate the `userstyles` section and add your port to the list, following the
+ existing alphabetical order.
+
+ You should make changes to everything wrapped in `<>` and remove the `<>`
+ characters. If you need help with any of the fields, refer to
+ other ports in the `userstyles.yml` file. If you would like extra guidance,
+ you can ask for help in the pull request or join our
+ [Discord](https://discord.com/servers/catppuccin-907385605422448742).
+
+ `Required Fields:`
+
+ ```yaml
+ :
+ name:
+ # Up to 3 categories are allowed, and having at least one is required.
+ # The first category is considered the "primary" category and impacts where the userstyle appears on the README.
+ categories: []
+ color:
+ readme:
+ app-link:
+ current-maintainers: [*]
+ ```
+
+ `All Fields:`
+
+ These extra `usage` & `faq` keys will ensure that you can add important
+ information about the port to the README.
+
+ The `icon` key is best explained the schema specification itself.
+
+ The `past-maintainers` key is a list of people who have maintained the port
+ in the past. We encourage all maintainers to add/remove themselves from this
+ list as they see fit.
+
+ Remember that these 5 fields are **optional**.
+
+ ```yaml
+ :
+ name:
+ categories: [, , ]
+ color:
+ icon: # OPTIONAL
+ readme:
+ app-link: ""
+ usage: |+ # OPTIONAL
+ > [!NOTE]
+ >
+ faq: # OPTIONAL
+ - question:
+ answer:
+ current-maintainers: [*]
+ past-maintainers: [*] # OPTIONAL
+ ```
+
+### Adding yourself as a maintainer
+
+To add yourself as a maintainer, you need to add your GitHub username to the
+`collaborators` array in the `userstyles.yml` file. This file is located in the
+`scripts` directory. The `collaborators` array, is an array of objects, each
+object should contain a `name` and a `url` key. And optionally a `name` key,
+which is your preferred name.
+
+```yaml
+collaborators:
+ - &
+ name: # OPTIONAL
+ url: https://github.com/
+```
+
+Then you need to add your username to the `current-maintainers` array in for the
+userstyle you want to maintain, in this case `youtube`.
+
+```yaml
+userstyles:
+ youtube:
+ name: YouTube
+ categories: [entertainment, social_networking, photo_and_video]
+ icon: youtube
+ color: red
+ readme:
+ app-link: "https://youtube.com"
+ current-maintainers: [*isabelroses, *your-username]
+ past-maintainers: [*elkrien]
+```
+
+If the change is accepted, you will receive an invitation to the `catppuccin` organization,
+and become a member of the [`userstyles-maintainers` team](https://github.com/orgs/catppuccin/teams/userstyles-maintainers).
+As a maintainer you will be expected to:
+ - Review and merge PRs for the userstyle you maintain.
+ - Keep the userstyle up to date with the latest changes. If you no longer wish to maintain a userstyle, see [Removing yourself as a maintainer](#removing-yourself-as-a-maintainer).
+ - Follow our code of conduct and guidelines.
+
+### Removing yourself as a maintainer
+
+To remove yourself as a maintainer, you will need to move your username from the
+`current-maintainers` array to the `past-maintainers` array for each of the userstyles you no longer wish to maintain. In the example for YouTube below, the user `elkrien` has been moved from the `current-maintainers` array to the `past-maintainers` array.
+
+```diff
+userstyles:
+ youtube:
+ name: YouTube
+ categories: [entertainment, social_networking, photo_and_video]
+ icon: youtube
+ color: red
+ readme:
+ app-link: "https://youtube.com"
+- current-maintainers: [*isabelroses, *elkrien]
+- past-maintainers: []
++ current-maintainers: [*isabelroses]
++ past-maintainers: [*elkrien]
+
+If you would not like to be listed as a past maintainer, you can remove yourself from
+`collaborators` array entirely. Upon removal, you will also be removed from the
+`userstyles-maintainers` team.
From 7dda5540ca724eb50ae8b869621f73bece3866e1 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2024 01:00:41 +0000
Subject: [PATCH 28/82] style: format code with prettier
---
docs/CONTRIBUTING.md | 5 ++---
docs/how-to-write-a-userstyle.md | 3 ++-
docs/tips-and-tricks.md | 6 ++++--
docs/userstyle-creation.md | 1 +
docs/userstylesyml.md | 15 +++++++++------
5 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
index ae84cf3b77..b3af7fe47c 100644
--- a/docs/CONTRIBUTING.md
+++ b/docs/CONTRIBUTING.md
@@ -25,11 +25,10 @@ While writing a userstyle, you may have come across [custom properties / CSS var
When writing or updating a userstyle, it is important to keep in mind that different users have different preferences. To avoid lengthy discussion over user interface aesthetics, we have a set of rules for what a userstyle may include; importantly, **changes to font or layout (padding, margin, hiding/moving elements) are prohibited.**
-
### General Recommendations
- Create a [topic branch](https://git-scm.com/book/en/v2/Git-Branching-Branching-Workflows#_topic_branch) on your fork for your specific PR.
-- Catppuccin uses the [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/)
+- Catppuccin uses the [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/)
standard for creating explicit and meaningful commit messages. This repository
requires pull request _titles_ to be in the conventional commit format,
however we do not require it for individual commits within a pull request.
@@ -59,4 +58,4 @@ graph TD;
K[Waiting period*] --> M[Merged by userstyles staff];
```
-*A waiting period is usually started if a website is particularly complex or for any other reason could not be thoroughly/completely tested. Waiting periods typically last between 1 and 2 days.
+\*A waiting period is usually started if a website is particularly complex or for any other reason could not be thoroughly/completely tested. Waiting periods typically last between 1 and 2 days.
diff --git a/docs/how-to-write-a-userstyle.md b/docs/how-to-write-a-userstyle.md
index 57495f3502..ee6be484fc 100644
--- a/docs/how-to-write-a-userstyle.md
+++ b/docs/how-to-write-a-userstyle.md
@@ -11,6 +11,7 @@
### Table of Contents
+
- [Prerequisites](#prerequisites)
- [Setup](#setup)
- [Usercss Metadata](#usercss-metadata)
@@ -19,7 +20,7 @@
- [The `#catppuccin` mixin](#the-catppuccin-mixin)
- [Applying the theme](#applying-the-theme)
- [Putting it all together](#putting-it-all-together)
-
+
### Prerequisites
diff --git a/docs/tips-and-tricks.md b/docs/tips-and-tricks.md
index b3a662bee6..0dd29d9fd8 100644
--- a/docs/tips-and-tricks.md
+++ b/docs/tips-and-tricks.md
@@ -7,6 +7,7 @@
### Table of Contents
+
- [How can I see my changes in real time?](#how-can-i-see-my-changes-in-real-time)
- [How can I hide sensitive information in preview screenshots?](#how-can-i-hide-sensitive-information-in-preview-screenshots)
- [How do I convert preview images to WebP?](#how-do-i-convert-preview-images-to-webp)
@@ -50,8 +51,8 @@ The Catppuccin project prefers to use the [WebP image format](https://en.wikiped
| Method | Instructions |
| ------------------------------------- | -------------------------------------------------------------------------------------- |
-| [Homebrew](https://brew.sh/) | `brew install webp` [[view cask]](https://formulae.brew.sh/formula/webp) |
-| [MacPorts](https://www.macports.org/) | `sudo port install webp` [[view port]](https://ports.macports.org/port/webp/) |
+| [Homebrew](https://brew.sh/) | `brew install webp` [[view cask]](https://formulae.brew.sh/formula/webp) |
+| [MacPorts](https://www.macports.org/) | `sudo port install webp` [[view port]](https://ports.macports.org/port/webp/) |
| Binaries | See https://storage.googleapis.com/downloads.webmproject.org/releases/webp/index.html. |
#### Usage
@@ -134,6 +135,7 @@ img.twitter-icon {
background: url("data:image/svg+xml,@{svg}") no-repeat !important;
}
```
+
### How do I set a variable to RGB values?
diff --git a/docs/userstyle-creation.md b/docs/userstyle-creation.md
index 02720da458..76c1e3b2b1 100644
--- a/docs/userstyle-creation.md
+++ b/docs/userstyle-creation.md
@@ -11,6 +11,7 @@
### Table of Contents
+
- [Requesting Userstyles](#requesting-userstyles)
- [Creating Userstyles](#creating-userstyles)
diff --git a/docs/userstylesyml.md b/docs/userstylesyml.md
index 22327c83a3..905bffb888 100644
--- a/docs/userstylesyml.md
+++ b/docs/userstylesyml.md
@@ -11,6 +11,7 @@
### Table of Contents
+
- [Adding a new userstyle](#adding-a-new-userstyle)
- [Adding yourself as a maintainer](#adding-yourself-as-a-maintainer)
- [Removing yourself as a maintainer](#removing-yourself-as-a-maintainer)
@@ -25,7 +26,7 @@ on the schema. Please refer to it for clarification.
1. See [Adding yourself as a maintainer](#adding-yourself-as-a-maintainer).
2. Locate the `userstyles` section and add your port to the list, following the
- existing alphabetical order.
+ existing alphabetical order.
You should make changes to everything wrapped in `<>` and remove the `<>`
characters. If you need help with any of the fields, refer to
@@ -109,12 +110,13 @@ userstyles:
past-maintainers: [*elkrien]
```
-If the change is accepted, you will receive an invitation to the `catppuccin` organization,
+If the change is accepted, you will receive an invitation to the `catppuccin` organization,
and become a member of the [`userstyles-maintainers` team](https://github.com/orgs/catppuccin/teams/userstyles-maintainers).
As a maintainer you will be expected to:
- - Review and merge PRs for the userstyle you maintain.
- - Keep the userstyle up to date with the latest changes. If you no longer wish to maintain a userstyle, see [Removing yourself as a maintainer](#removing-yourself-as-a-maintainer).
- - Follow our code of conduct and guidelines.
+
+- Review and merge PRs for the userstyle you maintain.
+- Keep the userstyle up to date with the latest changes. If you no longer wish to maintain a userstyle, see [Removing yourself as a maintainer](#removing-yourself-as-a-maintainer).
+- Follow our code of conduct and guidelines.
### Removing yourself as a maintainer
@@ -136,5 +138,6 @@ userstyles:
+ past-maintainers: [*elkrien]
If you would not like to be listed as a past maintainer, you can remove yourself from
-`collaborators` array entirely. Upon removal, you will also be removed from the
+`collaborators` array entirely. Upon removal, you will also be removed from the
`userstyles-maintainers` team.
+```
From 1d787df627cda43ebd46053de6fdcb48da5e7d6f Mon Sep 17 00:00:00 2001
From: Gen
Date: Fri, 29 Mar 2024 11:44:43 -0700
Subject: [PATCH 29/82] fix(instagram): specificity & story-related color
changes (#730)
---
styles/instagram/catppuccin.user.css | 163 ++++++++++++++++-----------
1 file changed, 100 insertions(+), 63 deletions(-)
diff --git a/styles/instagram/catppuccin.user.css b/styles/instagram/catppuccin.user.css
index fb2273197b..b582f3e5eb 100644
--- a/styles/instagram/catppuccin.user.css
+++ b/styles/instagram/catppuccin.user.css
@@ -57,55 +57,66 @@
@dark-color: if(@lookup = latte, @text, @crust);
@light-color: if(@lookup = latte, @crust, @text);
- --web-always-black: #rgbify(@dark-color) [];
- --web-always-white: #rgbify(@light-color) [];
- --always-white: #rgbify(@light-color) [];
- --overlay-alpha-80: fadeout(@dark-color, 50);
- --always-dark-overlay: fadeout(@surface0, 50);
- --grey-9: #rgbify(@text) [];
- --ig-primary-background: #rgbify(@base) [];
- --ig-secondary-background: #rgbify(@surface0) [];
- --ig-banner-background: #rgbify(@crust) [];
- --ig-highlight-background: #rgbify(@surface0) [];
- --ig-elevated-background: #rgbify(@crust) [];
- --ig-elevated-highlight-background: #rgbify(@surface0) [];
- --ig-hover-overlay: #rgbify(@text) [], 0.1;
- --hover-overlay: fadeout(@surface0, 80);
- --ig-text-on-color: #rgbify(@crust) [];
- --ig-badge: #rgbify(@accent-color) [];
- --ig-primary-button: #rgbify(@accent-color) [];
- --ig-primary-button-hover: fadeout(@accent-color, 20);
- --ig-secondary-button-background: #rgbify(@surface0) [];
- --ig-secondary-button-hover: #rgbify(@surface1) [];
- --ig-secondary-button: #rgbify(@text) [];
- --ig-primary-text: #rgbify(@text) [];
- --ig-secondary-text: #rgbify(@subtext0) [];
- --ig-tertiary-text: #rgbify(@subtext0) [];
- --wbloks-primary-text: @text;
- --ig-text-on-media: #rgbify(@text) [];
- --ig-separator: #rgbify(@surface0) [];
- --chat-admin-text-color: #rgbify (@subtext0) [];
- --ig-elevated-separator: #rgbify(@surface0) [];
- --post-separator: #rgbify(@overlay0) [];
- --ig-stroke: #rgbify(@overlay0) [];
- --grey-2: #rgbify(@overlay0) [];
- --ig-link: #rgbify(@accent-color) [];
- --ig-error-or-destructive: #rgbify(@maroon) [];
- --ig-success: #rgbify(@green) [];
- --blue-2: #rgbify(@blue) [];
- --ig-close-friends-refreshed: #rgbify(@green) [];
- --ig-text-input-border-hover-prism: #rgbify(@surface1) [];
- scrollbar-color: @accent-color @crust;
-
- //placehoder textcolor
- .xh8yej3 {
- color: @subtext0 !important;
+ &,
+ .x1qjc9v5,
+ .x9f619,
+ .x78zum5,
+ .xdt5ytf,
+ .x1iyjqo2,
+ .xl56j7k {
+ --web-always-black: #rgbify(@dark-color) [];
+ --web-always-white: #rgbify(@light-color) [];
+ --always-white: #rgbify(@light-color) [];
+ --overlay-alpha-80: fadeout(@dark-color, 50);
+ --always-dark-overlay: fadeout(@surface0, 50);
+ --grey-9: #rgbify(@crust) [];
+ --ig-primary-background: #rgbify(@base) [];
+ --ig-secondary-background: #rgbify(@surface0) [];
+ --ig-banner-background: #rgbify(@crust) [];
+ --ig-highlight-background: #rgbify(@surface0) [];
+ --ig-elevated-background: #rgbify(@crust) [];
+ --ig-elevated-highlight-background: #rgbify(@surface0) [];
+ --ig-hover-overlay: #rgbify(@text) [], 0.1;
+ --hover-overlay: fadeout(@surface0, 80);
+ --ig-text-on-color: #rgbify(@crust) [];
+ --ig-badge: #rgbify(@accent-color) [];
+ --ig-primary-button: #rgbify(@accent-color) [];
+ --ig-primary-button-hover: fadeout(@accent-color, 20);
+ --ig-secondary-button-background: #rgbify(@surface0) [];
+ --ig-secondary-button-hover: #rgbify(@surface1) [];
+ --ig-secondary-button: #rgbify(@text) [];
+ --ig-primary-text: #rgbify(@text) [];
+ --ig-secondary-text: #rgbify(@subtext0) [];
+ --ig-tertiary-text: #rgbify(@subtext0) [];
+ --wbloks-primary-text: @text;
+ --ig-text-on-media: #rgbify(@text) [];
+ --ig-separator: #rgbify(@surface0) [];
+ --chat-admin-text-color: #rgbify (@subtext0) [];
+ --ig-elevated-separator: #rgbify(@surface0) [];
+ --post-separator: #rgbify(@overlay0) [];
+ --ig-stroke: #rgbify(@overlay0) [];
+ --grey-2: #rgbify(@overlay0) [];
+ --ig-link: #rgbify(@accent-color) [];
+ --ig-error-or-destructive: #rgbify(@maroon) [];
+ --ig-success: #rgbify(@green) [];
+ --blue-2: #rgbify(@blue) [];
+ --ig-close-friends-refreshed: #rgbify(@green) [];
+ --ig-text-input-border-hover-prism: #rgbify(@surface1) [];
+ --ig-toggle-outline-prism: #rgbify(@text) [];
+ --ig-toggle-background-on-prism: #rgbify(@text) [];
+ --ig-stroke-prism: #rgbify(@crust) [];
+ scrollbar-color: @accent-color @crust;
+ }
+
+ #splash-screen {
+ background-color: @base !important;
}
- // Text selection
- *::selection {
+
+ ::selection {
color: @dark-color;
background-color: @accent-color;
}
+
/* Sidebar */
.x1xgvd2v {
background-color: @crust !important;
@@ -120,7 +131,12 @@
stroke: @text;
}
- /* story progress bar */
+ /* Story background */
+ .x5qyhuo {
+ background-color: @base;
+ }
+
+ /* Story progress bar */
._ac3p {
background-color: @accent-color !important;
}
@@ -137,7 +153,7 @@
}
&[aria-label^="Story by"][aria-label$="not seen"] span {
- outline-color: @mauve;
+ outline-color: @accent-color;
outline-width: 0.2rem;
}
&[aria-label^="Story by"]:not([aria-label$="not seen"]) span {
@@ -161,17 +177,11 @@
}
/* Icons */
- svg {
- color: @text;
- fill: @text;
- }
svg[aria-label="Unlike"] {
fill: @accent-color;
}
-
- /* The close icon on the dark wrapper */
svg[aria-label="Close"] {
- color: var(--web-always-white);
+ color: @text;
}
svg[aria-label="Verified"] {
fill: @accent-color;
@@ -179,10 +189,11 @@
/* Share box */
.xzloghq {
- background-color: @blue;
+ background-color: @surface0;
+ color: @text !important;
&:hover {
- color: @mantle;
- background-color: @accent-color;
+ color: @mantle !important;
+ background-color: @accent-color !important;
}
}
.xk5f4mz {
@@ -209,7 +220,7 @@
background-color: @overlay1;
}
.x1psfjxj {
- background-color: @text;
+ background-color: @mantle;
}
span[data-bloks-name="bk.components.TextSpan"] {
color: @accent-color !important;
@@ -512,6 +523,28 @@
@mauve 60%,
@blue 90%
);
+ /* Instagram text logo */
+ [style*="background-image: url(\"https://static.cdninstagram.com/rsrc.php/v3/yU/r/H5Bq7ru-y9E.png\");"]
+ {
+ @svg: escape(
+ ' '
+ );
+ background-image: url("data:image/svg+xml,@{svg}") !important;
+ background-position: -3px -7px !important;
+ background-size: unset !important;
+ }
+ /* 2fa lock icon */
+ [aria-label="Two factor authentication lock icon"] {
+ @svg: escape(
+ ' '
+ );
+ background: url("data:image/svg+xml,@{svg}") no-repeat !important;
+ height: 0 !important;
+ width: 0 !important;
+ padding-left: 76px !important;
+ padding-top: 76px !important;
+ background-size: unset !important;
+ }
/* "All caught up" icon */
img[src="/images/instagram/xig/web/illo-confirm-refresh-light.png"] {
@svg: escape(
@@ -563,7 +596,7 @@
._acas:not(._acao) {
&,
svg {
- color: @crust !important;
+ color: @crust;
fill: @mantle;
}
}
@@ -598,10 +631,10 @@
}
/* Input placeholders */
- ._ac4d::placeholder,
- ._aauy::placeholder,
- textarea::placeholder {
- color: @subtext0;
+ input, textarea {
+ &::placeholder {
+ color: @subtext0 !important;
+ }
}
/* Settings */
@@ -614,6 +647,10 @@
._aav4 {
background-color: @crust;
}
+ /* Settings saved toast */
+ ._abmp {
+ color: @text;
+ }
/* Bloks */
.wbloks_1[data-bloks-name="bk.components.Collection"] {
From c9018634a7a9dffca082744d027b46df7d78d435 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 29 Mar 2024 18:45:10 +0000
Subject: [PATCH 30/82] style: format code with prettier
---
styles/instagram/catppuccin.user.css | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/styles/instagram/catppuccin.user.css b/styles/instagram/catppuccin.user.css
index b582f3e5eb..61aecc6617 100644
--- a/styles/instagram/catppuccin.user.css
+++ b/styles/instagram/catppuccin.user.css
@@ -107,7 +107,7 @@
--ig-stroke-prism: #rgbify(@crust) [];
scrollbar-color: @accent-color @crust;
}
-
+
#splash-screen {
background-color: @base !important;
}
@@ -631,7 +631,8 @@
}
/* Input placeholders */
- input, textarea {
+ input,
+ textarea {
&::placeholder {
color: @subtext0 !important;
}
From 2260ad617e61ef8373679fd417a7f78f6eaeb18d Mon Sep 17 00:00:00 2001
From: uncenter <47499684+uncenter@users.noreply.github.com>
Date: Fri, 29 Mar 2024 16:47:42 -0400
Subject: [PATCH 31/82] fix(chatgpt): some other login page (#731)
---
styles/chatgpt/catppuccin.user.css | 181 ++++++++++++++++++++++++++---
1 file changed, 162 insertions(+), 19 deletions(-)
diff --git a/styles/chatgpt/catppuccin.user.css b/styles/chatgpt/catppuccin.user.css
index 717b041bd2..33c58611af 100644
--- a/styles/chatgpt/catppuccin.user.css
+++ b/styles/chatgpt/catppuccin.user.css
@@ -2,7 +2,7 @@
@name ChatGPT Catppuccin
@namespace github.com/catppuccin/userstyles/styles/chatgpt
@homepageURL https://github.com/catppuccin/userstyles/tree/main/styles/chatgpt
-@version 0.2.5
+@version 0.2.6
@updateURL https://github.com/catppuccin/userstyles/raw/main/styles/chatgpt/catppuccin.user.css
@supportURL https://github.com/catppuccin/userstyles/issues?q=is%3Aopen+is%3Aissue+label%3Achatgpt
@description Soothing pastel theme for ChatGPT
@@ -927,6 +927,147 @@
}
}
+@-moz-document domain("auth.openai.com") {
+ @media (prefers-color-scheme: light) {
+ :root {
+ #catppuccin(@lightFlavor, @accentColor);
+ }
+ }
+
+ @media (prefers-color-scheme: dark) {
+ :root {
+ #catppuccin(@darkFlavor, @accentColor);
+ }
+ }
+
+ #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];
+ @accent-color: @catppuccin[@@lookup][@@accent];
+
+ color-scheme: if(@lookup = latte, light, dark);
+ color: @text;
+ caret-color: @text;
+
+ a {
+ color: @accent-color;
+ }
+
+ body,
+ .oai-header,
+ .login-container {
+ background-color: @base;
+ }
+
+ img[alt="OpenAI's Logo"] {
+ @svg: escape(
+ ' '
+ );
+ height: 0 !important;
+ width: 0 !important;
+ padding-left: 32px !important;
+ padding-top: 32px !important;
+ margin-top: 32px;
+ background: url("data:image/svg+xml,@{svg}") no-repeat !important;
+ }
+
+ .title {
+ color: @text;
+ }
+
+ .email-input {
+ background-color: @base;
+ border-color: @surface0;
+ color: @text;
+
+ &:focus,
+ &:valid {
+ border-color: @accent-color;
+
+ & + .email-label {
+ color: @accent-color;
+ background-color: @base;
+ }
+ }
+ }
+ .email-label {
+ background-color: @base;
+ color: @subtext0;
+ }
+
+ .continue-btn {
+ background-color: @accent-color;
+ color: @base;
+ }
+
+ .divider-wrapper {
+ &::before,
+ &::after {
+ border-bottom-color: @surface2;
+ }
+ }
+
+ .social-btn {
+ background-color: @mantle;
+ border-color: @surface0;
+ color: @text;
+ }
+
+ @orange: mix(@red, @yellow);
+
+ .social-logo {
+ height: 0 !important;
+ width: 0 !important;
+ padding-left: 20px !important;
+ padding-top: 20px !important;
+ }
+
+ img[alt="Google logo"] {
+ @svg: escape(
+ ' '
+ );
+ background-image: url("data:image/svg+xml;charset=utf-8,@{svg}");
+ }
+ img[alt="Microsoft logo"] {
+ @svg: escape(
+ ' '
+ );
+
+ background-image: url("data:image/svg+xml;charset=utf-8,@{svg}");
+ }
+ img[alt="Apple logo"] {
+ @svg: escape(
+ ' '
+ );
+ background-image: url("data:image/svg+xml;charset=utf-8,@{svg}");
+ }
+ }
+}
+
@-moz-document domain("auth0.openai.com") {
@media (prefers-color-scheme: light) {
:root {
@@ -988,7 +1129,7 @@
--gray-dark: @overlay2;
--gray-darkest: @text;
- .c4ca43590 {
+ .cb2dfcee4 {
background-color: @accent-color;
color: @base;
}
@@ -1007,23 +1148,25 @@
@orange: mix(@red, @yellow);
- .c7e427425[data-provider^="google"] {
- @svg: escape(
- ' '
- );
- background-image: url("data:image/svg+xml;charset=utf-8,@{svg}");
- }
- .c7e427425[data-provider^="windowslive"] {
- @svg: escape(
- ' '
- );
- background-image: url("data:image/svg+xml;charset=utf-8,@{svg}");
- }
- .c7e427425[data-provider^="apple"] {
- @svg: escape(
- ' '
- );
- background-image: url("data:image/svg+xml;charset=utf-8,@{svg}");
+ button > span {
+ &[data-provider^="google"] {
+ @svg: escape(
+ ' '
+ );
+ background-image: url("data:image/svg+xml;charset=utf-8,@{svg}");
+ }
+ &[data-provider^="windowslive"] {
+ @svg: escape(
+ ' '
+ );
+ background-image: url("data:image/svg+xml;charset=utf-8,@{svg}");
+ }
+ &[data-provider^="apple"] {
+ @svg: escape(
+ ' '
+ );
+ background-image: url("data:image/svg+xml;charset=utf-8,@{svg}");
+ }
}
}
}
From c6962c17568af3046c27b66f59c6c8c23e1b2cf6 Mon Sep 17 00:00:00 2001
From: uncenter <47499684+uncenter@users.noreply.github.com>
Date: Sat, 30 Mar 2024 11:35:41 -0400
Subject: [PATCH 32/82] fix(migadu-webmail): selected contacts (#732)
---
styles/migadu-webmail/catppuccin.user.css | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/styles/migadu-webmail/catppuccin.user.css b/styles/migadu-webmail/catppuccin.user.css
index 510b3e1bcd..5870902f12 100644
--- a/styles/migadu-webmail/catppuccin.user.css
+++ b/styles/migadu-webmail/catppuccin.user.css
@@ -2,7 +2,7 @@
@name Migadu Webmail Catppuccin
@namespace github.com/catppuccin/userstyles/styles/migadu-webmail
@homepageURL https://github.com/catppuccin/userstyles/tree/main/styles/migadu-webmail
-@version 0.0.5
+@version 0.0.6
@updateURL https://github.com/catppuccin/userstyles/raw/main/styles/migadu-webmail/catppuccin.user.css
@supportURL https://github.com/catppuccin/userstyles/issues?q=is%3Aopen+is%3Aissue+label%3Amigadu-webmail
@description Soothing pastel theme for Migadu Webmail
@@ -417,6 +417,18 @@
}
}
+ #V-PopupsContacts .e-contact-item, .messageListItem {
+ border-left-color: @surface2;
+
+ &.selected, &.checked {
+ background-color: fade(@accent-color, 30%);
+
+ &.focused {
+ border-left-color: @accent-color;
+ }
+ }
+ }
+
/* Send mail modal */
.squire-toolbar,
#V-PopupsCompose .attachmentAreaParent {
From 8559d57b6ea7ab22cec29c141feafb0493965329 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 30 Mar 2024 15:36:07 +0000
Subject: [PATCH 33/82] style: format code with prettier
---
styles/migadu-webmail/catppuccin.user.css | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/styles/migadu-webmail/catppuccin.user.css b/styles/migadu-webmail/catppuccin.user.css
index 5870902f12..1359e92665 100644
--- a/styles/migadu-webmail/catppuccin.user.css
+++ b/styles/migadu-webmail/catppuccin.user.css
@@ -417,10 +417,12 @@
}
}
- #V-PopupsContacts .e-contact-item, .messageListItem {
+ #V-PopupsContacts .e-contact-item,
+ .messageListItem {
border-left-color: @surface2;
- &.selected, &.checked {
+ &.selected,
+ &.checked {
background-color: fade(@accent-color, 30%);
&.focused {
From c7227d00ef1d9edb9b6630a410130f7ffeac87b3 Mon Sep 17 00:00:00 2001
From: Isabel
Date: Sat, 30 Mar 2024 17:33:23 +0000
Subject: [PATCH 34/82] chore(yt): cleanup (#733)
---
styles/youtube/catppuccin.user.css | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/styles/youtube/catppuccin.user.css b/styles/youtube/catppuccin.user.css
index 00e9d4dd10..73b8860ade 100644
--- a/styles/youtube/catppuccin.user.css
+++ b/styles/youtube/catppuccin.user.css
@@ -2,7 +2,7 @@
@name YouTube Catppuccin
@namespace github.com/catppuccin/userstyles/styles/youtube
@homepageURL https://github.com/catppuccin/userstyles/tree/main/styles/youtube
-@version 3.5.1
+@version 3.5.2
@updateURL https://github.com/catppuccin/userstyles/raw/main/styles/youtube/catppuccin.user.css
@supportURL https://github.com/catppuccin/userstyles/issues?q=is%3Aopen+is%3Aissue+label%3Ayoutube
@description Soothing pastel theme for YouTube
@@ -421,10 +421,10 @@
/* change color of the player edges */
#ytd-player #container when (@oledOn =0) {
- background: @base !important;
+ background: @crust !important;
}
- /* explandable meta */
+ /* expandable meta */
ytd-expandable-metadata-renderer {
--yt-lightsource-section1-color: @base !important;
--yt-lightsource-section2-color: @surface0 !important;
From a735015c21edd25b38d0e4223cef810e5c83c640 Mon Sep 17 00:00:00 2001
From: uncenter <47499684+uncenter@users.noreply.github.com>
Date: Sun, 31 Mar 2024 06:03:21 -0400
Subject: [PATCH 35/82] refactor(brave-search): rewrite (#715)
* refactor(brave-search): rewrite
* feat: added logo accent color
* feat(brave-search): theme settings panel, filled buttons
* fix(brave-search): lint issues + formatting
* feat(brave-search): settings dialog related stuff
* fix(brave-search): linter
---------
Co-authored-by: ndsboy
---
styles/brave-search/catppuccin.user.css | 244 ++++++++++++------------
1 file changed, 123 insertions(+), 121 deletions(-)
diff --git a/styles/brave-search/catppuccin.user.css b/styles/brave-search/catppuccin.user.css
index 08977ac1a7..7cf42dc7b1 100644
--- a/styles/brave-search/catppuccin.user.css
+++ b/styles/brave-search/catppuccin.user.css
@@ -2,7 +2,7 @@
@name Brave Search Catppuccin
@namespace github.com/catppuccin/userstyles/styles/brave-search
@homepageURL https://github.com/catppuccin/userstyles/tree/main/styles/brave-search
-@version 1.0.5
+@version 2.0.0
@updateURL https://github.com/catppuccin/userstyles/raw/main/styles/brave-search/catppuccin.user.css
@supportURL https://github.com/catppuccin/userstyles/issues?q=is%3Aopen+is%3Aissue+label%3Abrave-search
@description Soothing pastel theme for Brave Search
@@ -69,130 +69,132 @@
@accent-color: @catppuccin[@@lookup][@@accent];
color-scheme: if(@lookup = latte, light, dark);
- --color-container-highlight: @crust;
- --search-serp-container-background: @mantle;
- --body-bg: @base;
- --bg-glassy: @mantle;
- --bg-1: @surface1;
- --bg-2: @surface0;
- --bg-02: @crust;
- --bg-04: @mantle;
- --bg-green: @green;
- --bg-blue: @blue;
- --bg-red: @red;
- --bg-favicon: @surface1;
- --bg-form-control-selected: @surface2;
- --bg-form-control-unselected: @surface0;
- --form-control-selected: @blue;
- --form-control-hover: @lavender;
- --form-control-focus: @text;
- --settings-header-bg: @mantle;
- --settings-header-text: @text;
- --settings-header-icon: @blue;
- --settings-widget-text: @subtext0;
- --settings-item-text: @text;
- --settings-item-icon: @blue;
- --settings-item-border: @overlay0;
- --settings-item-border-2: @overlay2;
- --settings-btn-bg: @surface0;
- --settings-btn-text: @text;
- --settings-widget-outline: @overlay0;
- --settings-independent-score: @blue;
- --settings-global-score: @peach;
- --brave-supporter-bg: @base;
- --brave-supporter-text: @text;
- --context-menu-header-border: @overlay0;
- --color-primary: @text;
- --color-primary-2: @subtext1;
- --color-primary-3: @subtext0;
- --color-white: @text;
- --color-gray-2: @subtext1;
- --color-gray-3: @subtext0;
- --color-gray-4: @overlay2;
- --color-gray-5: @overlay1;
- --color-gray-6: @overlay0;
- --color-green: @green;
- --color-red: @red;
- --color-blue: @blue;
- --info-color: @blue;
- --link-primary: @blue;
- --link-secondary: @blue;
- --link-visited: @mauve;
- --snippet-url: @subtext0;
- --separator-dot: @overlay0;
- --theme-purple: @mauve;
- --theme-yellow: @yellow;
- --border-color: @overlay0;
- --blurple-300: @lavender;
- --text-01: @text;
- --text-02: @subtext1;
- --text-03: @subtext0;
- --interactive-04: @blue;
- --interactive-05: @blue;
- --interactive-06: @blue;
- --interactive-07: @blue;
- --interactive-08: @blue;
- --focus-border: @overlay2;
- --divider-01: @overlay0;
- --disabled: @overlay1;
- --btn-filled-bg: @surface0;
- --btn-filled-bg-hover: @surface1;
- --btn-filled-text-active: @text;
- --btn-filled-bg-active: @surface2;
- --btn-filled-text-disabled: @overlay1;
- --btn-outline-border: @overlay0;
- --btn-outline-border-hover: @overlay1;
- --btn-outline-text: @text;
- --btn-outline-text-hover: @subtext1;
- --btn-outline-text-active: @text;
- --btn-outline-border-active: @overlay2;
- --btn-outline-text-disabled: @overlay1;
- --btn-icon-svg-hover: @subtext1;
- --btn-icon-bg-hover: @surface1;
- --btn-icon-svg-active: @text;
- --code-bg-0: @base;
- --code-border: @overlay0;
- --code-color-1: @surface0;
- --code-color-2: @text;
- --code-color-3: @green;
- --code-color-4: @blue;
- --code-color-5: @pink;
- --search-bgd-01: @overlay0;
- --search-bgd-02: @base;
- --search-bgd-03: @crust;
- --search-bgd-04: @mantle;
- --search-bgd-05: @base;
- --search-bgd-06: @surface0;
- --search-bgd-07: @mantle;
- --search-bgd-08: @crust;
- --search-line-01: @surface0;
- --search-line-02: @subtext0;
- --search-text-01: @text;
- --search-text-02: @subtext1;
- --search-text-03: @subtext0;
- --search-text-04: @subtext0;
- --search-text-05: @blue;
- --search-text-06: @overlay0;
- --search-text-09: @yellow;
- --search-text-10: @peach;
- --search-interactive-01: @blue;
- --search-interactive-02: @mauve;
- --search-interactive-03: @mauve;
- --search-interactive-04: @sky;
- --search-interactive-05: @mauve;
- --gray-30: @base;
- --gray-60: @surface0;
- --gray-90: @overlay0;
- --gray-110: @subtext0;
- --gray-120: @text;
- --secondary-90: @lavender;
-
- #searchform > .searchbox-wrapper::after {
- background-image: none;
+
+ --color-page-background: @base;
+ --color-container-background: @crust;
+ --color-container-highlight: @mantle;
+ --color-serp-header-background: @crust;
+ --color-text-interactive: @accent-color;
+ --color-divider-subtle: @surface0;
+ --color-divider-interactive: @accent-color;
+ --color-text-primary: @text;
+ --color-serp-bar-bg: @mantle;
+ --color-serp-divider-subtle-container: @surface0;
+ --color-gray-30: @subtext0;
+ --color-gray-40: @overlay2;
+ --color-text-secondary: @subtext1;
+ --color-text-tertiary: @subtext0;
+ --color-icon-default: @overlay2;
+ --color-serp-snippet-background: @base;
+ --color-link-default: @blue;
+ --color-link-visited: @mauve;
+ --color-tabs-search-text-default: @accent-color;
+ --color-primary-50: @accent-color;
+ --color-primitive-primary-60: @accent-color;
+ --color-primitive-primary-70: darken(@accent-color, 5%);
+ --color-container-interactive: transparent;
+ --color-button-background: @accent-color;
+ --color-button-disabled: fade(@surface2, 30%);
+
+ dialog {
+ color: @text;
+
+ &::backdrop {
+ background-color: fade(@crust, 30%);
+ }
+ }
+
+ #searchform::after {
+ outline-color: @surface0;
}
#searchform-actions::before {
background: none !important;
}
+ #submit-button {
+ &:hover:not(:disabled) {
+ background: linear-gradient(
+ 314deg,
+ @peach 8.49%,
+ @pink 43.72%,
+ @mauve 99.51%
+ );
+ }
+
+ svg {
+ fill: @overlay2;
+ }
+ }
+ #searchbox::placeholder {
+ color: @subtext0;
+ }
+
+ .button.type--filled.theme--default {
+ color: @base;
+
+ &:disabled {
+ color: fade(@text, 50%);
+ }
+ }
+ .button.type--outlined.theme--default:hover {
+ background-color: @accent-color;
+ border-color: @accent-color !important;
+ color: @base !important;
+ }
+ .tab-item.active .icon {
+ fill: @accent-color !important;
+ }
+ .tab-item.active ::after {
+ background: @accent-color !important;
+ }
+
+ .logo-img {
+ @svg: escape(
+ ' '
+ );
+ content: url("data:image/svg+xml,@{svg}");
+ }
+
+ .nav-logo .logo-large {
+ @svg: escape(
+ ' '
+ );
+ content: url("data:image/svg+xml,@{svg}");
+ }
+
+ .nav-logo .logo-small {
+ @svg: escape(
+ ' '
+ );
+ content: url("data:image/svg+xml,@{svg}");
+ }
+
+ .waves-bottom {
+ @svg: escape(
+ ' '
+ );
+ background-image: url("data:image/svg+xml,@{svg}");
+ }
+
+ .waves-top {
+ @svg: escape(
+ ' '
+ );
+ background-image: url("data:image/svg+xml,@{svg}");
+ }
+
+ input[type="radio"]:checked::after {
+ background-color: @accent-color;
+ }
+
+ .feedback-footer {
+ #logo {
+ @svg: escape(
+ ' '
+ );
+ content: url("data:image/svg+xml,@{svg}");
+ height: 48px;
+ }
+ }
}
}
// vim:ft=less
From 420a72a6cef966e92a720d9f9aa56b9c6a0775a7 Mon Sep 17 00:00:00 2001
From: uncenter <47499684+uncenter@users.noreply.github.com>
Date: Sun, 31 Mar 2024 10:56:23 -0400
Subject: [PATCH 36/82] refactor(github): remove unthemed & unused vars (#734)
---
styles/github/catppuccin.user.css | 180 +-----------------------------
1 file changed, 6 insertions(+), 174 deletions(-)
diff --git a/styles/github/catppuccin.user.css b/styles/github/catppuccin.user.css
index bb9d4a63ae..e6154abefb 100644
--- a/styles/github/catppuccin.user.css
+++ b/styles/github/catppuccin.user.css
@@ -2,7 +2,7 @@
@name GitHub Catppuccin
@namespace github.com/catppuccin/userstyles/styles/github
@homepageURL https://github.com/catppuccin/userstyles/tree/main/styles/github
-@version 1.5.1
+@version 1.5.2
@updateURL https://github.com/catppuccin/userstyles/raw/main/styles/github/catppuccin.user.css
@supportURL https://github.com/catppuccin/userstyles/issues?q=is%3Aopen+is%3Aissue+label%3Agithub
@description Soothing pastel theme for GitHub
@@ -197,96 +197,6 @@
--header-borderColor-divider: #8b949e;
--headerSearch-bgColor: @base;
--headerSearch-borderColor: @surface0;
- --data-blue-color: #0576ff;
- --data-auburn-color: #a86f6b;
- --data-orange-color: #984b10;
- --data-yellow-color: #895906;
- --data-green-color: #2f6f37;
- --data-teal-color: #106c70;
- --data-purple-color: #975bf1;
- --data-pink-color: #d34591;
- --data-red-color: #eb3342;
- --data-gray-color: #576270;
- --display-blue-bgColor-muted: #001a47;
- --display-blue-bgColor-emphasis: #0576ff;
- --display-blue-fgColor: #4da0ff;
- --display-blue-borderColor-muted: #002766;
- --display-blue-borderColor-emphasis: #0576ff;
- --display-green-bgColor-muted: #122117;
- --display-green-bgColor-emphasis: #388f3f;
- --display-green-fgColor: #41b445;
- --display-green-borderColor-muted: #182f1f;
- --display-green-borderColor-emphasis: #388f3f;
- --display-orange-bgColor-muted: #311708;
- --display-orange-bgColor-emphasis: #c46212;
- --display-orange-fgColor: #ed8326;
- --display-orange-borderColor-muted: #43200a;
- --display-orange-borderColor-emphasis: #c46212;
- --display-purple-bgColor-muted: #211047;
- --display-purple-bgColor-emphasis: #975bf1;
- --display-purple-fgColor: #b687f7;
- --display-purple-borderColor-muted: #31146b;
- --display-purple-borderColor-emphasis: #975bf1;
- --display-red-bgColor-muted: #3c0614;
- --display-red-bgColor-emphasis: #eb3342;
- --display-red-fgColor: #f27d83;
- --display-red-borderColor-muted: #58091a;
- --display-red-borderColor-emphasis: #eb3342;
- --display-yellow-bgColor-muted: #2e1a00;
- --display-yellow-bgColor-emphasis: #aa7109;
- --display-yellow-fgColor: #d3910d;
- --display-yellow-borderColor-muted: #3d2401;
- --display-yellow-borderColor-emphasis: #aa7109;
- --display-gray-bgColor-muted: #1c1c1c;
- --display-gray-bgColor-emphasis: #6e7f96;
- --display-gray-fgColor: #92a1b5;
- --display-gray-borderColor-muted: #2a2b2d;
- --display-gray-borderColor-emphasis: #6e7f96;
- --display-auburn-bgColor-muted: #271817;
- --display-auburn-bgColor-emphasis: #a86f6b;
- --display-auburn-fgColor: #bf9592;
- --display-auburn-borderColor-muted: #3a2422;
- --display-auburn-borderColor-emphasis: #a86f6b;
- --display-brown-bgColor-muted: #241c14;
- --display-brown-bgColor-emphasis: #94774c;
- --display-brown-fgColor: #b69a6d;
- --display-brown-borderColor-muted: #342a1d;
- --display-brown-borderColor-emphasis: #94774c;
- --display-lemon-bgColor-muted: #291d00;
- --display-lemon-bgColor-emphasis: #977b0c;
- --display-lemon-fgColor: #ba9b12;
- --display-lemon-borderColor-muted: #372901;
- --display-lemon-borderColor-emphasis: #977b0c;
- --display-olive-bgColor-muted: #171e0b;
- --display-olive-bgColor-emphasis: #7a8321;
- --display-olive-fgColor: #a2a626;
- --display-olive-borderColor-muted: #252d10;
- --display-olive-borderColor-emphasis: #7a8321;
- --display-lime-bgColor-muted: #141f0f;
- --display-lime-bgColor-emphasis: #5f892f;
- --display-lime-fgColor: #7dae37;
- --display-lime-borderColor-muted: #1f3116;
- --display-lime-borderColor-emphasis: #5f892f;
- --display-pine-bgColor-muted: #082119;
- --display-pine-bgColor-emphasis: #18915e;
- --display-pine-fgColor: #1bb673;
- --display-pine-borderColor-muted: #0b3224;
- --display-pine-borderColor-emphasis: #18915e;
- --display-teal-bgColor-muted: #041f25;
- --display-teal-bgColor-emphasis: #158a8a;
- --display-teal-fgColor: #1cb0ab;
- --display-teal-borderColor-muted: #073036;
- --display-teal-borderColor-emphasis: #158a8a;
- --display-cyan-bgColor-muted: #001f29;
- --display-cyan-bgColor-emphasis: #0587b3;
- --display-cyan-fgColor: #07ace4;
- --display-cyan-borderColor-muted: #002e3d;
- --display-cyan-borderColor-emphasis: #0587b3;
- --display-indigo-bgColor-muted: #1b183f;
- --display-indigo-bgColor-emphasis: #7070e1;
- --display-indigo-fgColor: #9899ec;
- --display-indigo-borderColor-muted: #25215f;
- --display-indigo-borderColor-emphasis: #7070e1;
--avatar-bgColor: fade(@text, 26%);
--avatar-borderColor: @surface0;
--avatar-shadow: 0px 0px 0px 2px #0d1117;
@@ -344,7 +254,6 @@
--controlKnob-borderColor-rest: @surface2;
--controlKnob-borderColor-disabled: #21262db3;
--controlKnob-borderColor-checked: @blue;
- --counter-borderColor: #0000;
--button-default-fgColor-rest: @text;
--button-default-bgColor-rest: @surface0;
--button-default-bgColor-hover: @surface1;
@@ -401,7 +310,7 @@
--button-danger-bgColor-rest: @surface0;
--button-danger-bgColor-hover: @red;
--button-danger-bgColor-active: darken(@red, 5%);
- --button-danger-bgColor-disabled: #21262db3;
+ --button-danger-bgColor-disabled: @base;
--button-danger-borderColor-rest: @surface1;
--button-danger-borderColor-hover: @surface2;
--button-danger-borderColor-active: @surface2;
@@ -439,6 +348,10 @@
--underlineNav-borderColor-hover: #6e768166;
--underlineNav-iconColor-rest: #848d97;
--selection-bgColor: #1f6febb3;
+ --reactionButton-selected-bgColor-rest: fade(@accent-color, 20%);
+ --reactionButton-selected-bgColor-hover: fade(@accent-color, 35%);
+ --reactionButton-selected-fgColor-rest: @accent-color;
+ --reactionButton-selected-fgColor-hover: @accent-color;
--fgColor-default: @text;
--fgColor-muted: @subtext1;
--fgColor-onEmphasis: @base;
@@ -553,99 +466,18 @@
--color-prettylights-syntax-markup-changed-text: @text;
--color-prettylights-syntax-markup-changed-bg: fadeout(@yellow, 60%);
--color-prettylights-syntax-markup-ignored-text: @text;
- --color-scale-black: #010409;
- --color-scale-transparent: #0000;
--color-scale-white: @text;
- --color-scale-gray-0: #f0f6fc;
- --color-scale-gray-1: #c9d1d9;
- --color-scale-gray-2: #b1bac4;
--color-scale-gray-3: @overlay2;
- --color-scale-gray-4: #6e7681;
--color-scale-gray-5: @overlay0;
--color-scale-gray-6: @surface1;
--color-scale-gray-7: @surface1;
- --color-scale-gray-8: #161b22;
- --color-scale-gray-9: #0d1117;
- --color-scale-blue-0: #cae8ff;
- --color-scale-blue-1: #a5d6ff;
--color-scale-blue-2: @sky;
- --color-scale-blue-3: #58a6ff;
- --color-scale-blue-4: #388bfd;
--color-scale-blue-5: @blue;
- --color-scale-blue-6: #1158c7;
- --color-scale-blue-7: #0d419d;
- --color-scale-blue-8: #0c2d6b;
- --color-scale-blue-9: #051d4d;
- --color-scale-green-0: #aff5b4;
- --color-scale-green-1: #7ee787;
- --color-scale-green-2: #56d364;
--color-scale-green-3: @green;
--color-scale-green-4: @green;
- --color-scale-green-5: #238636;
- --color-scale-green-6: #196c2e;
- --color-scale-green-7: #0f5323;
- --color-scale-green-8: #033a16;
- --color-scale-green-9: #04260f;
- --color-scale-yellow-0: #f8e3a1;
- --color-scale-yellow-1: #f2cc60;
- --color-scale-yellow-2: #e3b341;
--color-scale-yellow-3: @peach;
- --color-scale-yellow-4: #bb8009;
- --color-scale-yellow-5: #9e6a03;
- --color-scale-yellow-6: #845306;
- --color-scale-yellow-7: #693e00;
- --color-scale-yellow-8: #4b2900;
- --color-scale-yellow-9: #341a00;
- --color-scale-orange-0: #ffdfb6;
- --color-scale-orange-1: #ffc680;
- --color-scale-orange-2: #ffa657;
- --color-scale-orange-3: #f0883e;
--color-scale-orange-4: @peach;
- --color-scale-orange-5: #bd561d;
- --color-scale-orange-6: #9b4215;
- --color-scale-orange-7: #762d0a;
- --color-scale-orange-8: #5a1e02;
- --color-scale-orange-9: #3d1300;
- --color-scale-red-0: #ffdcd7;
- --color-scale-red-1: #ffc1ba;
- --color-scale-red-2: #ffa198;
- --color-scale-red-3: #ff7b72;
--color-scale-red-4: @red;
- --color-scale-red-5: #da3633;
- --color-scale-red-6: #b62324;
- --color-scale-red-7: #8e1519;
- --color-scale-red-8: #67060c;
- --color-scale-red-9: #490202;
- --color-scale-purple-0: #eddeff;
- --color-scale-purple-1: #e2c5ff;
- --color-scale-purple-2: #d2a8ff;
- --color-scale-purple-3: #bc8cff;
- --color-scale-purple-4: #a371f7;
- --color-scale-purple-5: #8957e5;
- --color-scale-purple-6: #6e40c9;
- --color-scale-purple-7: #553098;
- --color-scale-purple-8: #3c1e70;
- --color-scale-purple-9: #271052;
- --color-scale-pink-0: #ffdaec;
- --color-scale-pink-1: #ffbedd;
- --color-scale-pink-2: #ff9bce;
- --color-scale-pink-3: #f778ba;
- --color-scale-pink-4: #db61a2;
- --color-scale-pink-5: #bf4b8a;
- --color-scale-pink-6: #9e3670;
- --color-scale-pink-7: #7d2457;
- --color-scale-pink-8: #5e103e;
- --color-scale-pink-9: #42062a;
- --color-scale-coral-0: #ffddd2;
- --color-scale-coral-1: #ffc2b2;
- --color-scale-coral-2: #ffa28b;
- --color-scale-coral-3: #f78166;
- --color-scale-coral-4: #ea6045;
- --color-scale-coral-5: #cf462d;
- --color-scale-coral-6: #ac3220;
- --color-scale-coral-7: #872012;
- --color-scale-coral-8: #640d04;
- --color-scale-coral-9: #460701;
--shadow-inset: inset 0px 1px 0px 0px @crust;
--shadow-resting-xsmall: 0px 1px 0px 0px @crust;
--shadow-resting-small: 0px 1px 0px 0px @crust, 0px 1px 3px 0px @crust;
From ac262aea86a9a8d01631ede5bb4082a9b6cb0858 Mon Sep 17 00:00:00 2001
From: uncenter <47499684+uncenter@users.noreply.github.com>
Date: Sun, 31 Mar 2024 12:33:48 -0400
Subject: [PATCH 37/82] feat(pronouns.page): init (#736)
---
scripts/userstyles.yml | 7 +
styles/pronouns.page/catppuccin.user.css | 464 +++++++++++++++++++++++
styles/pronouns.page/preview.webp | 3 +
3 files changed, 474 insertions(+)
create mode 100644 styles/pronouns.page/catppuccin.user.css
create mode 100644 styles/pronouns.page/preview.webp
diff --git a/scripts/userstyles.yml b/scripts/userstyles.yml
index fcfc5a2862..e4b7c384d6 100644
--- a/scripts/userstyles.yml
+++ b/scripts/userstyles.yml
@@ -595,6 +595,13 @@ userstyles:
readme:
app-link: "https://planetminecraft.com"
current-maintainers: [*night-lake]
+ pronouns.page:
+ name: Pronouns.page
+ categories: [social_networking]
+ color: pink
+ readme:
+ app-link: "https://pronouns.page/"
+ current-maintainers: [*uncenter]
proton:
name: Proton
categories: [productivity, email_client]
diff --git a/styles/pronouns.page/catppuccin.user.css b/styles/pronouns.page/catppuccin.user.css
new file mode 100644
index 0000000000..b24f4c0afb
--- /dev/null
+++ b/styles/pronouns.page/catppuccin.user.css
@@ -0,0 +1,464 @@
+/* ==UserStyle==
+@name Pronouns.page Catppuccin
+@namespace github.com/catppuccin/userstyles/styles/pronouns.page
+@homepageURL https://github.com/catppuccin/userstyles/tree/main/styles/pronouns.page
+@version 0.0.1
+@updateURL https://github.com/catppuccin/userstyles/raw/main/styles/pronouns.page/catppuccin.user.css
+@supportURL https://github.com/catppuccin/userstyles/issues?q=is%3Aopen+is%3Aissue+label%3Apronouns.page
+@description Soothing pastel theme for Pronouns.page
+@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 domain('pronouns.page') {
+ #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];
+ @accent-color: @catppuccin[@@lookup][@@accent];
+
+ color-scheme: if(@lookup = latte, light, dark);
+
+ background-color: @base !important;
+ color: @text !important;
+
+ --bs-body-color: @text;
+ --bs-body-bg: @base;
+ --bs-white-rgb: #rgbify(@crust) [];
+ --bs-primary-rgb: #rgbify(@accent-color) [];
+ --bs-secondary-rgb: #rgbify(@overlay0) [];
+ --bs-secondary-color: @subtext0;
+ --bs-tertiary-bg: @crust;
+ --bs-success-text-emphasis: @green;
+ --bs-info-text-emphasis: @sapphire;
+ --bs-warning-text-emphasis: @yellow;
+ --bs-danger-text-emphasis: @red;
+ --bs-light-text-emphasis: @text;
+ --bs-dark-text-emphasis: @subtext1;
+ --bs-heading-color: @text;
+ --bs-form-valid-color: @green;
+ --bs-form-valid-border-color: @green;
+ --bs-form-invalid-color: @red;
+ --bs-form-invalid-border-color: @red;
+
+ /* Buttons */
+
+ .btn-primary {
+ color: @crust;
+ --bs-btn-bg: @accent-color;
+ }
+
+ .btn-primary,
+ .btn-outline-primary {
+ --bs-btn-hover-bg: @accent-color;
+ --bs-btn-border-color: @accent-color;
+ --bs-btn-hover-border-color: @accent-color;
+ --bs-btn-active-bg: @accent-color;
+ --bs-btn-active-border-color: @accent-color;
+ --bs-btn-disabled-color: @accent-color;
+ --bs-btn-disabled-bg: transparent;
+ --bs-btn-disabled-border-color: @accent-color;
+ }
+
+ .btn-outline-primary {
+ color: @text;
+
+ &:hover {
+ color: @crust;
+ }
+ }
+
+ .btn-success {
+ --bs-btn-color: @crust;
+ --bs-btn-bg: @green;
+ --bs-btn-border-color: @green;
+ --bs-btn-hover-color: @crust;
+ --bs-btn-hover-bg: darken(@green, 5%);
+ --bs-btn-hover-border-color: darken(@green, 5%);
+ --bs-btn-active-color: @crust;
+ --bs-btn-active-bg: darken(@green, 5%);
+ --bs-btn-active-border-color: darken(@green, 5%);
+ --bs-btn-disabled-color: @text;
+ --bs-btn-disabled-bg: @green;
+ --bs-btn-disabled-border-color: @green;
+ }
+
+ .btn-outline-success {
+ color: @green;
+
+ &:hover {
+ color: @crust;
+ }
+
+ --bs-btn-color: @green;
+ --bs-btn-border-color: @green;
+ --bs-btn-hover-color: @crust;
+ --bs-btn-hover-bg: @green;
+ --bs-btn-hover-border-color: @green;
+ --bs-btn-active-color: @crust;
+ --bs-btn-active-bg: @green;
+ --bs-btn-active-border-color: @green;
+ --bs-btn-disabled-color: @green;
+ --bs-btn-disabled-border-color: @green;
+ }
+
+ .btn-outline-danger {
+ --bs-btn-color: @red;
+ --bs-btn-border-color: @red;
+ --bs-btn-hover-color: @crust;
+ --bs-btn-hover-bg: @red;
+ --bs-btn-hover-border-color: @red;
+ --bs-btn-active-color: @crust;
+ --bs-btn-active-bg: @red;
+ --bs-btn-active-border-color: @red;
+ --bs-btn-disabled-color: @red;
+ --bs-btn-disabled-border-color: @red;
+ }
+
+ .btn-secondary {
+ --bs-btn-color: @text;
+ --bs-btn-bg: @overlay0;
+ --bs-btn-border-color: @overlay0;
+ --bs-btn-hover-color: @text;
+ --bs-btn-hover-bg: @surface2;
+ --bs-btn-hover-border-color: @surface2;
+ --bs-btn-active-color: @text;
+ --bs-btn-active-bg: @surface2;
+ --bs-btn-active-border-color: @surface2;
+ --bs-btn-disabled-color: @text;
+ --bs-btn-disabled-bg: @overlay0;
+ --bs-btn-disabled-border-color: @overlay0;
+ }
+
+ .btn-outline-secondary {
+ --bs-btn-color: @overlay0;
+ --bs-btn-border-color: @overlay0;
+ --bs-btn-hover-color: @text;
+ --bs-btn-hover-bg: @overlay0;
+ --bs-btn-hover-border-color: @overlay0;
+ --bs-btn-active-color: @text;
+ --bs-btn-active-bg: @overlay0;
+ --bs-btn-active-border-color: @overlay0;
+ --bs-btn-disabled-color: @overlay0;
+ --bs-btn-disabled-border-color: @overlay0;
+ }
+
+ .btn-light {
+ &,
+ &:disabled,
+ &.disabled {
+ color: @text;
+ background-color: @crust;
+ }
+ }
+ .btn-dark,
+ .btn-outline-dark:hover {
+ color: @crust;
+ background-color: @text;
+ }
+ .btn-outline-dark {
+ color: @text;
+ }
+
+ /* Inputs */
+
+ .form-check-input:checked {
+ background-color: @accent-color !important;
+ border-color: @accent-color !important;
+ }
+
+ .form-control {
+ color: @text;
+ background-color: @mantle;
+ border-color: @surface0;
+ }
+
+ .dropdown-menu {
+ color: @text;
+ background-color: @mantle;
+ border-color: @surface0;
+
+ .dropdown-item {
+ color: @text;
+
+ &:hover,
+ &:focus {
+ background-color: @crust;
+ }
+ }
+ }
+
+ .vdp-datepicker__calendar {
+ background-color: @crust;
+ border-color: @surface0;
+
+ .disabled {
+ color: @subtext0;
+ }
+
+ .prev::after {
+ border-right-color: @text;
+ }
+ .next::after {
+ border-left-color: @text;
+ }
+
+ header span:not(.disabled):hover {
+ background-color: @text;
+ color: @crust;
+
+ &.prev::after {
+ border-right-color: @crust;
+ }
+ &.next::after {
+ border-left-color: @crust;
+ }
+ }
+
+ .cell.selected {
+ background-color: @accent-color;
+ color: @crust;
+ }
+ .cell:not(.blank, .disabled):hover {
+ border-color: @accent-color;
+ }
+ }
+
+ /* Header */
+
+ header .nav-item {
+ color: @text !important;
+
+ &:hover {
+ color: @accent-color !important;
+ }
+ }
+
+ .nav-custom:not(.nav-custom-start) .nav-item {
+ border-color: @surface0;
+
+ &:hover {
+ border-bottom-color: @accent-color !important;
+ }
+
+ &.btn.active,
+ &.btn:hover {
+ border-bottom-color: @accent-color !important;
+ }
+ }
+
+ .nav-custom-start .btn,
+ .nav-custom .btn {
+ border-inline-start-color: @surface2 !important;
+
+ &:hover,
+ &.active {
+ color: lighten(@accent-color, 5%) !important;
+ border-inline-start-color: @accent-color !important;
+ }
+ }
+
+ .hamburger-menu .btn-hamburger {
+ background-color: @crust !important;
+ border-color: @surface0;
+ }
+
+ .card {
+ background-color: @mantle;
+ }
+
+ /* Footer */
+
+ .separator {
+ > .mask::after {
+ box-shadow: 0 0 10px @text;
+ }
+
+ > span {
+ box-shadow: 0 2px 4px @text;
+ background: @text;
+ color: @crust;
+ }
+ }
+
+ /* Calendar */
+
+ .list-group-flare > :first-child {
+ border-top-color: @accent-color !important;
+ }
+ .list-group-item {
+ color: @text !important;
+ background-color: @mantle !important;
+ border-color: @surface0 !important;
+ }
+ .calendar > .day.day-event {
+ border-color: @accent-color;
+
+ &:hover {
+ background-color: darken(@accent-color, 10%) !important;
+
+ .day-number {
+ color: @crust;
+ text-shadow: none;
+ }
+ }
+
+ &.day-event-1 {
+ background-color: @accent-color;
+ color: @crust;
+ }
+ }
+
+ /* Dictionary */
+ .page-link {
+ color: @text;
+ background-color: @crust;
+ border-color: @surface0;
+ }
+ .page-item.active .page-link {
+ color: @crust;
+ background-color: @accent-color;
+ border-color: @accent-color;
+ }
+ .page-item.disabled .page-link {
+ color: @text;
+ background-color: @base;
+ border-color: @surface0;
+ }
+ table {
+ --bs-table-color: @text !important;
+ --bs-table-striped-color: @text !important;
+ --bs-table-hover-color: @text !important;
+ --bs-table-hover-bg: @surface1 !important;
+ --bs-table-striped-bg: @surface0 !important;
+ }
+
+ /* Other */
+
+ .bg-light {
+ background-color: @mantle !important;
+ }
+ .bg-dark {
+ background-color: @text !important;
+ }
+ .bg-white {
+ background-color: @crust !important;
+ }
+ .text-dark {
+ color: @text !important;
+ }
+ .colour-default {
+ color: @text !important;
+ }
+ .colour-pink {
+ color: @accent-color !important;
+ }
+ .colour-orange {
+ color: @peach !important;
+ }
+ .colour-red {
+ color: @red !important;
+ }
+ .colour-grey {
+ color: @overlay2 !important;
+ }
+
+ .alert-light {
+ background-color: @surface2;
+ color: @text;
+ }
+ .alert-info {
+ background-color: fade(@sapphire, 30%);
+ border-color: @sapphire;
+ color: @text;
+ }
+
+ .nav-pills {
+ --bs-nav-pills-link-active-bg: @accent-color;
+ --bs-nav-pills-link-active-color: @crust;
+ }
+
+ .badge {
+ --bs-badge-color: @text;
+ }
+
+ .border {
+ border-color: @surface0 !important;
+ }
+
+ a {
+ color: @accent-color;
+
+ &:hover {
+ color: lighten(@accent-color, 5%);
+ }
+ }
+
+ code {
+ color: @crust;
+ background-color: @accent-color;
+ border-color: transparent;
+ }
+
+ /* Share QR code */
+ [fill="#ff95bb"] {
+ fill: @accent-color;
+ }
+
+ mark,
+ .mark {
+ background-color: fade(@yellow, 50%);
+ color: @text;
+ }
+ }
+
+ body:not([data-theme="dark"]) {
+ #catppuccin(@lightFlavor, @accentColor);
+ }
+
+ body[data-theme="dark"],
+ body[data-theme="dark"]:not(.reduced-colours) {
+ #catppuccin(@darkFlavor, @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
diff --git a/styles/pronouns.page/preview.webp b/styles/pronouns.page/preview.webp
new file mode 100644
index 0000000000..e22bf7fdbd
--- /dev/null
+++ b/styles/pronouns.page/preview.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0ffcecd79b864a506bd6b1b4b9929f1976ff5f0bf2e2343dbe649a860d6e670a
+size 91268
From 679501193457c1f45313ed195b93236a568558d4 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 31 Mar 2024 16:34:14 +0000
Subject: [PATCH 38/82] chore: generate health files
---
.github/CODEOWNERS | 1 +
.github/ISSUE_TEMPLATE/userstyle.yml | 2 +-
.github/issue-labeler.yml | 2 ++
.github/labels.yml | 3 +++
.github/pr-labeler.yml | 1 +
README.md | 1 +
styles/pronouns.page/README.md | 36 ++++++++++++++++++++++++++++
7 files changed, 45 insertions(+), 1 deletion(-)
create mode 100644 styles/pronouns.page/README.md
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 2040a3365d..26951f0e1a 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -50,6 +50,7 @@
/styles/perplexity @isabelroses @tnixc
/styles/picrew @Nyatalieeee
/styles/planet-minecraft @night-lake
+/styles/pronouns.page @uncenter
/styles/proton @soya-daizu
/styles/pypi @trinkey
/styles/quizlet @spaghettiosareyummy
diff --git a/.github/ISSUE_TEMPLATE/userstyle.yml b/.github/ISSUE_TEMPLATE/userstyle.yml
index d3874b37df..312077124e 100644
--- a/.github/ISSUE_TEMPLATE/userstyle.yml
+++ b/.github/ISSUE_TEMPLATE/userstyle.yml
@@ -16,7 +16,7 @@ body:
label: What userstyles are you seeing the problem on?
description: "Don't worry about the `lbl:` prefix, it allows issues to be automatically labeled!"
multiple: true
- options: ["lbl:advent-of-code", "lbl:anilist", "lbl:arch-wiki", "lbl:boringproxy", "lbl:brave-search", "lbl:bsky", "lbl:bstats", "lbl:canvas-lms", "lbl:chatgpt", "lbl:chatreplay", "lbl:chess.com", "lbl:cinny", "lbl:codeberg", "lbl:crowdin", "lbl:deepl", "lbl:duckduckgo", "lbl:ecosia", "lbl:elk", "lbl:formative", "lbl:github", "lbl:gmail", "lbl:google", "lbl:google-photos", "lbl:graphite", "lbl:hackage", "lbl:hacker-news", "lbl:holodex", "lbl:homepage", "lbl:hoppscotch", "lbl:hyperpipe", "lbl:ichi.moe", "lbl:inoreader", "lbl:instagram", "lbl:invidious", "lbl:invokeai", "lbl:lastfm", "lbl:lemmy", "lbl:libreddit", "lbl:lichess", "lbl:lingva", "lbl:linkedin", "lbl:mastodon", "lbl:mdn", "lbl:modrinth", "lbl:microsoft-word", "lbl:migadu-webmail", "lbl:minesweeper", "lbl:nitter", "lbl:nixos-search", "lbl:nixos.wiki", "lbl:npm", "lbl:openmediavault", "lbl:paste.rs", "lbl:perplexity", "lbl:picrew", "lbl:pinterest", "lbl:planet-minecraft", "lbl:proton", "lbl:pypi", "lbl:quizlet", "lbl:reddit", "lbl:searxng", "lbl:snapchat-web", "lbl:spotify-web", "lbl:startpage", "lbl:skiff", "lbl:stylus", "lbl:substack", "lbl:syncthing", "lbl:tabnews", "lbl:tuta", "lbl:twitch", "lbl:twitter", "lbl:vercel", "lbl:whatsapp-web", "lbl:wikipedia", "lbl:wikiwand", "lbl:youtube", "lbl:nextjs"]
+ options: ["lbl:advent-of-code", "lbl:anilist", "lbl:arch-wiki", "lbl:boringproxy", "lbl:brave-search", "lbl:bsky", "lbl:bstats", "lbl:canvas-lms", "lbl:chatgpt", "lbl:chatreplay", "lbl:chess.com", "lbl:cinny", "lbl:codeberg", "lbl:crowdin", "lbl:deepl", "lbl:duckduckgo", "lbl:ecosia", "lbl:elk", "lbl:formative", "lbl:github", "lbl:gmail", "lbl:google", "lbl:google-photos", "lbl:graphite", "lbl:hackage", "lbl:hacker-news", "lbl:holodex", "lbl:homepage", "lbl:hoppscotch", "lbl:hyperpipe", "lbl:ichi.moe", "lbl:inoreader", "lbl:instagram", "lbl:invidious", "lbl:invokeai", "lbl:lastfm", "lbl:lemmy", "lbl:libreddit", "lbl:lichess", "lbl:lingva", "lbl:linkedin", "lbl:mastodon", "lbl:mdn", "lbl:modrinth", "lbl:microsoft-word", "lbl:migadu-webmail", "lbl:minesweeper", "lbl:nitter", "lbl:nixos-search", "lbl:nixos.wiki", "lbl:npm", "lbl:openmediavault", "lbl:paste.rs", "lbl:perplexity", "lbl:picrew", "lbl:pinterest", "lbl:planet-minecraft", "lbl:pronouns.page", "lbl:proton", "lbl:pypi", "lbl:quizlet", "lbl:reddit", "lbl:searxng", "lbl:snapchat-web", "lbl:spotify-web", "lbl:startpage", "lbl:skiff", "lbl:stylus", "lbl:substack", "lbl:syncthing", "lbl:tabnews", "lbl:tuta", "lbl:twitch", "lbl:twitter", "lbl:vercel", "lbl:whatsapp-web", "lbl:wikipedia", "lbl:wikiwand", "lbl:youtube", "lbl:nextjs"]
validations:
required: true
- type: textarea
diff --git a/.github/issue-labeler.yml b/.github/issue-labeler.yml
index 52cb881d87..8b517812fa 100644
--- a/.github/issue-labeler.yml
+++ b/.github/issue-labeler.yml
@@ -113,6 +113,8 @@ pinterest:
- '(lbl:pinterest)'
planet-minecraft:
- '(lbl:planet-minecraft)'
+pronouns.page:
+ - '(lbl:pronouns.page)'
proton:
- '(lbl:proton)'
pypi:
diff --git a/.github/labels.yml b/.github/labels.yml
index 55d25f19ca..e6a1ca734b 100644
--- a/.github/labels.yml
+++ b/.github/labels.yml
@@ -170,6 +170,9 @@
- name: planet-minecraft
description: Planet Minecraft
color: '#a6da95'
+- name: pronouns.page
+ description: Pronouns.page
+ color: '#f5bde6'
- name: proton
description: Proton
color: '#c6a0f6'
diff --git a/.github/pr-labeler.yml b/.github/pr-labeler.yml
index cadf7fc56e..8410b72d02 100644
--- a/.github/pr-labeler.yml
+++ b/.github/pr-labeler.yml
@@ -56,6 +56,7 @@ perplexity: styles/perplexity/**/*
picrew: styles/picrew/**/*
pinterest: styles/pinterest/**/*
planet-minecraft: styles/planet-minecraft/**/*
+pronouns.page: styles/pronouns.page/**/*
proton: styles/proton/**/*
pypi: styles/pypi/**/*
quizlet: styles/quizlet/**/*
diff --git a/README.md b/README.md
index d8b43c1601..ba1ce1bdb2 100644
--- a/README.md
+++ b/README.md
@@ -184,6 +184,7 @@ See [CONTRIBUTING.md](docs/CONTRIBUTING.md).
- [LinkedIn](styles/linkedin)
- [Mastodon](styles/mastodon)
- [Nitter](styles/nitter)
+- [Pronouns.page](styles/pronouns.page)
- [Snapchat Web](styles/snapchat-web)
- [Twitter](styles/twitter)
- [WhatsApp Web](styles/whatsapp-web)
diff --git a/styles/pronouns.page/README.md b/styles/pronouns.page/README.md
new file mode 100644
index 0000000000..4eff7855c4
--- /dev/null
+++ b/styles/pronouns.page/README.md
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+## ๐ Current Maintainer
+- [uncenter](https://github.com/uncenter)
+
+
+
+
+
+
+
+
+
+ Copyright © 2021-present Catppuccin Org
+
+
+
From fc5128feae5f170579f3d189d77e1be5a697cc79 Mon Sep 17 00:00:00 2001
From: Gen
Date: Sun, 31 Mar 2024 16:36:46 -0700
Subject: [PATCH 39/82] feat(tldraw): init (#673)
---
scripts/userstyles.yml | 10 +
styles/tldraw/catppuccin.user.css | 420 ++++++++++++++++++++++++++++++
styles/tldraw/preview.webp | 3 +
3 files changed, 433 insertions(+)
create mode 100644 styles/tldraw/catppuccin.user.css
create mode 100644 styles/tldraw/preview.webp
diff --git a/scripts/userstyles.yml b/scripts/userstyles.yml
index e4b7c384d6..c9e3562947 100644
--- a/scripts/userstyles.yml
+++ b/scripts/userstyles.yml
@@ -709,6 +709,16 @@ userstyles:
readme:
app-link: "https://tabnews.com.br"
current-maintainers: [*Guaxinim5573]
+ tldraw:
+ name: tldraw
+ categories: [productivity]
+ color: text
+ readme:
+ app-link: "https://www.tldraw.com"
+ usage: |+
+ > [!NOTE]
+ > This theme only changes how the colors appear on the tldraw canvas. Exported graphics **will not be Catppuccin-themed**.
+ current-maintainers: [*genshibe, *uncenter]
tuta:
name: Tuta
categories: [email_client, productivity]
diff --git a/styles/tldraw/catppuccin.user.css b/styles/tldraw/catppuccin.user.css
new file mode 100644
index 0000000000..191bf12880
--- /dev/null
+++ b/styles/tldraw/catppuccin.user.css
@@ -0,0 +1,420 @@
+/* ==UserStyle==
+@name tldraw Catppuccin
+@namespace github.com/catppuccin/userstyles/styles/tldraw
+@homepageURL https://github.com/catppuccin/userstyles/tree/main/styles/tldraw
+@version 0.0.1
+@updateURL https://github.com/catppuccin/userstyles/raw/main/styles/tldraw/catppuccin.user.css
+@supportURL https://github.com/catppuccin/userstyles/issues?q=is%3Aopen+is%3Aissue+label%3Atldraw
+@description Soothing pastel theme for tldraw
+@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 domain('tldraw.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];
+ @accent-color: @catppuccin[@@lookup][@@accent];
+
+ color-scheme: if(@lookup = latte, light, dark);
+
+ --color-accent: @accent-color !important;
+ --color-background: @base !important;
+ --color-brush-fill: @surface0 !important;
+ --color-brush-stroke: @surface2 !important;
+ --color-grid: @overlay0 !important;
+ --color-low: @surface0 !important;
+ --color-low-border: @overlay2 !important;
+ --color-culled: @subtext1 !important;
+ --color-muted-none: fade(@surface0, 70%);
+ --color-muted-0: @surface0;
+ --color-muted-1: @surface1;
+ --color-muted-2: @surface2 !important;
+ --color-hint: @surface2 !important;
+ --color-overlay: fade(@base, 50%) !important;
+ --color-divider: @surface1 !important;
+ --color-panel-contrast: @surface2 !important;
+ --color-panel-overlay: fade(@overlay0, 80%);
+ --color-panel: @surface0 !important;
+ --color-focus: @sky !important;
+ --color-selected: @accent-color !important;
+ --color-selected-contrast: @crust !important;
+ --color-selection-fill: fade(@blue, 50%);
+ --color-selection-stroke: @sapphire !important;
+ --color-text-0: @text !important;
+ --color-text-1: @text !important;
+ --color-text-3: @subtext1 !important;
+ --color-text-shadow: @subtext0 !important;
+ --color-primary: @blue !important;
+ --color-warn: @maroon !important;
+ --color-text: @text !important;
+ --color-laser: @red !important;
+
+ --shadow-1-1: fade(@crust, 16%);
+ --shadow-1-2: fade(@crust, 22%);
+ --shadow-2-1: fade(@crust, 66%);
+ --shadow-2-2: fade(@crust, 33%);
+ --shadow-3-1: fade(@crust, 50%);
+
+ --shadow-1: 0px 1px 2px var(--shadow-1-1), 0px 1px 3px var(--shadow-1-2);
+ --shadow-2: 0px 1px 3px var(--shadow-2-1), 0px 2px 6px var(--shadow-2-2),
+ inset 0px 0px 0px 1px var(--color-panel-contrast);
+ --shadow-3: 0px 1px 3px var(--shadow-3-1), 0px 2px 12px var(--shadow-3-1),
+ inset 0px 0px 0px 1px var(--color-panel-contrast);
+
+ .tlui-menu__submenu__trigger[data-state="open"]:not(:hover)::after {
+ border-radius: var(--radius-1);
+ background: linear-gradient(
+ 90deg,
+ @surface0 0%,
+ var(--color-muted-2) 100%
+ );
+ }
+ .tlui-menu-zone *[data-state="open"]::after {
+ background: linear-gradient(
+ 180deg,
+ @surface0 0%,
+ var(--color-muted-2) 100%
+ );
+ }
+ .tlui-people-menu__avatar {
+ background-color: @green !important;
+ }
+
+ --color-black: @text;
+ --color-gray: if(@lookup = latte, @subtext0, @subtext0);
+ --color-red: @red;
+ --color-light-red: lighten(@red, 5%);
+ --color-orange: @peach;
+ --color-yellow: @yellow;
+ --color-green: darken(@green, 5%);
+ --color-light-green: lighten(@green, 5%);
+ --color-blue: @blue;
+ --color-light-blue: @sky;
+ --color-violet: darken(@mauve, 10%);
+ --color-light-violet: @mauve;
+
+ [title="Color โ Black"] {
+ color: var(--color-black) !important;
+ }
+ [title="Color โ Grey"] {
+ color: var(--color-gray) !important;
+ }
+ [title="Color โ Red"] {
+ color: var(--color-red) !important;
+ }
+ [title="Color โ Light red"] {
+ color: var(--color-light-red) !important;
+ }
+ [title="Color โ Orange"] {
+ color: var(--color-orange) !important;
+ }
+ [title="Color โ Yellow"] {
+ color: var(--color-yellow) !important;
+ }
+ [title="Color โ Green"] {
+ color: var(--color-green) !important;
+ }
+ [title="Color โ Light green"] {
+ color: var(--color-light-green) !important;
+ }
+ [title="Color โ Blue"] {
+ color: var(--color-blue) !important;
+ }
+ [title="Color โ Light blue"] {
+ color: var(--color-light-blue) !important;
+ }
+ [title="Color โ Violet"] {
+ color: var(--color-violet) !important;
+ }
+ [title="Color โ Light violet"] {
+ color: var(--color-light-violet) !important;
+ }
+ .tl-svg-container {
+ [fill="#e1e1e1"],
+ [fill="#1d1d1d"],
+ [fill="#494949"],
+ [fill="#989898"] {
+ fill: var(--color-black) !important;
+ }
+ [fill="#010403"] {
+ fill: @crust !important;
+ }
+ [fill="#9398b0"],
+ [fill="#adb5bd"],
+ [fill="#bcc3c9"],
+ [fill="#7c8187"] {
+ fill: var(--color-gray) !important;
+ }
+ [fill="#e03131"],
+ [fill="#e55959"],
+ [fill="#8f3734"] {
+ fill: var(--color-red) !important;
+ }
+ [fill="#ff8787"],
+ [fill="#fe9e9e"],
+ [fill="#a56767"] {
+ fill: var(--color-light-red) !important;
+ }
+ [fill="#f76707"],
+ [fill="#f78438"],
+ [fill="#9f552d"] {
+ fill: var(--color-orange) !important;
+ }
+ [fill="#ffc034"],
+ [fill="#ffc078"],
+ [fill="#fecb92"] {
+ fill: var(--color-yellow) !important;
+ }
+ [fill="#099268"],
+ [fill="#39a785"],
+ [fill="#366a53"] {
+ fill: var(--color-green) !important;
+ }
+ [fill="#40c057"],
+ [fill="#65cb78"],
+ [fill="#4e874e"] {
+ fill: var(--color-light-green) !important;
+ }
+ [fill="#4263eb"],
+ [fill="#6681ee"],
+ [fill="#3a4b9e"] {
+ fill: var(--color-blue) !important;
+ }
+ [fill="#4dabf7"],
+ [fill="#6fbbf8"],
+ [fill="#4d7aa9"] {
+ fill: var(--color-light-blue) !important;
+ }
+ [fill="#ae3ec9"],
+ [fill="#bd63d3"],
+ [fill="#763a8b"] {
+ fill: var(--color-violet) !important;
+ }
+ [fill="#e599f7"],
+ [fill="#e9acf8"],
+ [fill="#9770a9"] {
+ fill: var(--color-light-violet) !important;
+ }
+ [stroke="#e1e1e1"],
+ [stroke="#1d1d1d"] {
+ stroke: var(--color-black) !important;
+ }
+ [stroke="#9398b0"],
+ [stroke="#adb5bd"] {
+ stroke: var(--color-gray) !important;
+ }
+ [stroke="#e03131"] {
+ stroke: var(--color-red) !important;
+ }
+ [stroke="#ff8787"] {
+ stroke: var(--color-light-red) !important;
+ }
+ [stroke="#f76707"] {
+ stroke: var(--color-orange) !important;
+ }
+ [stroke="#ffc034"],
+ [stroke="#ffc078"] {
+ stroke: var(--color-yellow) !important;
+ }
+ [stroke="#099268"] {
+ stroke: var(--color-green) !important;
+ }
+ [stroke="#40c057"] {
+ stroke: var(--color-light-green) !important;
+ }
+ [stroke="#4263eb"] {
+ stroke: var(--color-blue) !important;
+ }
+ [stroke="#4dabf7"] {
+ stroke: var(--color-light-blue) !important;
+ }
+ [stroke="#ae3ec9"] {
+ stroke: var(--color-violet) !important;
+ }
+ [stroke="#e599f7"] {
+ stroke: var(--color-light-violet) !important;
+ }
+ [stroke="color(display-p3 0.8078 0.7225 0.0312)"],
+ [stroke="color(display-p3 0.972 0.8705 0.05)"] {
+ stroke: var(--color-yellow) !important;
+ }
+ [stroke="color(display-p3 0.6299 0.7012 0.7856)"],
+ [stroke="color(display-p3 0.8163 0.9023 0.9416)"] {
+ stroke: var(--color-text-3) !important;
+ }
+ [stroke="color(display-p3 0.7024 0.0403 0.753)"],
+ [stroke="color(display-p3 0.9676 0.5652 0.9999)"] {
+ stroke: var(--color-light-violet) !important;
+ }
+ [stroke="color(display-p3 0.5651 0.0079 0.8986)"],
+ [stroke="color(display-p3 0.7469 0.5089 0.9995)"] {
+ stroke: var(--color-violet) !important;
+ }
+ [stroke="color(display-p3 0.0032 0.4655 0.7991)"],
+ [stroke="color(display-p3 0.308 0.6632 0.9996)"] {
+ stroke: var(--color-blue) !important;
+ }
+ [stroke="color(display-p3 0.0023 0.7259 0.7735)"],
+ [stroke="color(display-p3 0.1512 0.9414 0.9996)"] {
+ stroke: var(--color-light-blue) !important;
+ }
+ [stroke="color(display-p3 0.7699 0.4937 0.0085)"],
+ [stroke="color(display-p3 0.9988 0.6905 0.266)"] {
+ stroke: var(--color-orange) !important;
+ }
+ [stroke="color(display-p3 0.0085 0.582 0.4604)"],
+ [stroke="color(display-p3 0.2536 0.984 0.7981)"] {
+ stroke: var(--color-green) !important;
+ }
+ [stroke="color(display-p3 0.2711 0.6172 0.0195)"],
+ [stroke="color(display-p3 0.563 0.9495 0.3857)"] {
+ stroke: var(--color-light-green) !important;
+ }
+ [stroke="color(display-p3 0.7849 0.0585 0.3589)"],
+ [stroke="color(display-p3 0.9988 0.5301 0.6397)"] {
+ stroke: var(--color-light-red) !important;
+ }
+ [stroke="color(display-p3 0.7978 0.0509 0.2035)"],
+ [stroke="color(display-p3 0.9992 0.4376 0.45)"] {
+ stroke: var(--color-red) !important;
+ }
+ }
+
+ [data-testid="mobile-styles.button"] {
+ &[style*="color: rgb(229, 153, 247);"] {
+ color: var(--color-light-violet) !important;
+ }
+ &[style*="color: rgb(147, 152, 176);"],
+ &[style*="color: rgb(173, 181, 189);"] {
+ color: var(--color-gray) !important;
+ }
+ &[style*="color: rgb(224, 49, 49);"] {
+ color: var(--color-red) !important;
+ }
+ &[style*="color: rgb(247, 103, 7);"] {
+ color: var(--color-orange) !important;
+ }
+ &[style*="color: rgb(255, 192, 52);"],
+ &[style*="color: rgb(255, 192, 120);"] {
+ color: var(--color-yellow) !important;
+ }
+ &[style*="color: rgb(9, 146, 104);"] {
+ color: var(--color-green) !important;
+ }
+ &[style*="color: rgb(64, 192, 87);"] {
+ color: var(--color-light-green) !important;
+ }
+ &[style*="color: rgb(66, 99, 235);"] {
+ color: var(--color-blue) !important;
+ }
+ &[style*="color: rgb(77, 171, 247);"] {
+ color: var(--color-light-blue) !important;
+ }
+ &[style*="color: rgb(174, 62, 201);"] {
+ color: var(--color-violet) !important;
+ }
+ &[style*="color: rgb(255, 135, 135);"] {
+ color: var(--color-light-red) !important;
+ }
+ }
+
+ div:has(.tl-text.tl-text-content) {
+ &[style*="color: rgb(225, 225, 225);"],
+ &[style*="color: rgb(29, 29, 29);"] {
+ color: var(--color-black) !important;
+ }
+ &[style*="color: rgb(147, 152, 176);"],
+ &[style*="color: rgb(173, 181, 189);"] {
+ color: var(--color-gray) !important;
+ background-color: var(--color-gray) !important;
+ }
+ &[style*="color: rgb(224, 49, 49);"] {
+ color: var(--color-red) !important;
+ background-color: var(--color-red) !important;
+ }
+ &[style*="color: rgb(255, 135, 135);"] {
+ color: var(--color-light-red) !important;
+ background-color: var(--color-light-red) !important;
+ }
+ &[style*="color: rgb(247, 103, 7);"] {
+ color: var(--color-orange) !important;
+ background-color: var(--color-orange) !important;
+ }
+ &[style*="color: rgb(255, 192, 52);"],
+ &[style*="color: rgb(255, 192, 120);"] {
+ color: var(--color-yellow) !important;
+ background-color: var(--color-yellow) !important;
+ }
+ &[style*="color: rgb(9, 146, 104);"] {
+ color: var(--color-green) !important;
+ background-color: var(--color-green) !important;
+ }
+ &[style*="color: rgb(64, 192, 87);"] {
+ color: var(--color-light-green) !important;
+ background-color: var(--color-light-green) !important;
+ }
+ &[style*="color: rgb(66, 99, 235);"] {
+ color: var(--color-blue) !important;
+ background-color: var(--color-blue) !important;
+ }
+ &[style*="color: rgb(77, 171, 247);"] {
+ color: var(--color-light-blue) !important;
+ background-color: var(--color-light-blue) !important;
+ }
+ &[style*="color: rgb(174, 62, 201);"] {
+ color: var(--color-violet) !important;
+ background-color: var(--color-violet) !important;
+ }
+ &[style*="color: rgb(229, 153, 247);"] {
+ color: var(--color-light-violet) !important;
+ background-color: var(--color-light-violet) !important;
+ }
+ }
+ }
+
+ .tl-theme__dark {
+ #catppuccin(@darkFlavor, @accentColor);
+ }
+ .tl-theme__light {
+ #catppuccin(@lightFlavor, @accentColor);
+ }
+}
+
+/* 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
diff --git a/styles/tldraw/preview.webp b/styles/tldraw/preview.webp
new file mode 100644
index 0000000000..5411c55913
--- /dev/null
+++ b/styles/tldraw/preview.webp
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:59693077f30fe4c46cfebebda7af1bf77a6c2a427f782632620280b52e8ce63d
+size 73878
From 78e69c56310538c4c3bef89c247a25032265cad8 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 31 Mar 2024 23:37:08 +0000
Subject: [PATCH 40/82] chore: generate health files
---
.github/CODEOWNERS | 1 +
.github/ISSUE_TEMPLATE/userstyle.yml | 2 +-
.github/issue-labeler.yml | 2 ++
.github/labels.yml | 3 ++
.github/pr-labeler.yml | 1 +
README.md | 1 +
styles/tldraw/README.md | 41 ++++++++++++++++++++++++++++
7 files changed, 50 insertions(+), 1 deletion(-)
create mode 100644 styles/tldraw/README.md
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 26951f0e1a..fb7ac6837d 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -61,6 +61,7 @@
/styles/stylus @GitMuslim
/styles/syncthing @BlankParticle
/styles/tabnews @Guaxinim5573
+/styles/tldraw @GenShibe @uncenter
/styles/tuta @ryanccn
/styles/twitch @GitMuslim @isabelroses
/styles/twitter @watatomo
diff --git a/.github/ISSUE_TEMPLATE/userstyle.yml b/.github/ISSUE_TEMPLATE/userstyle.yml
index 312077124e..127ddc91c8 100644
--- a/.github/ISSUE_TEMPLATE/userstyle.yml
+++ b/.github/ISSUE_TEMPLATE/userstyle.yml
@@ -16,7 +16,7 @@ body:
label: What userstyles are you seeing the problem on?
description: "Don't worry about the `lbl:` prefix, it allows issues to be automatically labeled!"
multiple: true
- options: ["lbl:advent-of-code", "lbl:anilist", "lbl:arch-wiki", "lbl:boringproxy", "lbl:brave-search", "lbl:bsky", "lbl:bstats", "lbl:canvas-lms", "lbl:chatgpt", "lbl:chatreplay", "lbl:chess.com", "lbl:cinny", "lbl:codeberg", "lbl:crowdin", "lbl:deepl", "lbl:duckduckgo", "lbl:ecosia", "lbl:elk", "lbl:formative", "lbl:github", "lbl:gmail", "lbl:google", "lbl:google-photos", "lbl:graphite", "lbl:hackage", "lbl:hacker-news", "lbl:holodex", "lbl:homepage", "lbl:hoppscotch", "lbl:hyperpipe", "lbl:ichi.moe", "lbl:inoreader", "lbl:instagram", "lbl:invidious", "lbl:invokeai", "lbl:lastfm", "lbl:lemmy", "lbl:libreddit", "lbl:lichess", "lbl:lingva", "lbl:linkedin", "lbl:mastodon", "lbl:mdn", "lbl:modrinth", "lbl:microsoft-word", "lbl:migadu-webmail", "lbl:minesweeper", "lbl:nitter", "lbl:nixos-search", "lbl:nixos.wiki", "lbl:npm", "lbl:openmediavault", "lbl:paste.rs", "lbl:perplexity", "lbl:picrew", "lbl:pinterest", "lbl:planet-minecraft", "lbl:pronouns.page", "lbl:proton", "lbl:pypi", "lbl:quizlet", "lbl:reddit", "lbl:searxng", "lbl:snapchat-web", "lbl:spotify-web", "lbl:startpage", "lbl:skiff", "lbl:stylus", "lbl:substack", "lbl:syncthing", "lbl:tabnews", "lbl:tuta", "lbl:twitch", "lbl:twitter", "lbl:vercel", "lbl:whatsapp-web", "lbl:wikipedia", "lbl:wikiwand", "lbl:youtube", "lbl:nextjs"]
+ options: ["lbl:advent-of-code", "lbl:anilist", "lbl:arch-wiki", "lbl:boringproxy", "lbl:brave-search", "lbl:bsky", "lbl:bstats", "lbl:canvas-lms", "lbl:chatgpt", "lbl:chatreplay", "lbl:chess.com", "lbl:cinny", "lbl:codeberg", "lbl:crowdin", "lbl:deepl", "lbl:duckduckgo", "lbl:ecosia", "lbl:elk", "lbl:formative", "lbl:github", "lbl:gmail", "lbl:google", "lbl:google-photos", "lbl:graphite", "lbl:hackage", "lbl:hacker-news", "lbl:holodex", "lbl:homepage", "lbl:hoppscotch", "lbl:hyperpipe", "lbl:ichi.moe", "lbl:inoreader", "lbl:instagram", "lbl:invidious", "lbl:invokeai", "lbl:lastfm", "lbl:lemmy", "lbl:libreddit", "lbl:lichess", "lbl:lingva", "lbl:linkedin", "lbl:mastodon", "lbl:mdn", "lbl:modrinth", "lbl:microsoft-word", "lbl:migadu-webmail", "lbl:minesweeper", "lbl:nitter", "lbl:nixos-search", "lbl:nixos.wiki", "lbl:npm", "lbl:openmediavault", "lbl:paste.rs", "lbl:perplexity", "lbl:picrew", "lbl:pinterest", "lbl:planet-minecraft", "lbl:pronouns.page", "lbl:proton", "lbl:pypi", "lbl:quizlet", "lbl:reddit", "lbl:searxng", "lbl:snapchat-web", "lbl:spotify-web", "lbl:startpage", "lbl:skiff", "lbl:stylus", "lbl:substack", "lbl:syncthing", "lbl:tabnews", "lbl:tldraw", "lbl:tuta", "lbl:twitch", "lbl:twitter", "lbl:vercel", "lbl:whatsapp-web", "lbl:wikipedia", "lbl:wikiwand", "lbl:youtube", "lbl:nextjs"]
validations:
required: true
- type: textarea
diff --git a/.github/issue-labeler.yml b/.github/issue-labeler.yml
index 8b517812fa..d466deecb1 100644
--- a/.github/issue-labeler.yml
+++ b/.github/issue-labeler.yml
@@ -141,6 +141,8 @@ syncthing:
- '(lbl:syncthing)'
tabnews:
- '(lbl:tabnews)'
+tldraw:
+ - '(lbl:tldraw)'
tuta:
- '(lbl:tuta)'
twitch:
diff --git a/.github/labels.yml b/.github/labels.yml
index e6a1ca734b..3da883438f 100644
--- a/.github/labels.yml
+++ b/.github/labels.yml
@@ -212,6 +212,9 @@
- name: tabnews
description: TabNews
color: '#cad3f5'
+- name: tldraw
+ description: tldraw
+ color: '#cad3f5'
- name: tuta
description: Tuta
color: '#ee99a0'
diff --git a/.github/pr-labeler.yml b/.github/pr-labeler.yml
index 8410b72d02..95f6f33202 100644
--- a/.github/pr-labeler.yml
+++ b/.github/pr-labeler.yml
@@ -70,6 +70,7 @@ stylus: styles/stylus/**/*
substack: styles/substack/**/*
syncthing: styles/syncthing/**/*
tabnews: styles/tabnews/**/*
+tldraw: styles/tldraw/**/*
tuta: styles/tuta/**/*
twitch: styles/twitch/**/*
twitter: styles/twitter/**/*
diff --git a/README.md b/README.md
index ba1ce1bdb2..ff23479b2b 100644
--- a/README.md
+++ b/README.md
@@ -155,6 +155,7 @@ See [CONTRIBUTING.md](docs/CONTRIBUTING.md).
- [Proton](styles/proton)
- [Stylus](styles/stylus)
- [Syncthing](styles/syncthing)
+- [tldraw](styles/tldraw)
diff --git a/styles/tldraw/README.md b/styles/tldraw/README.md
new file mode 100644
index 0000000000..be2dec59cc
--- /dev/null
+++ b/styles/tldraw/README.md
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+ Catppuccin for tldraw
+
+
+
+
+
+
+
+
+
+
+
+
+## Usage
+> [!NOTE]
+> This theme only changes how the colors appear on the tldraw canvas. Exported graphics **will not be Catppuccin-themed**.
+
+
+
+## ๐ Current Maintainers
+- [GenShibe](https://github.com/GenShibe)
+- [uncenter](https://github.com/uncenter)
+
+
+
+
+
+
+
+
+
+ Copyright © 2021-present Catppuccin Org
+
+
+
From 76133838409c7b9643440e77fb331d61bc54672d Mon Sep 17 00:00:00 2001
From: uncenter <47499684+uncenter@users.noreply.github.com>
Date: Tue, 2 Apr 2024 10:51:38 -0400
Subject: [PATCH 41/82] fix(migadu-webmail): selected emails & contacts (#740)
---
styles/migadu-webmail/catppuccin.user.css | 23 ++++++++++++++++-------
1 file changed, 16 insertions(+), 7 deletions(-)
diff --git a/styles/migadu-webmail/catppuccin.user.css b/styles/migadu-webmail/catppuccin.user.css
index 1359e92665..4135aebdae 100644
--- a/styles/migadu-webmail/catppuccin.user.css
+++ b/styles/migadu-webmail/catppuccin.user.css
@@ -2,7 +2,7 @@
@name Migadu Webmail Catppuccin
@namespace github.com/catppuccin/userstyles/styles/migadu-webmail
@homepageURL https://github.com/catppuccin/userstyles/tree/main/styles/migadu-webmail
-@version 0.0.6
+@version 0.0.7
@updateURL https://github.com/catppuccin/userstyles/raw/main/styles/migadu-webmail/catppuccin.user.css
@supportURL https://github.com/catppuccin/userstyles/issues?q=is%3Aopen+is%3Aissue+label%3Amigadu-webmail
@description Soothing pastel theme for Migadu Webmail
@@ -419,16 +419,25 @@
#V-PopupsContacts .e-contact-item,
.messageListItem {
- border-left-color: @surface2;
+ &.focused {
+ border-left-color: @surface2;
+ }
- &.selected,
&.checked {
- background-color: fade(@accent-color, 30%);
+ border-left-color: lighten(@accent-color, 10%);
+ }
- &.focused {
- border-left-color: @accent-color;
- }
+ &.checked.focused, &.selected {
+ border-left-color: @accent-color;
}
+
+ &.selected {
+ background-color: fade(@accent-color, 30%);
+ }
+ }
+
+ #V-PopupsContacts .e-contact-item {
+ border-left-color: @surface0;
}
/* Send mail modal */
From 655307b4988a50aac20acc527188f87084623b34 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 2 Apr 2024 14:52:11 +0000
Subject: [PATCH 42/82] style: format code with prettier
---
styles/migadu-webmail/catppuccin.user.css | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/styles/migadu-webmail/catppuccin.user.css b/styles/migadu-webmail/catppuccin.user.css
index 4135aebdae..f50e177461 100644
--- a/styles/migadu-webmail/catppuccin.user.css
+++ b/styles/migadu-webmail/catppuccin.user.css
@@ -427,7 +427,8 @@
border-left-color: lighten(@accent-color, 10%);
}
- &.checked.focused, &.selected {
+ &.checked.focused,
+ &.selected {
border-left-color: @accent-color;
}
From b6c6c49b6cf745f36101f077114d1d0822029be0 Mon Sep 17 00:00:00 2001
From: uncenter <47499684+uncenter@users.noreply.github.com>
Date: Tue, 2 Apr 2024 12:24:21 -0400
Subject: [PATCH 43/82] fix(github): danger buttons, notifications bug (#741)
---
styles/github/catppuccin.user.css | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/styles/github/catppuccin.user.css b/styles/github/catppuccin.user.css
index e6154abefb..3277f80dba 100644
--- a/styles/github/catppuccin.user.css
+++ b/styles/github/catppuccin.user.css
@@ -2,7 +2,7 @@
@name GitHub Catppuccin
@namespace github.com/catppuccin/userstyles/styles/github
@homepageURL https://github.com/catppuccin/userstyles/tree/main/styles/github
-@version 1.5.2
+@version 1.5.3
@updateURL https://github.com/catppuccin/userstyles/raw/main/styles/github/catppuccin.user.css
@supportURL https://github.com/catppuccin/userstyles/issues?q=is%3Aopen+is%3Aissue+label%3Agithub
@description Soothing pastel theme for GitHub
@@ -178,7 +178,7 @@
--codeMirror-gutterMarker-fgColor-default: @base;
--codeMirror-gutterMarker-fgColor-muted: @overlay0;
--codeMirror-lineNumber-fgColor: @subtext1;
- --codeMirror-cursor-fgColor: #e6edf3;
+ --codeMirror-cursor-fgColor: @text;
--codeMirror-selection-bgColor: #388bfd66;
--codeMirror-activeline-bgColor: #6e768166;
--codeMirror-matchingBracket-fgColor: @text;
@@ -227,8 +227,8 @@
--control-transparent-borderColor-hover: #0000;
--control-transparent-borderColor-active: #0000;
--control-danger-fgColor-rest: @red;
- --control-danger-fgColor-hover: #ff7b72;
- --control-danger-bgColor-hover: fade(@red, 26%);
+ --control-danger-fgColor-hover: @crust;
+ --control-danger-bgColor-hover: fade(@red, 80%);
--control-danger-bgColor-active: @red;
--control-checked-bgColor-rest: #1f6feb;
--control-checked-bgColor-hover: #2a7aef;
@@ -466,7 +466,7 @@
--color-prettylights-syntax-markup-changed-text: @text;
--color-prettylights-syntax-markup-changed-bg: fadeout(@yellow, 60%);
--color-prettylights-syntax-markup-ignored-text: @text;
- --color-scale-white: @text;
+ --color-scale-white: @base;
--color-scale-gray-3: @overlay2;
--color-scale-gray-5: @overlay0;
--color-scale-gray-6: @surface1;
From f2ea0e79f839ba7a6f1084382460a0e0c9fbe3a5 Mon Sep 17 00:00:00 2001
From: Gen
Date: Tue, 2 Apr 2024 11:10:35 -0700
Subject: [PATCH 44/82] fix(duckduckgo): various unthemed elements (#737)
* fix(duckduckgo): on/off buttons + save and exit buttons on settings page + selected theme checkmark
* fix(duckduckgo): assorted fixes part 2
* fix(duckduckgo): carousel item border color
---
styles/duckduckgo/catppuccin.user.css | 74 +++++++++++++++++----------
1 file changed, 48 insertions(+), 26 deletions(-)
diff --git a/styles/duckduckgo/catppuccin.user.css b/styles/duckduckgo/catppuccin.user.css
index 848b26bd24..3c67da200e 100644
--- a/styles/duckduckgo/catppuccin.user.css
+++ b/styles/duckduckgo/catppuccin.user.css
@@ -2,7 +2,7 @@
@name DuckDuckGo Catppuccin
@namespace github.com/catppuccin/userstyles/styles/duckduckgo
@homepageURL https://github.com/catppuccin/userstyles/tree/main/styles/duckduckgo
-@version 0.1.3
+@version 0.1.4
@updateURL https://github.com/catppuccin/userstyles/raw/main/styles/duckduckgo/catppuccin.user.css
@supportURL https://github.com/catppuccin/userstyles/issues?q=is%3Aopen+is%3Aissue+label%3Aduckduckgo
@description Soothing pastel theme for DuckDuckGo
@@ -16,15 +16,12 @@
==/UserStyle== */
@-moz-document domain(duckduckgo.com) {
- @media (prefers-color-scheme: light) {
- :root {
- #catppuccin(@lightFlavor, @accentColor);
- }
+ :root:not(.dark-bg) {
+ #catppuccin(@lightFlavor, @accentColor);
}
- @media (prefers-color-scheme: dark) {
- :root {
- #catppuccin(@darkFlavor, @accentColor);
- }
+
+ :root.dark-bg {
+ #catppuccin(@darkFlavor, @accentColor);
}
/* prettier-ignore */
@@ -492,13 +489,8 @@
.howItWorksSection_downloadsCard__U3Ph9,
.metabar__grid-btn,
.feedback-btn__icon-wrap .set-bookmarklet__input .btn,
- .btn:visited,
- .btn:active,
- .btn.btn--primary,
.btn.btn--secondary,
- .btn--primary:hover,
.btn.is-disabled,
- .btn.is-disabled:hover,
input,
textarea,
.frm__input,
@@ -509,10 +501,8 @@
.zci--json_validator textarea,
.colorpicker,
.feedback-modal__submit.is-disabled,
- .feedback-modal__submit.is-disabled:hover,
.feedback-modal__submit.is-disabled:active,
.feedback-modal__submit.is-disabled:focus,
- .btn.btn--skeleton:hover,
.module__section,
.module--carousel__item,
.is-related-search-exp.dark-bg,
@@ -524,7 +514,37 @@
.js-definitions-internal {
background-color: @surface0 !important;
}
+ .module--carousel__item {
+ border-color: @surface1 !important;
+ }
+ .btn.is-disabled:hover,
+ .frm__switch__label:hover,
+ .feedback-modal__submit.is-disabled:hover,
+ .btn.btn--skeleton:hover,
+ .module__footer-carousel__label:hover {
+ background-color: @surface2 !important;
+ border-color: @surface2 !important;
+ }
+ .is-checked .frm__switch__label.btn {
+ background-color: @accent-color !important;
+ color: @mantle !important;
+ }
+ .js-set-exit {
+ background-color: @accent-color !important;
+ border-color: @accent-color !important;
+ color: @base !important;
+ }
+ .js-set-exit:hover {
+ background-color: fade(@accent-color, 80%) !important;
+ border-color: fade(@accent-color, 80%) !important;
+ color: @base !important;
+ }
+ .frm__switch__label {
+ background-color: @surface0;
+ border-color: @surface0;
+ color: @text !important;
+ }
.set-bookmarklet__data {
background-color: @surface2;
color: @text;
@@ -608,7 +628,6 @@
.c-detail__desc,
.c-detail__filemeta,
.c-detail__more,
- .btn,
.frm__label,
.js-cloudsave-new-suggestion {
color: @text !important;
@@ -683,10 +702,10 @@
color: @base !important;
}
- .settings-page-wrapper .btn--primary {
+ .settings-page-wrapper.is-checked {
border-color: @blue;
- background-color: @blue !important;
- color: @crust !important;
+ background-color: @sapphire !important;
+ color: @mantle !important;
}
.modal--dropdown--settings
.settings-dropdown--section
@@ -696,14 +715,19 @@
color: @text !important;
}
}
+ .ddgsi-check::before {
+ color: @mantle !important;
+ }
+ .set-bookmarklet__title,
+ .set-reset__title {
+ color: @text !important;
+ }
.frm__select::after {
color: @accent-color !important;
}
- .js-region-filter-switch,
- .frm__switch__label {
+ .js-region-filter-switch {
background-color: @overlay0 !important;
- border-color: @accent-color !important;
}
.switch__knob {
background: @text !important;
@@ -711,9 +735,7 @@
.switch.is-on {
background-color: @accent-color;
}
-
- .dropdown__switch.is-on::before,
- .frm__switch__label {
+ .dropdown__switch.is-on::before {
color: @base !important;
}
.search--header {
From c571b931a7a8543e67772d08513938fba09c6034 Mon Sep 17 00:00:00 2001
From: Tnixc
Date: Tue, 2 Apr 2024 15:24:40 -0400
Subject: [PATCH 45/82] fix(wikipedia): table text color on highlighted cells
(#743)
---
styles/wikipedia/catppuccin.user.css | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/styles/wikipedia/catppuccin.user.css b/styles/wikipedia/catppuccin.user.css
index 52e419f7df..e421356ee7 100644
--- a/styles/wikipedia/catppuccin.user.css
+++ b/styles/wikipedia/catppuccin.user.css
@@ -2,7 +2,7 @@
@name Wikipedia Catppuccin
@namespace github.com/catppuccin/userstyles/styles/wikipedia
@homepageURL https://github.com/catppuccin/userstyles/tree/main/styles/wikipedia
-@version 0.0.8
+@version 0.0.9
@updateURL https://github.com/catppuccin/userstyles/raw/main/styles/wikipedia/catppuccin.user.css
@supportURL https://github.com/catppuccin/userstyles/issues?q=is%3Aopen+is%3Aissue+label%3Awikipedia
@description Soothing pastel theme for Wikipedia
@@ -649,6 +649,11 @@
border-color: @surface2;
}
+ td[style*="background-color"],
+ td[style*="background-color"] *{
+ color: @crust !important;
+ }
+
#toc-Services > a:nth-child(1) > div:nth-child(1) {
color: @text !important;
}
From 33cbac9b29b0e1c57e5daec3aff1bafc143bc082 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 2 Apr 2024 19:25:11 +0000
Subject: [PATCH 46/82] style: format code with prettier
---
styles/wikipedia/catppuccin.user.css | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/styles/wikipedia/catppuccin.user.css b/styles/wikipedia/catppuccin.user.css
index e421356ee7..9c6ac63893 100644
--- a/styles/wikipedia/catppuccin.user.css
+++ b/styles/wikipedia/catppuccin.user.css
@@ -649,8 +649,8 @@
border-color: @surface2;
}
- td[style*="background-color"],
- td[style*="background-color"] *{
+ td[style*="background-color"],
+ td[style*="background-color"] * {
color: @crust !important;
}
From a75a4f91a2990fca3d80ec6cd1e2dd5dac21d405 Mon Sep 17 00:00:00 2001
From: Isabel
Date: Tue, 2 Apr 2024 20:32:07 +0100
Subject: [PATCH 47/82] fix(wikipedia): maths eqations (#744)
---
styles/wikipedia/catppuccin.user.css | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/styles/wikipedia/catppuccin.user.css b/styles/wikipedia/catppuccin.user.css
index 9c6ac63893..e8bce92c89 100644
--- a/styles/wikipedia/catppuccin.user.css
+++ b/styles/wikipedia/catppuccin.user.css
@@ -2,7 +2,7 @@
@name Wikipedia Catppuccin
@namespace github.com/catppuccin/userstyles/styles/wikipedia
@homepageURL https://github.com/catppuccin/userstyles/tree/main/styles/wikipedia
-@version 0.0.9
+@version 0.0.10
@updateURL https://github.com/catppuccin/userstyles/raw/main/styles/wikipedia/catppuccin.user.css
@supportURL https://github.com/catppuccin/userstyles/issues?q=is%3Aopen+is%3Aissue+label%3Awikipedia
@description Soothing pastel theme for Wikipedia
@@ -174,6 +174,15 @@
border-color: @text;
}
+ /* maths */
+ & when not (@lookup = latte) {
+ .mwe-math-fallback-image-inline img,
+ .mwe-math-element img,
+ img[src*="LaTeX"] {
+ filter: invert(100%);
+ }
+ }
+
.mwe-popups .mwe-popups-extract[dir="ltr"]::after {
background-image: linear-gradient(
to right,
From 0cdbd61d261fb8a79b19599d435f50891974f63d Mon Sep 17 00:00:00 2001
From: Isabel
Date: Tue, 2 Apr 2024 22:19:31 +0100
Subject: [PATCH 48/82] refactor(youtube): cleanup and misc changes (#745)
Co-authored-by: uncenter <47499684+uncenter@users.noreply.github.com>
---
styles/youtube/catppuccin.user.css | 157 ++++++++++++-----------------
1 file changed, 63 insertions(+), 94 deletions(-)
diff --git a/styles/youtube/catppuccin.user.css b/styles/youtube/catppuccin.user.css
index 73b8860ade..808208b85a 100644
--- a/styles/youtube/catppuccin.user.css
+++ b/styles/youtube/catppuccin.user.css
@@ -2,7 +2,7 @@
@name YouTube Catppuccin
@namespace github.com/catppuccin/userstyles/styles/youtube
@homepageURL https://github.com/catppuccin/userstyles/tree/main/styles/youtube
-@version 3.5.2
+@version 3.5.3
@updateURL https://github.com/catppuccin/userstyles/raw/main/styles/youtube/catppuccin.user.css
@supportURL https://github.com/catppuccin/userstyles/issues?q=is%3Aopen+is%3Aissue+label%3Ayoutube
@description Soothing pastel theme for YouTube
@@ -56,10 +56,8 @@
@crust: @catppuccin[@@lookup][@crust];
@accent-color: @catppuccin[@@lookup][@@accent];
- /* apply everywhere */
&,
[dark],
- html,
html[system-icons][dark],
html[system-icons] [dark],
html[darker-dark-theme][dark],
@@ -316,11 +314,7 @@
null
) !important;
- /* Tooltip */
- --paper-tooltip-background: @overlay0 !important;
- --paper-tooltip-text-color: @text !important;
-
- /* links */
+ /* Links */
--yt-endpoint-color: @accent-color !important;
--yt-endpoint-visited-color: @accent-color !important;
--yt-endpoint-hover-color: @accent-color !important;
@@ -333,7 +327,6 @@
--sb-red-bg-color: @accent-color !important;
}
- /* general colors */
&:not(.style-scope) {
--primary-text-color: @text !important;
--primary-background-color: @base !important;
@@ -361,17 +354,8 @@
--dark-theme-divider-color: @overlay0 !important;
}
- /* logo */
- ytd-topbar-logo-renderer.style-scope a svg > g,
- svg.ytd-consent-bump-v2-lightbox > g:nth-child(1) {
- path[fill="#FF0000"] {
- fill: @accent-color !important;
- }
- path[fill="white"] {
- fill: @base !important;
- }
- }
- & when (@logo =0) {
+
+ & when (@logo = 0) {
ytd-topbar-logo-renderer,
svg.ytd-consent-bump-v2-lightbox {
display: none;
@@ -435,7 +419,6 @@
}
yt-live-chat-renderer {
- --yt-emoji-picker-renderer-height: 180px;
--yt-button-default-text-color: @text !important;
--yt-button-default-background-color: @base !important;
--yt-button-dark-text-color: @base !important;
@@ -470,15 +453,12 @@
background: @overlay0 !important;
}
- /* volume bar */
+ /* volume slider */
.ytp-volume-slider-handle {
background: @accent-color !important;
&::before {
background: @accent-color !important;
}
- &::after {
- z-index: -1;
- }
}
/* new videos dot */
@@ -522,33 +502,25 @@
}
}
- .ytp-panel-menu {
+ .ytp-panel-menu, .ytp-panel-header, .ytp-panel-footer, .ytp-menuitem-label,.ytp-menuitem-content, .ytp-menuitem-label-count, .ytp-menu-label-secondary {
color: @text;
-
- & .ytp-menuitem:not(:last-child) svg > path {
- fill: @text;
- }
-
- & .ytp-menuitem:last-child svg:last-child {
- fill: @text;
- }
}
- .ytp-right-controls svg path,
- .ytp-svg-fill {
- fill: #fff !important;
+ .ytp-menuitem svg > path:not([fill="none"]) {
+ fill: @text !important;
}
- .ytp-time-current,
- .ytp-time-separator,
- .ytp-time-duration,
- .ytp-menu-label-secondary,
- .ytp-menuitem-label-count {
- color: #fff;
+ .ytp-menuitem[aria-haspopup="true"] .ytp-menuitem-content {
+ @svg: escape(' ');
+ background-image: url("data:image/svg+xml,@{svg}")
}
-
- .ytp-tooltip:not([aria-hidden="true"]) {
- color: @text;
+ .ytp-panel-back-button {
+ @svg: escape(' ');
+ background-image: url("data:image/svg+xml,@{svg}")
+ }
+ .ytp-menuitem[role="menuitemradio"][aria-checked="true"] .ytp-menuitem-label {
+ @svg: escape(' ');
+ background-image: url("data:image/svg+xml,@{svg}")
}
.style-scope.ytd-thumbnail-overlay-toggle-button-renderer:hover {
@@ -615,7 +587,7 @@
}
}
- /* text color */
+ /* search results */
.gsfs {
color: @text !important;
}
@@ -744,7 +716,6 @@
}
.iv-card-content > :first-child,
- .html5-video-player a,
.iv-card h2,
.ytp-cards-teaser .ytp-cards-teaser-text {
color: @text !important;
@@ -753,6 +724,7 @@
/* Player tooltip background */
.ytp-tooltip-text {
background: @surface0 !important;
+ color: @text;
}
.iv-card:hover .iv-card-primary-link,
@@ -762,6 +734,7 @@
.ytp-popup {
background: @surface0 !important;
+ text-shadow: none;
}
tp-yt-paper-dialog {
@@ -816,8 +789,6 @@
--ytd-author-comment-badge-background-color: @surface0 !important;
--ytd-author-comment-badge-name-color: @text !important;
--ytd-author-comment-badge-icon-color: @text !important;
- padding-right: 6px;
- padding-left: 8px;
}
/* ambient mode */
@@ -942,28 +913,51 @@
color: @accent-color !important;
}
- /* hopefully temporary (buttons) */
- .yt-spec-button-shape-next--mono.yt-spec-button-shape-next--tonal {
- background-color: @surface0;
- color: @text;
- &:hover {
- background-color: @surface1;
- }
+ /* theme short - we do it accent beacuse anything else is hard to read */
+ reel-player-header-renderer #text.complex-string.ytd-channel-name a,
+ reel-player-header-renderer {
+ color: @accent-color;
}
- .yt-spec-button-shape-next--call-to-action.yt-spec-button-shape-next--filled {
- color: @crust;
- background-color: @accent-color;
- &:hover {
- background-color: darken(@accent-color, 20);
+
+ /* buttons */
+ .yt-spec-touch-feedback-shape--touch-response
+ .yt-spec-touch-feedback-shape__fill {
+ background-color: @text;
+ }
+ .yt-spec-button-shape-next--mono {
+ &.yt-spec-button-shape-next--outline, &.yt-spec-button-shape-next--text {
+ color: @text;
+ &:hover {
+ background-color: @surface0;
+ }
+ }
+ &.yt-spec-button-shape-next--tonal {
+ color: @text;
+ background-color: @surface0;
+ }
+ &.yt-spec-button-shape-next--outline {
+ border-color: @surface2 !important;
+ }
+ &.yt-spec-button-shape-next--filled {
+ color: @crust;
+ background-color: @accent-color;
}
}
.yt-spec-touch-feedback-shape--touch-response
.yt-spec-touch-feedback-shape__stroke {
border-color: @surface1;
}
- .yt-spec-touch-feedback-shape--touch-response-inverse
- .yt-spec-touch-feedback-shape__stroke {
- border-color: @accent-color;
+ .yt-spec-button-shape-next--overlay.yt-spec-button-shape-next--filled {
+ color: @crust;
+ background-color: @accent-color;
+ }
+ .yt-spec-touch-feedback-shape--overlay-touch-response-inverse
+ .yt-spec-touch-feedback-shape__fill {
+ background-color: @accent-color;
+ }
+ .yt-spec-touch-feedback-shape--overlay-touch-response
+ .yt-spec-touch-feedback-shape__fill {
+ background-color: @text;
}
ytd-guide-section-renderer.style-scope:nth-child(3) > div:nth-child(2),
@@ -1029,49 +1023,26 @@
[fill="#F00"],
[fill="red"],
[fill="#FF0000"] {
- fill: @accent-color;
+ fill: @accent-color !important;
}
- svg > g > polygon[fill="#fff"] {
+ [fill="white"], [fill="#fff"] {
fill: @base !important;
}
- .yt-spec-button-shape-next--call-to-action.yt-spec-button-shape-next--text {
- color: @accent-color;
- &:hover {
- background-color: fadeout(@accent-color, 90);
- }
- }
-
- .yt-spec-button-shape-next--mono.yt-spec-button-shape-next--outline,
- .yt-spec-button-shape-next--mono.yt-spec-button-shape-next--text {
- color: @text;
- &:hover {
- background-color: @surface0;
- }
- }
-
- .yt-spec-button-shape-next--mono.yt-spec-button-shape-next--outline {
- border-color: @surface0;
- }
-
- /* Scrollbar */
::-webkit-scrollbar {
width: @scrollbar_width !important;
}
-
::-webkit-scrollbar-track {
background: @base !important;
}
-
::-webkit-scrollbar-thumb {
background: @accent-color !important;
}
- /* text highlight */
::selection {
- background: fadeout(@accent-color, 80%) !important;
- color: @text !important;
+ background: @accent-color !important;
+ color: @base !important;
}
}
}
@@ -1163,7 +1134,6 @@
color: @text !important;
}
- /* text highlight */
::selection {
background: fadeout(@accent-color, 80%) !important;
color: @text !important;
@@ -1342,7 +1312,6 @@
color: @text !important;
}
- /* text highlight */
::selection {
background: fadeout(@accent-color, 80%) !important;
color: @text !important;
From bf264aa9ec600f1a933b37d632b7553d7177ff9f Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 2 Apr 2024 21:20:00 +0000
Subject: [PATCH 49/82] style: format code with prettier
---
styles/youtube/catppuccin.user.css | 36 +++++++++++++++++++++---------
1 file changed, 25 insertions(+), 11 deletions(-)
diff --git a/styles/youtube/catppuccin.user.css b/styles/youtube/catppuccin.user.css
index 808208b85a..b7f2d760f1 100644
--- a/styles/youtube/catppuccin.user.css
+++ b/styles/youtube/catppuccin.user.css
@@ -354,7 +354,6 @@
--dark-theme-divider-color: @overlay0 !important;
}
-
& when (@logo = 0) {
ytd-topbar-logo-renderer,
svg.ytd-consent-bump-v2-lightbox {
@@ -502,7 +501,13 @@
}
}
- .ytp-panel-menu, .ytp-panel-header, .ytp-panel-footer, .ytp-menuitem-label,.ytp-menuitem-content, .ytp-menuitem-label-count, .ytp-menu-label-secondary {
+ .ytp-panel-menu,
+ .ytp-panel-header,
+ .ytp-panel-footer,
+ .ytp-menuitem-label,
+ .ytp-menuitem-content,
+ .ytp-menuitem-label-count,
+ .ytp-menu-label-secondary {
color: @text;
}
@@ -511,16 +516,23 @@
}
.ytp-menuitem[aria-haspopup="true"] .ytp-menuitem-content {
- @svg: escape(' ');
- background-image: url("data:image/svg+xml,@{svg}")
+ @svg: escape(
+ ' '
+ );
+ background-image: url("data:image/svg+xml,@{svg}");
}
.ytp-panel-back-button {
- @svg: escape(' ');
- background-image: url("data:image/svg+xml,@{svg}")
+ @svg: escape(
+ ' '
+ );
+ background-image: url("data:image/svg+xml,@{svg}");
}
- .ytp-menuitem[role="menuitemradio"][aria-checked="true"] .ytp-menuitem-label {
- @svg: escape(' ');
- background-image: url("data:image/svg+xml,@{svg}")
+ .ytp-menuitem[role="menuitemradio"][aria-checked="true"]
+ .ytp-menuitem-label {
+ @svg: escape(
+ ' '
+ );
+ background-image: url("data:image/svg+xml,@{svg}");
}
.style-scope.ytd-thumbnail-overlay-toggle-button-renderer:hover {
@@ -925,7 +937,8 @@
background-color: @text;
}
.yt-spec-button-shape-next--mono {
- &.yt-spec-button-shape-next--outline, &.yt-spec-button-shape-next--text {
+ &.yt-spec-button-shape-next--outline,
+ &.yt-spec-button-shape-next--text {
color: @text;
&:hover {
background-color: @surface0;
@@ -1026,7 +1039,8 @@
fill: @accent-color !important;
}
- [fill="white"], [fill="#fff"] {
+ [fill="white"],
+ [fill="#fff"] {
fill: @base !important;
}
From b5a790c0d28c6b2f642156e26dddd1709808eabc Mon Sep 17 00:00:00 2001
From: uncenter <47499684+uncenter@users.noreply.github.com>
Date: Tue, 2 Apr 2024 17:40:26 -0400
Subject: [PATCH 50/82] fix(github): overlay background color, text selection
(#746)
---
styles/github/catppuccin.user.css | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/styles/github/catppuccin.user.css b/styles/github/catppuccin.user.css
index 3277f80dba..3cdd2fbfef 100644
--- a/styles/github/catppuccin.user.css
+++ b/styles/github/catppuccin.user.css
@@ -2,7 +2,7 @@
@name GitHub Catppuccin
@namespace github.com/catppuccin/userstyles/styles/github
@homepageURL https://github.com/catppuccin/userstyles/tree/main/styles/github
-@version 1.5.3
+@version 1.5.4
@updateURL https://github.com/catppuccin/userstyles/raw/main/styles/github/catppuccin.user.css
@supportURL https://github.com/catppuccin/userstyles/issues?q=is%3Aopen+is%3Aissue+label%3Agithub
@description Soothing pastel theme for GitHub
@@ -335,7 +335,7 @@
--buttonCounter-danger-fgColor-disabled: fade(@red, 50%);
--focus-outlineColor: @blue;
--menu-bgColor-active: @mantle;
- --overlay-bgColor: @mantle;
+ --overlay-bgColor: @base;
--overlay-borderColor: @surface0;
--overlay-backdrop-bgColor: #161b2266;
--selectMenu-borderColor: #484f58;
@@ -347,7 +347,7 @@
--underlineNav-borderColor-active: @accent-color;
--underlineNav-borderColor-hover: #6e768166;
--underlineNav-iconColor-rest: #848d97;
- --selection-bgColor: #1f6febb3;
+ --selection-bgColor: fade(@accent-color, 30%);
--reactionButton-selected-bgColor-rest: fade(@accent-color, 20%);
--reactionButton-selected-bgColor-hover: fade(@accent-color, 35%);
--reactionButton-selected-fgColor-rest: @accent-color;
@@ -466,6 +466,7 @@
--color-prettylights-syntax-markup-changed-text: @text;
--color-prettylights-syntax-markup-changed-bg: fadeout(@yellow, 60%);
--color-prettylights-syntax-markup-ignored-text: @text;
+ --bgColor-white: @base;
--color-scale-white: @base;
--color-scale-gray-3: @overlay2;
--color-scale-gray-5: @overlay0;
From 92c666620bd73cd19f5ae36b13be8a7b7b43e5a3 Mon Sep 17 00:00:00 2001
From: Guaxinim
Date: Tue, 2 Apr 2024 20:09:25 -0300
Subject: [PATCH 51/82] fix(holodex): logo colors & various unthemed elements
(#739)
* fix(holodex): Fix bottom bar link color begin default instead of accent
* fix(holodex): Fix MusicDex logo & update Holodex logo color
* fix(holodex): Fix unstyled text
* fix(holodex): Fix unstyled text and buttons
* fix(holodex): Style bottom snack
* fix(holodex): Fix login page
* fix(holodex): Bump version
* fix(holodex): Apply suggested changes
* chore(holodex): update preview
---
styles/holodex/catppuccin.user.css | 58 +++++++++++++++++++++++++++--
styles/holodex/preview.webp | Bin 132 -> 1129982 bytes
2 files changed, 55 insertions(+), 3 deletions(-)
diff --git a/styles/holodex/catppuccin.user.css b/styles/holodex/catppuccin.user.css
index 370db1d6e3..17e1372306 100644
--- a/styles/holodex/catppuccin.user.css
+++ b/styles/holodex/catppuccin.user.css
@@ -2,7 +2,7 @@
@name Holodex Catppuccin
@namespace github.com/catppuccin/userstyles/styles/holodex
@homepageURL https://github.com/catppuccin/userstyles/tree/main/styles/holodex
-@version 0.0.1
+@version 0.0.2
@updateURL https://github.com/catppuccin/userstyles/raw/main/styles/holodex/catppuccin.user.css
@supportURL https://github.com/catppuccin/userstyles/issues?q=is%3Aopen+is%3Aissue+label%3Aholodex
@description Soothing pastel theme for Holodex
@@ -163,7 +163,8 @@
background: @base;
border-color: @base;
}
- button.v-btn.v-btn--has-bg {
+
+ .v-btn.v-btn--has-bg:not(.nav-btn) {
background-color: @surface0 !important;
}
@@ -172,12 +173,28 @@
.v-card,
.v-sheet,
.v-select__selections,
+ .v-label,
+ .text--secondary,
.v-input__slot input {
color: @text !important;
- path {
+ path:not([fill*="iid-1"]) {
fill: @text;
}
}
+
+ .v-messages,
+ .v-list-item__subtitle,
+ .v-tab:not(.v-tab--active) {
+ color: @subtext0 !important;
+ }
+
+ svg.logo path {
+ fill: darken(@accent-color, 2%) !important;
+
+ &:last-child {
+ fill: darken(@blue, 8%) !important;
+ }
+ }
.v-chip {
background: @blue;
@@ -195,6 +212,41 @@
.stream-count-chip {
color: @crust !important;
}
+
+ .nav-btn.v-btn--active {
+ color: @accent-color !important;
+ }
+
+ div.v-sheet.v-alert {
+ background: none !important;
+ color: @yellow !important;
+
+ .v-icon path {
+ fill: @yellow !important;
+ }
+ }
+
+ hr {
+ border-color: @base;
+ }
+
+ // Snack
+ div.v-snack {
+ color: @text;
+
+ div.v-sheet {
+ background: @surface0 !important;
+ }
+
+ button.v-btn--text {
+ color: @text !important;
+ }
+
+ button.v-btn--is-elevated.v-btn--has-bg {
+ background: @accent-color !important;
+ color: @base;
+ }
+ }
}
:root:has(.theme--dark) {
diff --git a/styles/holodex/preview.webp b/styles/holodex/preview.webp
index 8480bca5d14f7e5baff600c16085c4b19f228e43..10cd204cb659722d84808c653ba4959d9cddcf86 100644
GIT binary patch
literal 1129982
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