Skip to content

Commit

Permalink
Merge branch 'main' into docs/template-and-how-to
Browse files Browse the repository at this point in the history
  • Loading branch information
uncenter authored Apr 7, 2024
2 parents c7616b5 + 9731f6d commit 025f5a5
Show file tree
Hide file tree
Showing 15 changed files with 1,669 additions and 129 deletions.
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
/styles/syncthing @BlankParticle
/styles/tabnews @Guaxinim5573
/styles/tldraw @GenShibe @uncenter
/styles/trinket @trinkey
/styles/tuta @ryanccn
/styles/twitch @GitMuslim @isabelroses
/styles/twitter @watatomo
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/userstyle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:tldraw", "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:trinket", "lbl:tuta", "lbl:twitch", "lbl:twitter", "lbl:vercel", "lbl:whatsapp-web", "lbl:wikipedia", "lbl:wikiwand", "lbl:youtube", "lbl:nextjs"]
validations:
required: true
- type: textarea
Expand Down
2 changes: 2 additions & 0 deletions .github/issue-labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,8 @@ tabnews:
- '(lbl:tabnews)'
tldraw:
- '(lbl:tldraw)'
trinket:
- '(lbl:trinket)'
tuta:
- '(lbl:tuta)'
twitch:
Expand Down
3 changes: 3 additions & 0 deletions .github/labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,9 @@
- name: tldraw
description: tldraw
color: '#cad3f5'
- name: trinket
description: Trinket
color: '#8aadf4'
- name: tuta
description: Tuta
color: '#ee99a0'
Expand Down
1 change: 1 addition & 0 deletions .github/pr-labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ substack: styles/substack/**/*
syncthing: styles/syncthing/**/*
tabnews: styles/tabnews/**/*
tldraw: styles/tldraw/**/*
trinket: styles/trinket/**/*
tuta: styles/tuta/**/*
twitch: styles/twitch/**/*
twitter: styles/twitter/**/*
Expand Down
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,10 @@ See [CONTRIBUTING.md](docs/CONTRIBUTING.md).
## 🖌 Userstyles

> [!IMPORTANT]
> Userstyles labeled with the "🚧" emoji are looking for maintainers, and may not work as intended. Contributions are still welcome and encouraged. If you would like to become a maintainer, add your username to the `current-maintainers` array in the [userstyles.yml](./scripts/userstyles.yml) file.
> Userstyles labeled with the "🚧" emoji are looking for maintainers, and may
> not work as intended. Contributions are still welcome and encouraged. If you
> would like to become a maintainer, follow the instructions outlined in
> "[Adding yourself as a maintainer](https://github.com/catppuccin/userstyles/blob/main/docs/userstylesyml.md#adding-yourself-as-a-maintainer)."
<!-- AUTOGEN:USERSTYLES START -->
<!-- the following section is auto-generated, do not edit -->
Expand All @@ -97,6 +100,7 @@ See [CONTRIBUTING.md](docs/CONTRIBUTING.md).
- [npm](styles/npm)
- [paste.rs](styles/paste.rs)
- [PyPI](styles/pypi)
- [Trinket](styles/trinket)
- [Vercel](styles/vercel)

</details>
Expand Down
7 changes: 7 additions & 0 deletions scripts/userstyles.yml
Original file line number Diff line number Diff line change
Expand Up @@ -719,6 +719,13 @@ userstyles:
> [!NOTE]
> This theme only changes how the colors appear on the tldraw canvas. Exported graphics **will not be Catppuccin-themed**.
current-maintainers: [*genshibe, *uncenter]
trinket:
name: Trinket
categories: [development]
color: blue
readme:
app-link: "https://trinket.io"
current-maintainers: [*trinkey]
tuta:
name: Tuta
categories: [email_client, productivity]
Expand Down
40 changes: 38 additions & 2 deletions styles/anilist/catppuccin.user.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
@name AniList/AniChart Catppuccin
@namespace github.com/catppuccin/userstyles/styles/anilist
@homepageURL https://github.com/catppuccin/userstyles/tree/main/styles/anilist
@version 2.2.1
@version 2.2.2
@updateURL https://github.com/catppuccin/userstyles/raw/main/styles/anilist/catppuccin.user.css
@supportURL https://github.com/catppuccin/userstyles/issues?q=is%3Aopen+is%3Aissue+label%3Aanilist
@description Soothing pastel theme for AniList and AniChart
Expand Down Expand Up @@ -325,6 +325,40 @@
.el-input__prefix {
color: @overlay1;
}
.el-picker-panel {
color: @text;
background-color: @surface0;
border-color: @surface1;
}
.el-date-table th {
color: @overlay1;
border-bottom-color: @surface1;
}
.el-date-picker__header-label {
color: @subtext0;

&:hover {
color: @accent-color;
}
}
.el-picker-panel__icon-btn {
color: @overlay1;

&:hover {
color: @accent-color;
}
}
.el-date-table td.available:hover {
color: @accent-color;
}
.el-date-table td.current:not(.disabled) span {
color: @crust;
background-color: @accent-color;
}
.el-date-table td.next-month,
.el-date-table td.prev-month {
color: @surface2;
}

