Merge branch 'main' into refactor/mastodon

catppuccin · Mar 31, 2024 · 2e74d20 · 2e74d20
2 parents 691c81c + 6795011
commit 2e74d20
Show file tree

Hide file tree

Showing 12 changed files with 648 additions and 296 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/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/brave-search/catppuccin.user.css b/styles/brave-search/catppuccin.user.css
diff --git 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;

diff --git a/styles/pronouns.page/README.md b/styles/pronouns.page/README.md
@@ -0,0 +1,36 @@
+<!-- AUTOGEN:README START -->
+<!-- THIS FILE IS AUTOGENERATED. DO NOT EDIT IT BY HAND -->
+
+<h3 align="center">
+	<img src="https://raw.githubusercontent.com/catppuccin/catppuccin/main/assets/logos/exports/1544x1544_circle.png" width="100" alt="Logo"/><br/>
+	<img src="https://raw.githubusercontent.com/catppuccin/catppuccin/main/assets/misc/transparent.png" height="30" width="0px"/>
+  Catppuccin for <a href="https://pronouns.page/">Pronouns.page</a>
+	<img src="https://raw.githubusercontent.com/catppuccin/catppuccin/main/assets/misc/transparent.png" height="30" width="0px"/>
+</h3>
+
+<p align="center">
+	<a href="https://github.com/catppuccin/userstyles/issues?q=is%3Aissue+is%3Aopen+label%3Apronouns.page"><img src="https://img.shields.io/github/issues/catppuccin/userstyles/pronouns.page?colorA=363a4f&colorB=f5a97f&style=for-the-badge"></a>
+	<a href="https://raw.githubusercontent.com/catppuccin/userstyles/main/styles/pronouns.page/catppuccin.user.css"><img src="https://img.shields.io/badge/stylus-install-cba6f7?colorA=363a4f&style=for-the-badge"></a>
+</p>
+
+<p align="center">
+  <img src="preview.webp"/>
+</p>
+
+
+
+## 💝 Current Maintainer
+- [uncenter](https://github.com/uncenter)
+
+
+&nbsp;
+
+<p align="center">
+	<img src="https://raw.githubusercontent.com/catppuccin/catppuccin/main/assets/footers/gray0_ctp_on_line.svg?sanitize=true" />
+</p>
+
+<p align="center">
+	Copyright &copy; 2021-present <a href="https://github.com/catppuccin" target="_blank">Catppuccin Org</a>
+</p>
+
+<!-- AUTOGEN:README END -->