Merge branch 'main' into refactor/deepl

catppuccin · Apr 9, 2024 · e14f40e · e14f40e
2 parents 3ae5604 + ff53c62
commit e14f40e
Show file tree

Hide file tree

Showing 7 changed files with 86 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -18,12 +18,10 @@
 </p>
 
 <p align="center">
-	<a href="https://github.com/catppuccin/userstyles/stargazers">
-		<img alt="Stargazers" src="https://img.shields.io/github/stars/catppuccin/userstyles?style=for-the-badge&logo=starship&color=C9CBFF&logoColor=D9E0EE&labelColor=302D41"></a>
-	<a href="https://http.cat/404">
-		<img alt="Discussions" src="https://img.shields.io/badge/Discussions-disabled-D9E0EE?style=for-the-badge&color=F2CDCD&labelColor=302D41&logo=data:image/svg+xml;base64,PHN2ZyByb2xlPSJpbWciIHZpZXdCb3g9IjAgMCAyNCAyNCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48dGl0bGU+Q2F0cHB1Y2NpbjwvdGl0bGU+PHBhdGggZD0iTTEyIDBBMTIgMTIgMCAwIDAgMCAxMmExMiAxMiAwIDAgMCA2LjMwMyAxMC40NzVjLjA1NC0uMzA5LjU1Ni0zLjE3Ny44MDItMy42NDEgMCAwLTUuOTQ0LTIuNzM1LTEuOTcyLTkuODYzIDAgMC0uOTUtMy43MjUtLjE3NC00LjQwMy43NzYtLjY3NyAzLjM4My45MjcgMy45MzYgMS42MTIgMCAwIDIuMDg0LS45ODMgNS4zNjUtLjIzIDAgMCAyLjI5Mi0yLjI4MSAzLjIxMy0xLjg4NC45Mi4zOTguNzIyIDMuNzAyLjYxOSAzLjk2IDAgMCA1LjYzIDUuMjMyLTEuMjQ2IDEwLjQzNyAwIDAgLjQ3NSAzLjA1OC40MzEgNC4xMjNBMTIgMTIgMCAwIDAgMjQgMTIgMTIgMTIgMCAwIDAgMTIgMFptNC4wMyA5LjFjLS44ODQgMC0xLjYuNjEtMS42IDEuMzYgMCAuMDMzIDAgLjA2NS4wMDQuMDk3YS4xNDguMTQ4IDAgMCAwIC4yNjQuMDgyYy4zMDUtLjM4Ljc5Ny0uNzEzIDEuMzUzLS43MTMuNTIgMCAuOTg1LjI5NyAxLjI5My42NDQuMDQ1LjA1MS4xMTcuMDcuMTgxLjA0NWEuMTY0LjE2NCAwIDAgMCAuMTA2LS4xNTRjMC0uNzUtLjcxOC0xLjM2MS0xLjYwMi0xLjM2MXptLTUuMjA2LjEyM2MtMS4wMSAwLTEuODMuNzExLTEuODMgMS41ODYgMCAuMDYuMDA0LjExOC4wMTIuMTc3YS4xNDcuMTQ3IDAgMCAwIC4yNjQuMDczYy4zNDYtLjQ0Ni45MjQtLjgxNSAxLjU3OC0uODE1LjU5IDAgMS4xMi4zMDcgMS40Ny42OTRhLjE5NC4xOTQgMCAwIDAgLjMzNi0uMTNjMC0uODc0LS44Mi0xLjU4NS0xLjgzLTEuNTg1em0yLjkzIDIuNTAyYy0uMDE0IDAtLjAyNS4wMS0uMDI1LjAyM3YuMDAybC4wMDEuMDAyLjAwMi0uMDAyYy4wMDUtLjAwNi4wMTUtLjAxLjAyNC0uMDEuMDA4IDAgLjAxNC4wMDUuMDIuMDFoLjAwM3YtLjAwMmMwLS4wMTItLjAxMS0uMDIzLS4wMjUtLjAyM3ptMS4yMjUuMjQ2LTEuODAxLjE2YS4xMDcuMTA3IDAgMCAwLS4wNTUuMTkzbDEuMDQxLjc2OGEuMTguMTggMCAwIDAgLjI0NC0uMDNsLjcwNS0uODMyYS4xNTguMTU4IDAgMCAwLS4xMzUtLjI2em0uOTIgMS4zMzRjLS41MDQuODY2LTEuNDU4LjI3LTEuNDU4LjI3LS42NzQgMS4wNzktMS45MTYuMzEyLTEuOTE2LjMxMi43NjggMS40NjUgMi4wMTIuMzYzIDIuMDEyLjM2MyAxLjMyNS4zNzcgMS4zNjEtLjk0NSAxLjM2MS0uOTQ1em0tMy4zODcgNS40NDFjLS40NTggMS4zODEuMzE4IDIuMjU0LjMxOCAyLjI1NC43MTYuMDAyIDEuMzYxLS44ODUgMS4zNjEtLjg4NS4xLjExMS45MDguNDA5IDEuMDcuNDE2LjE2My4wMDguMjQ2LTEuNi0uMDgxLTEuNzA3LS4zMjctLjEwNi0xLjA1Ny42NDctMS4wNTcuNjQ3LS4zOC0uMzkzLTEuNjExLS43MjUtMS42MTEtLjcyNXoiIGZpbGw9IiNjZGQ2ZjQiLz48L3N2Zz4K"/></a>
-	<a href="https://github.com/catppuccin/userstyles/issues">
-		<img alt="Issues" src="https://img.shields.io/github/issues/catppuccin/userstyles?style=for-the-badge&logo=gitbook&color=B5E8E0&logoColor=D9E0EE&labelColor=302D41"></a>
+	<a href="https://github.com/catppuccin/userstyles/stargazers"><img src="https://img.shields.io/github/stars/catppuccin/userstyles?colorA=363a4f&colorB=b7bdf8&style=for-the-badge"></a>
+  <a href="https://github.com/catppuccin/userstyles/blob/main/styles"><img src="https://img.shields.io/github/directory-file-count/catppuccin/userstyles/styles?label=Userstyles&colorA=363a4f&colorB=cba6f7&style=for-the-badge"></a>
+	<a href="https://github.com/catppuccin/userstyles/blob/main/.github/CODEOWNERS"><img src="https://img.shields.io/badge/dynamic/yaml?url=https%3A%2F%2Fraw.githubusercontent.com%2Fcatppuccin%2Fuserstyles%2Fmain%2Fscripts%2Fuserstyles.yml&query=%24.collaborators.length&label=Maintainers&colorA=363a4f&colorB=a6da95&style=for-the-badge"></a>
+  <a href="https://http.cat/404"><img src="https://img.shields.io/badge/Discussions-disabled-cad3f5?&colorA=363a4f&colorB=f0c6c6&style=for-the-badge&logo=data:image/svg+xml;base64,PHN2ZyByb2xlPSJpbWciIHZpZXdCb3g9IjAgMCAyNCAyNCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48dGl0bGU+Q2F0cHB1Y2NpbjwvdGl0bGU+PHBhdGggZD0iTTEyIDBBMTIgMTIgMCAwIDAgMCAxMmExMiAxMiAwIDAgMCA2LjMwMyAxMC40NzVjLjA1NC0uMzA5LjU1Ni0zLjE3Ny44MDItMy42NDEgMCAwLTUuOTQ0LTIuNzM1LTEuOTcyLTkuODYzIDAgMC0uOTUtMy43MjUtLjE3NC00LjQwMy43NzYtLjY3NyAzLjM4My45MjcgMy45MzYgMS42MTIgMCAwIDIuMDg0LS45ODMgNS4zNjUtLjIzIDAgMCAyLjI5Mi0yLjI4MSAzLjIxMy0xLjg4NC45Mi4zOTguNzIyIDMuNzAyLjYxOSAzLjk2IDAgMCA1LjYzIDUuMjMyLTEuMjQ2IDEwLjQzNyAwIDAgLjQ3NSAzLjA1OC40MzEgNC4xMjNBMTIgMTIgMCAwIDAgMjQgMTIgMTIgMTIgMCAwIDAgMTIgMFptNC4wMyA5LjFjLS44ODQgMC0xLjYuNjEtMS42IDEuMzYgMCAuMDMzIDAgLjA2NS4wMDQuMDk3YS4xNDguMTQ4IDAgMCAwIC4yNjQuMDgyYy4zMDUtLjM4Ljc5Ny0uNzEzIDEuMzUzLS43MTMuNTIgMCAuOTg1LjI5NyAxLjI5My42NDQuMDQ1LjA1MS4xMTcuMDcuMTgxLjA0NWEuMTY0LjE2NCAwIDAgMCAuMTA2LS4xNTRjMC0uNzUtLjcxOC0xLjM2MS0xLjYwMi0xLjM2MXptLTUuMjA2LjEyM2MtMS4wMSAwLTEuODMuNzExLTEuODMgMS41ODYgMCAuMDYuMDA0LjExOC4wMTIuMTc3YS4xNDcuMTQ3IDAgMCAwIC4yNjQuMDczYy4zNDYtLjQ0Ni45MjQtLjgxNSAxLjU3OC0uODE1LjU5IDAgMS4xMi4zMDcgMS40Ny42OTRhLjE5NC4xOTQgMCAwIDAgLjMzNi0uMTNjMC0uODc0LS44Mi0xLjU4NS0xLjgzLTEuNTg1em0yLjkzIDIuNTAyYy0uMDE0IDAtLjAyNS4wMS0uMDI1LjAyM3YuMDAybC4wMDEuMDAyLjAwMi0uMDAyYy4wMDUtLjAwNi4wMTUtLjAxLjAyNC0uMDEuMDA4IDAgLjAxNC4wMDUuMDIuMDFoLjAwM3YtLjAwMmMwLS4wMTItLjAxMS0uMDIzLS4wMjUtLjAyM3ptMS4yMjUuMjQ2LTEuODAxLjE2YS4xMDcuMTA3IDAgMCAwLS4wNTUuMTkzbDEuMDQxLjc2OGEuMTguMTggMCAwIDAgLjI0NC0uMDNsLjcwNS0uODMyYS4xNTguMTU4IDAgMCAwLS4xMzUtLjI2em0uOTIgMS4zMzRjLS41MDQuODY2LTEuNDU4LjI3LTEuNDU4LjI3LS42NzQgMS4wNzktMS45MTYuMzEyLTEuOTE2LjMxMi43NjggMS40NjUgMi4wMTIuMzYzIDIuMDEyLjM2MyAxLjMyNS4zNzcgMS4zNjEtLjk0NSAxLjM2MS0uOTQ1em0tMy4zODcgNS40NDFjLS40NTggMS4zODEuMzE4IDIuMjU0LjMxOCAyLjI1NC43MTYuMDAyIDEuMzYxLS44ODUgMS4zNjEtLjg4NS4xLjExMS45MDguNDA5IDEuMDcuNDE2LjE2My4wMDguMjQ2LTEuNi0uMDgxLTEuNzA3LS4zMjctLjEwNi0xLjA1Ny42NDctMS4wNTcuNjQ3LS4zOC0uMzkzLTEuNjExLS43MjUtMS42MTEtLjcyNXoiIGZpbGw9IiNjYWQzZjUiLz48L3N2Zz4="/></a>
 </p>
 
 <p align="center">