/* ---------SCORE TWEAKS-------------- */
.score[data-v-5ca094da] {
Expand Down Expand Up @@ -540,7 +574,9 @@
}
.activity-feed .hohNoteSuffix:not(:empty),
.activity-feed .hohRewatchSuffix:not(:empty),
.activity-feed .hohScore:not(.hohSmiley) {
.activity-feed .hohScore:not(.hohSmiley),
.hohFeedScore .hohScore {
border-radius: 5px;
padding: 2.5px 5px 1px !important;
color: @subtext1 !important;
background-color: @surface0;
Expand Down
52 changes: 38 additions & 14 deletions styles/github/catppuccin.user.css
Original file line number Diff line number Diff line change
Expand Up @@ -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.6.0
@version 1.6.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
Expand Down Expand Up @@ -179,7 +179,7 @@
--diffBlob-deletion-bgColor-num: fadeout(@red, 70%);
--diffBlob-deletion-bgColor-line: fadeout(@red, 85%);
--diffBlob-deletion-bgColor-word: fadeout(@red, 70%);
--diffBlob-hunk-bgColor-num: fadeout(@blue, 60%);
--diffBlob-hunk-bgColor-num: fadeout(@accent-color, 60%);
--diffBlob-expander-iconColor: #848d97;
--codeMirror-fgColor: @text;
--codeMirror-bgColor: @base;
Expand Down Expand Up @@ -211,14 +211,14 @@
--avatar-shadow: 0px 0px 0px 2px #0d1117;
--avatarStack-fade-bgColor-default: @surface1;
--avatarStack-fade-bgColor-muted: #21262d;
--control-bgColor-rest: #21262d;
--control-bgColor-rest: @red;
--control-bgColor-hover: #292e36;
--control-bgColor-active: #31363e;
--control-bgColor-active: @surface1;
--control-bgColor-disabled: fade(@mantle, 60%);
--control-bgColor-selected: #161b22;
--control-fgColor-rest: #c9d1d9;
--control-fgColor-rest: @text;
--control-fgColor-placeholder: #484f58;
--control-fgColor-disabled: @surface0;
--control-fgColor-disabled: fade(@subtext0, 70%);
--control-borderColor-rest: @surface1;
--control-borderColor-emphasis: #666e79;
--control-borderColor-disabled: fade(@surface1, 75%);
Expand All @@ -239,11 +239,11 @@
--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;
--control-checked-bgColor-active: #3685f3;
--control-checked-bgColor-rest: @accent-color;
--control-checked-bgColor-hover: lighten(@accent-color, 5%);
--control-checked-bgColor-active: lighten(@accent-color, 5%);
--control-checked-bgColor-disabled: #6e7681;
--control-checked-fgColor-rest: @text;
--control-checked-fgColor-rest: @crust;
--control-checked-fgColor-disabled: #010409;
--control-checked-borderColor-rest: @accent-color;
--control-checked-borderColor-hover: @accent-color;
Expand All @@ -268,19 +268,19 @@
--button-default-bgColor-hover: @surface1;
--button-default-bgColor-active: @surface2;
--button-default-bgColor-selected: @surface2;
--button-default-bgColor-disabled: fade(@base, 70%);
--button-default-bgColor-disabled: fade(@surface0, 70%);
--button-default-borderColor-rest: @surface1;
--button-default-borderColor-hover: @surface1;
--button-default-borderColor-active: @surface1;
--button-default-borderColor-disabled: #21262db3;
--button-default-borderColor-disabled: fade(@surface0, 70%);
--button-default-shadow-resting: 0px 0px 0px 0px #000;
--button-primary-fgColor-rest: @base;
--button-primary-fgColor-disabled: fade(@base, 60%);
--button-primary-iconColor-rest: @base;
--button-primary-bgColor-rest: @green;
--button-primary-bgColor-hover: lighten(@green, 5%);
--button-primary-bgColor-active: saturate(@green, 5%);
--button-primary-bgColor-disabled: darken(desaturate(@green, 10%), 10%);
--button-primary-bgColor-disabled: fade(@green, 70%);
--button-primary-borderColor-rest: @green;
--button-primary-borderColor-hover: @green;
--button-primary-borderColor-active: @green;
Expand Down Expand Up @@ -364,7 +364,7 @@
--fgColor-default: @text;
--fgColor-muted: @subtext1;
--fgColor-onEmphasis: @base;
--fgColor-white: @base;
--fgColor-white: if(@lookup = latte, @crust, @text);
--fgColor-disabled: @surface2;
--fgColor-link: @accent-color;
--fgColor-neutral: #6e7681;
Expand Down Expand Up @@ -542,6 +542,30 @@
.header-search-button.placeholder {
color: @subtext0;
}

.CheckStep {
.ansifg-r {
color: var(--color-ansi-red);
}
.ansifg-y {
color: var(--color-ansi-yellow);
}
.ansifg-g {
color: var(--color-ansi-green);
}
.ansifg-b {
color: var(--color-ansi-blue);
}
.ansifg-c {
color: var(--color-ansi-cyan);
}
.ansifg-m {
color: var(--color-ansi-magenta);
}
.ansifg-gr {
color: var(--color-ansi-gray);
}
}
}
}

Expand Down
Loading

0 comments on commit 025f5a5

Please sign in to comment.