From 61423bbadd9ba600e5103620d3f7bbcb33dbc689 Mon Sep 17 00:00:00 2001 From: uncenter <47499684+uncenter@users.noreply.github.com> Date: Mon, 8 Apr 2024 22:17:06 -0400 Subject: [PATCH 1/9] chore: add icon for syncthing & tldraw (#784) --- scripts/userstyles.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/userstyles.yml b/scripts/userstyles.yml index 74dcd6a0d5..d165b30b15 100644 --- a/scripts/userstyles.yml +++ b/scripts/userstyles.yml @@ -697,6 +697,7 @@ userstyles: syncthing: name: Syncthing categories: [productivity] + icon: syncthing color: sapphire readme: app-link: "https://syncthing.net" @@ -714,6 +715,7 @@ userstyles: tldraw: name: tldraw categories: [productivity] + icon: tldraw color: text readme: app-link: "https://www.tldraw.com" From dea5d5f31ace9df7ad641d6a76efe029770dae0b Mon Sep 17 00:00:00 2001 From: Hammy <58985301+sgoudham@users.noreply.github.com> Date: Tue, 9 Apr 2024 03:35:35 +0100 Subject: [PATCH 2/9] chore(deps): update `catppuccin/catppuccin` schema (#786) --- deno.json | 2 +- deno.lock | 2 +- scripts/types/userstyles.d.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deno.json b/deno.json index 335d4db6f1..34f97a405b 100644 --- a/deno.json +++ b/deno.json @@ -2,7 +2,7 @@ "imports": { "@/": "./scripts/", "std/": "https://deno.land/std@0.206.0/", - "catppuccin-repo/": "https://raw.githubusercontent.com/catppuccin/catppuccin/35662dbfb46b23d63eca9d3794cdc107c8ff92d3/", + "catppuccin-repo/": "https://raw.githubusercontent.com/catppuccin/catppuccin/7c731582d0df386727304360972b4a993120e33d/", "@actions/core": "npm:@actions/core@1.10.1", "@octokit/rest": "npm:@octokit/rest@20.0.2", "ajv": "npm:ajv@8.12.0", diff --git a/deno.lock b/deno.lock index 2b64f67b6f..3db23e32ef 100644 --- a/deno.lock +++ b/deno.lock @@ -1641,7 +1641,7 @@ "https://esm.sh/v135/type-fest@4.8.1/denonext/source/union-to-intersection.d.js": "4dda98575465ccb71439587d666e602980113bf8d01bb42067ca6ffeb4fae0e3", "https://esm.sh/v135/type-fest@4.8.1/source/simplify.d": "7359c9f2ef1a0d33486b54d31afe5a266317a370d20fe6947f245f4dca9de376", "https://esm.sh/v135/type-fest@4.8.1/source/union-to-intersection.d": "8a73c629d0507dd707e4cbaa3f745ffbd74b5073191ce522afc2ac0639f748cd", - "https://raw.githubusercontent.com/catppuccin/catppuccin/35662dbfb46b23d63eca9d3794cdc107c8ff92d3/resources/ports.schema.json": "72f41d9f98ec8e747c66ec98c2d159c10990be5a169c214c7f7c2167c83dab56", + "https://raw.githubusercontent.com/catppuccin/catppuccin/7c731582d0df386727304360972b4a993120e33d/resources/ports.schema.json": "19ddf4faf970a93acfb666541e37ba41d7d6c298d265255bd3d56dc9af45d91e", "https://raw.githubusercontent.com/catppuccin/palette/v0.2.0/palette-porcelain.json": "a13a97027e630bdac3a498696b9465f6f947ec6abc2acfee9084e9a951effe4b" }, "workspace": { diff --git a/scripts/types/userstyles.d.ts b/scripts/types/userstyles.d.ts index decfe9ba7d..870a509eee 100644 --- a/scripts/types/userstyles.d.ts +++ b/scripts/types/userstyles.d.ts @@ -48,7 +48,7 @@ export type Category = | "wiki" | "window_manager"; /** - * The fill color for the icon on the Catppuccin website. + * The fill color for the icon on the Catppuccin website, which should match the color used by Simple Icons. If the icon does not exist in Simple Icons, choose the most suitable color from the branding. */ export type Color = | "rosewater" From 33fb1fc4be2ef92ff138ae8fae39fcca301e9875 Mon Sep 17 00:00:00 2001 From: uncenter <47499684+uncenter@users.noreply.github.com> Date: Tue, 9 Apr 2024 07:15:41 -0400 Subject: [PATCH 3/9] docs: update badges (#787) --- README.md | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 8902392e60..a53eff9633 100644 --- a/README.md +++ b/README.md @@ -18,12 +18,9 @@

- - Stargazers - - Discussions - - Issues + + +

From 27b28ede320a66ea8a7dea086ae193bfe88e02cc Mon Sep 17 00:00:00 2001 From: Hammy <58985301+sgoudham@users.noreply.github.com> Date: Tue, 9 Apr 2024 12:20:33 +0100 Subject: [PATCH 4/9] chore: discussion badge The people need to know --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index a53eff9633..7cd797250e 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,8 @@ + + Discussions

From a65a0fc69cb3499934dc88b11d1f7fe02c7964c1 Mon Sep 17 00:00:00 2001 From: uncenter <47499684+uncenter@users.noreply.github.com> Date: Tue, 9 Apr 2024 07:31:27 -0400 Subject: [PATCH 5/9] docs: fix discussion badge colors (#789) --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 7cd797250e..ac989cdc47 100644 --- a/README.md +++ b/README.md @@ -21,8 +21,7 @@ - - Discussions +

From cc59b9c0f4ccd3c592e1683334873689b935106d Mon Sep 17 00:00:00 2001 From: uncenter <47499684+uncenter@users.noreply.github.com> Date: Tue, 9 Apr 2024 09:35:39 -0400 Subject: [PATCH 6/9] fix(github): header shenanigans (#790) --- styles/github/catppuccin.user.css | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/styles/github/catppuccin.user.css b/styles/github/catppuccin.user.css index 2ecc45860b..c10ca55ec0 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.6.4 +@version 1.6.5 @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 @@ -201,10 +201,10 @@ --codeMirror-syntax-fgColor-support: #79c0ff; --codeMirror-syntax-fgColor-variable: @peach; --header-fgColor-default: @text; - --header-fgColor-logo: #f0f6fc; + --header-fgColor-logo: @text; --header-bgColor: @crust; --header-borderColor-divider: #8b949e; - --headerSearch-bgColor: @base; + --headerSearch-bgColor: @mantle; --headerSearch-borderColor: @surface0; --avatar-bgColor: fade(@text, 26%); --avatar-borderColor: @surface0; @@ -315,7 +315,7 @@ --button-danger-fgColor-active: @base; --button-danger-fgColor-disabled: fade(@red, 50%); --button-danger-iconColor-rest: @red; - --button-danger-iconColor-hover: @text; + --button-danger-iconColor-hover: @crust; --button-danger-bgColor-rest: @surface0; --button-danger-bgColor-hover: @red; --button-danger-bgColor-active: darken(@red, 5%); @@ -542,6 +542,12 @@ .header-search-button.placeholder { color: @subtext0; } + .HeaderMenu-toggle-bar { + background-color: @text; + } + .notification-indicator .mail-status { + background-image: linear-gradient(@accent-color, darken(@accent-color, 5%)); + } .CheckStep { .ansifg-r { From 988b64f7165404f5a8b89d816c1e5fd53f60c239 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 9 Apr 2024 13:36:04 +0000 Subject: [PATCH 7/9] style: format code with prettier --- styles/github/catppuccin.user.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/styles/github/catppuccin.user.css b/styles/github/catppuccin.user.css index c10ca55ec0..5d6d86e081 100644 --- a/styles/github/catppuccin.user.css +++ b/styles/github/catppuccin.user.css @@ -546,7 +546,10 @@ background-color: @text; } .notification-indicator .mail-status { - background-image: linear-gradient(@accent-color, darken(@accent-color, 5%)); + background-image: linear-gradient( + @accent-color, + darken(@accent-color, 5%) + ); } .CheckStep { From 1e99e1a23f2f688471912e8a56a41f49448be540 Mon Sep 17 00:00:00 2001 From: Toshit <45221816+r58Playz@users.noreply.github.com> Date: Tue, 9 Apr 2024 08:18:18 -0700 Subject: [PATCH 8/9] fix(formative): broken elements, spinner (#788) --- styles/formative/catppuccin.user.css | 60 +++++++++++++++++++++++++--- 1 file changed, 55 insertions(+), 5 deletions(-) diff --git a/styles/formative/catppuccin.user.css b/styles/formative/catppuccin.user.css index 5cff5ad31b..049a92410e 100644 --- a/styles/formative/catppuccin.user.css +++ b/styles/formative/catppuccin.user.css @@ -2,7 +2,7 @@ @name Formative Catppuccin @namespace github.com/catppuccin/userstyles/styles/formative @homepageURL https://github.com/catppuccin/userstyles/tree/main/styles/formative -@version 0.2.1 +@version 0.2.2 @updateURL https://github.com/catppuccin/userstyles/raw/main/styles/formative/catppuccin.user.css @supportURL https://github.com/catppuccin/userstyles/issues?q=is%3Aopen+is%3Aissue+label%3Aformative @description Soothing pastel theme for Formative @@ -69,6 +69,11 @@ &::placeholder { color: @subtext0 !important; } + border-color: @overlay0; + color: @text; + } + .input { + border-color: @overlay0; } .MainAppSideMenu__LogoLink-sc-11gwnv8-2, @@ -222,7 +227,9 @@ .LaunchRespondusBrowser__DetailsParagraph-sc-1ymzzc2-4, .PracticeSession__PopoverContentDiv-sc-1t2vn9a-4, .ExpandableAccordionHeader__HeaderRow-sc-cu02pz-1, - .VerticalButton__StyledSpan-sc-1h2we7r-1 { + .VerticalButton__StyledSpan-sc-1h2we7r-1, + .ShelfTile__LabelDiv-sc-1oc4c00-3, + .PracticeSet__AddItemCardContents-sc-1wup6tb-10 { color: @text; } .TabsItem__TabDiv-sc-tj1og8-4:hover, @@ -382,6 +389,9 @@ .Popover__PopoverArrow-sc-1x169li-3 { fill: @surface2; } + .StrokePicker__InnerDiv-sc-8widgm-4 { + background: @surface2; + } } .DropdownList__TriggerButton-sc-1hvvmg1-0, .EmptyExplainer__StyledMaterialIcon-sc-1ixiesy-4 { @@ -476,6 +486,9 @@ color: @subtext0; } } + .PracticeItemImport__StyledTextarea-sc-4fopem-2 { + background: @surface0; + } } .ModalTitle { background: @base; @@ -659,11 +672,16 @@ } border-color: @overlay2 !important; } - .BlankOutput__FillableEntity-sc-15mzaww-2, - .BlankOutput__FillableNumericDiv-sc-15mzaww-1 { + .BlankOutput__FillableEntity-sc-15mzaww-3, + .BlankOutput__FillableNumericDiv-sc-15mzaww-2 { outline-color: @accent-color; color: @text; background: @surface0; + .KatexOutput__RootDiv-sc-gu2jna-0 { + [style*="color: rgb(204, 0, 0)"] { + color: @red !important; + } + } } .match-table-grid-container table { th, @@ -724,6 +742,12 @@ background: transparent; } } + .ChoiceOptionViewable__RightSideDiv-sc-a2vwy6-2 { + border-color: @overlay0; + .ChoiceOptionViewable__StrickenOverlayDiv-sc-a2vwy6-7 { + background-image: repeating-linear-gradient(315deg, transparent, transparent 16px, @text 16px, @text 18px); + } + } .InlineChoiceOutput__InlineChoiceOutputDiv-sc-1694w84-2 { background: @surface0; border-color: @accent-color; @@ -1088,7 +1112,7 @@ border-color: @overlay0; } .ModalBody__RootDiv-sc-1lg094f-0:has( - .SubmitModal__ContentTitleH3-sc-7oq9dj-1 + .Submit__ContentTitleH3-sc-1vceatk-1 ) svg path { @@ -1120,6 +1144,9 @@ border-color: @overlay0; input.ReactiveTextInput__StyledInput-sc-g83bxq-2 { color: @text !important; + &::placeholder, &:focus::placeholder { + color: @subtext0 !important; + } } .HeaderBackLink__TertiaryButtonLink-sc-1vx1tro-0, .Button__StyledButton-sc-aum9f1-1 { @@ -1450,6 +1477,29 @@ transform: scale(1); } } + .Shelf__RootDiv-sc-5aism7-0 { + background: @surface0; + .ShelfTile__RootButton-sc-1oc4c00-0 { + background: @surface1; + &:hover { + background: @surface2; + box-shadow: @accent-color 0 0 0 1px; + .label { + color: @accent-color; + } + } + .ShelfTile__IconDiv-sc-1oc4c00-1 { + background: @accent-color !important; + i { + color: @contrast-accent-color; + } + } + } + } + img.spinner { + @svg: escape(''); + content: url("data:image/svg+xml,@{svg}"); + } } } From ff53c629f6699b815c9a2489e38c7d05d9d758e2 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 9 Apr 2024 15:18:46 +0000 Subject: [PATCH 9/9] style: format code with prettier --- styles/formative/catppuccin.user.css | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/styles/formative/catppuccin.user.css b/styles/formative/catppuccin.user.css index 049a92410e..ccea70231a 100644 --- a/styles/formative/catppuccin.user.css +++ b/styles/formative/catppuccin.user.css @@ -745,7 +745,13 @@ .ChoiceOptionViewable__RightSideDiv-sc-a2vwy6-2 { border-color: @overlay0; .ChoiceOptionViewable__StrickenOverlayDiv-sc-a2vwy6-7 { - background-image: repeating-linear-gradient(315deg, transparent, transparent 16px, @text 16px, @text 18px); + background-image: repeating-linear-gradient( + 315deg, + transparent, + transparent 16px, + @text 16px, + @text 18px + ); } } .InlineChoiceOutput__InlineChoiceOutputDiv-sc-1694w84-2 { @@ -1111,9 +1117,7 @@ .FormativeStudentFooter__BottomDiv-sc-6tj89c-3 { border-color: @overlay0; } - .ModalBody__RootDiv-sc-1lg094f-0:has( - .Submit__ContentTitleH3-sc-1vceatk-1 - ) + .ModalBody__RootDiv-sc-1lg094f-0:has(.Submit__ContentTitleH3-sc-1vceatk-1) svg path { fill: @accent-color; @@ -1144,7 +1148,8 @@ border-color: @overlay0; input.ReactiveTextInput__StyledInput-sc-g83bxq-2 { color: @text !important; - &::placeholder, &:focus::placeholder { + &::placeholder, + &:focus::placeholder { color: @subtext0 !important; } } @@ -1497,7 +1502,9 @@ } } img.spinner { - @svg: escape(''); + @svg: escape( + '' + ); content: url("data:image/svg+xml,@{svg}"); } }