diff --git a/deno.json b/deno.json
@@ -2,7 +2,7 @@
   "imports": {
     "@/": "./scripts/",
     "std/": "https://deno.land/[email protected]/",
-    "catppuccin-repo/": "https://raw.githubusercontent.com/catppuccin/catppuccin/35662dbfb46b23d63eca9d3794cdc107c8ff92d3/",
+    "catppuccin-repo/": "https://raw.githubusercontent.com/catppuccin/catppuccin/7c731582d0df386727304360972b4a993120e33d/",
     "@actions/core": "npm:@actions/[email protected]",
     "@octokit/rest": "npm:@octokit/[email protected]",
     "ajv": "npm:[email protected]",

diff --git a/deno.lock b/deno.lock
diff --git 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"

diff --git 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"

diff --git 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,18 @@
           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;
@@ -1087,9 +1117,7 @@
     .FormativeStudentFooter__BottomDiv-sc-6tj89c-3 {
       border-color: @overlay0;
     }
-    .ModalBody__RootDiv-sc-1lg094f-0:has(
-        .SubmitModal__ContentTitleH3-sc-7oq9dj-1
-      )
+    .ModalBody__RootDiv-sc-1lg094f-0:has(.Submit__ContentTitleH3-sc-1vceatk-1)
       svg
       path {
       fill: @accent-color;
@@ -1120,6 +1148,10 @@
       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 +1482,31 @@
         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(
+        '<svg width="140" height="140" version="1.1" viewBox="0 0 1400 1400" xmlns="http://www.w3.org/2000/svg"><path d="M1035 1226c-13-13-27-40-31-60-6-35-3-40 60-106 116-120 162-254 145-423-9-93-55-201-114-266l-37-41h44c60 0 83-24 79-86-3-55 3-53 64 26 97 126 148 276 148 430 0 155-52 305-148 430-91 118-158 148-210 96" fill="@{yellow}"/><path d="M1105 362c-11-2-41-24-68-49-102-95-263-143-409-123-87 12-198 62-257 115l-41 37v-40c0-61-26-86-85-83-56 3-54-3 25-64 72-55 182-108 270-131 85-22 235-22 320 0 124 32 298 132 345 199s-19 159-100 139" fill="@{green}"/><path d="M612 1389c-158-21-341-117-431-226-56-68-31-143 53-159 35-6 40-3 106 60 121 118 272 168 433 146 76-11 178-53 236-97l34-26-6 23c-8 30 15 85 41 99 12 6 35 11 53 11h32l-47 36c-134 102-337 156-504 133" fill="@{red}"/><path d="M142 1113c-45-59-98-173-118-253-22-85-22-235 0-320 32-124 132-298 199-345 46-32 110-14 132 39 19 45 10 73-42 129-95 102-143 264-123 410 11 76 53 178 97 236l26 34-23-6c-26-7-83 14-96 34-5 8-11 30-14 50l-5 36z" fill="@{blue}"/></svg>'
+      );
+      content: url("data:image/svg+xml,@{svg}");
+    }
   }
 }
 

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.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,15 @@
     .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 {