Merge branch 'main' into fix/twitter

catppuccin · Apr 5, 2024 · 9ad10a0 · 9ad10a0
2 parents 0a43f83 + f360f80
commit 9ad10a0
Show file tree

Hide file tree

Showing 12 changed files with 469 additions and 44 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -69,5 +69,5 @@
 /styles/whatsapp-web @FrancoRav
 /styles/wikipedia @GitMuslim
 /styles/wikiwand @tnixc
-/styles/youtube @isabelroses
+/styles/youtube @isabelroses @uncenter
 /styles/nextjs @Dandraghas
diff --git a/.stylelintrc.js b/.stylelintrc.js
@@ -24,6 +24,7 @@ export default {
     "alpha-value-notation": null,
     "color-function-notation": null,
     "hue-degree-notation": null,
+    "keyframes-name-pattern": null,
 
     // Needed for Stylus v1.5.35 workaround, see #341
     "media-feature-range-notation": "prefix",

diff --git a/scripts/userstyles.yml b/scripts/userstyles.yml
@@ -791,7 +791,7 @@ userstyles:
       faq:
         - question: "**What does the 'Enable for black bars' option mean?**"
           answer: "It's available in case you have an OLED display. If you have one, you might want to enable this."
-      current-maintainers: [*isabelroses]
+      current-maintainers: [*isabelroses, *uncenter]
       past-maintainers: [*elkrien]
   nextjs:
     name: Next.js

diff --git 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.6
+@version 0.2.7
 @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
@@ -84,7 +84,7 @@
     --ctp-surface2: #rgbify(@surface2) [];
     --ctp-surface1: #rgbify(@surface1) [];
     --ctp-surface0: #rgbify(@surface0) [];
-    --ctp-base: #rgbify(@crust) [];
+    --ctp-base: #rgbify(@base) [];
     --ctp-mantle: #rgbify(@mantle) [];
     --ctp-crust: #rgbify(@crust) [];
 

diff --git 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.4
+@version 0.1.5
 @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
@@ -167,6 +167,24 @@
       .metabar:not(.is-stuck) {
       background-color: @base !important;
     }
+
+    /* lyrics box */
+    .js-lyrics-module {
+      color: @subtext1 !important;
+    }
+    .module--lyrics__subtitle-box {
+      border-color: @surface2;
+    }
+    .module__inner-toggle--chevron {
+      color: @accent-color !important;
+      background-color: @surface1 !important;
+      border-color: @surface2;
+    }
+    .module__inner-toggle::before,
+    .module__inner-toggle::after {
+      background-color: @surface2 !important;
+    }
+
     // translation boxes
     .module--translations .dropdown--translation-select,
     .module--translations-translatedtext {
@@ -726,9 +744,6 @@
       color: @accent-color !important;
     }
 
-    .js-region-filter-switch {
-      background-color: @overlay0 !important;
-    }
     .switch__knob {
       background: @text !important;
     }

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.4
+@version      1.6.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
@@ -355,7 +355,7 @@
     --fgColor-default: @text;
     --fgColor-muted: @subtext1;
     --fgColor-onEmphasis: @base;
-    --fgColor-white: @text;
+    --fgColor-white: @base;
     --fgColor-disabled: @surface2;
     --fgColor-link: @accent-color;
     --fgColor-neutral: #6e7681;
@@ -533,6 +533,116 @@
     .header-search-button.placeholder {
       color: @subtext0;
     }
+
+    ::selection {
+      background-color: fade(@accent-color, 20%);
+    }
+  }
+}
+
+@-moz-document url-prefix("https://viewscreen.githubusercontent.com/markdown/mermaid")
+{
+  [data-color-mode="auto"] {
+    @media (prefers-color-scheme: light) {
+      &[data-light-theme="light"] {
+        #catppuccin(@lightFlavor, @accentColor);
+      }
+      &[data-light-theme="dark"] {
+        #catppuccin(@darkFlavor, @accentColor);
+      }
+    }
+
+    @media (prefers-color-scheme: dark) {
+      &[data-dark-theme="light"] {
+        #catppuccin(@lightFlavor, @accentColor);
+      }
+      &[data-dark-theme="dark"] {
+        #catppuccin(@darkFlavor, @accentColor);
+      }
+    }
+  }
+  [data-color-mode="light"][data-light-theme="dark"],
+  [data-color-mode="dark"][data-dark-theme="dark"] {
+    #catppuccin(@darkFlavor, @accentColor);
+  }
+  [data-color-mode="light"][data-light-theme="light"],
+  [data-color-mode="dark"][data-dark-theme="light"] {
+    #catppuccin(@lightFlavor, @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];
+
+    background-color: @base;
+
+    --color-btn-text: @text;
+    --color-btn-bg: @surface0;
+    --color-btn-border: @surface1;
+    --color-btn-hover-bg: @surface1;
+    --color-btn-hover-border: @surface2;
+    --color-btn-active-bg: @surface2;
+    --color-btn-selected-bg: @surface2;
+    --color-btn-counter-bg: @surface2;
+    --color-btn-outline-text: @accent-color;
+    --color-fg-muted: @subtext1;
+
+    #diagram {
+      .node rect,
+      .node circle,
+      .node ellipse,
+      .node polygon,
+      .node path {
+        fill: fade(@accent-color, 10%);
+        stroke: @accent-color;
+      }
+
+      .label text,
+      span,
+      p {
+        fill: @text;
+        color: @text;
+      }
+
+      .flowchart-link,
+      .marker {
+        stroke: @subtext0;
+        fill: @subtext0;
+      }
+
+      .edgeLabel {
+        background-color: @crust;
+      }
+    }
+
+    .octicon {
+      fill: var(--color-fg-muted) !important;
+    }
   }
 }