fixup

rose-pine · Apr 26, 2024 · 156112a · 156112a
1 parent 5b2a905
commit 156112a
Show file tree

Hide file tree

Showing 7 changed files with 90 additions and 90 deletions.
diff --git a/extension.json b/extension.json
@@ -1,6 +1,6 @@
 {
     "name": "Rosé Pine",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "authors": [
         "Kainoa Kanter <[email protected]>"
     ],

diff --git a/src/rose-pine-dawn.scss b/src/rose-pine-dawn.scss
@@ -1,6 +1,6 @@
 :root {
   --schema: "https://zed.dev/schema/themes/v0.1.0.json";
-  --name: "Rosé Pine";
+  --name: "Rosé Pine Dawn";
   --author: "Kainoa Kanter <[email protected]>";
 }
 
@@ -11,8 +11,8 @@ themes {
 
     $foreground-accent: #d7827e;
     $foreground-higher-contrast: #575279;
-    $foreground-high-contrast: #797593;
-    $foreground: #9893a5;
+    $foreground-high-contrast: #9893a5;
+    $foreground: #575279;
     $foreground-low-contrast: #cecacd;
     $foreground-lower-contrast: #dfdad9;
 
@@ -25,7 +25,7 @@ themes {
 
     // UI
     $predictive: #797593;
-    $modified: #ea9d34;
+    $modified: mix($background-low-contrast, #ea9d34, 10%);
     $ignored: #9893a5;
 
     $info: #286983;
@@ -54,7 +54,7 @@ themes {
     // Syntax highlighting
     $syntax1: #ea9d34;
     $syntax2: #b4637a;
-    $syntax3: #d7827e;
+    $syntax3: #797593;
     $syntax4: #575279;
     $syntax5: #907aa9;
     $syntax6: #d7827e;
@@ -83,7 +83,7 @@ themes {
 
       /* Text */
       --text: #{$foreground-high-contrast};
-      --text-muted: #{$foreground};
+      --text-muted: #{$foreground-high-contrast};
       --text-placeholder: #{$foreground-lower-contrast};
       --text-disabled: #{$foreground-lower-contrast};
       --text-accent: #{$foreground-accent};
@@ -179,17 +179,17 @@ themes {
           color: #{$syntax3};
         }
         boolean {
-          color: #{$syntax3};
+          color: #{$syntax6};
         }
         comment {
           color: #{$foreground-low-contrast};
           font-style: italic;
         }
         comment.doc {
-          color: #{$syntax4};
+          color: #{$syntax3};
         }
         constant {
-          color: #{$syntax3};
+          color: #{$syntax4};
         }
         constructor {
           color: #{$syntax2};
@@ -212,28 +212,28 @@ themes {
           color: #{$syntax6};
         }
         hint {
-          color: #{$syntax4};
+          color: #{$syntax5};
         }
         keyword {
-          color: #{$syntax5};
+          color: #{$syntax8};
         }
         label {
           color: #{$syntax6};
         }
         link_text {
-          color: #{$syntax6};
+          color: #{$syntax5};
         }
         link_uri {
-          color: #{$syntax5};
+          color: #{$syntax8};
         }
         number {
           color: #{$syntax7};
         }
         operator {
-          color: #{$syntax8};
+          color: #{$syntax3};
         }
         predictive {
-          color: #{$syntax4};
+          color: #{$syntax3};
         }
         preproc {
           color: #{$syntax1};

diff --git a/src/rose-pine-moon.scss b/src/rose-pine-moon.scss
@@ -1,6 +1,6 @@
 :root {
   --schema: "https://zed.dev/schema/themes/v0.1.0.json";
-  --name: "Rosé Pine";
+  --name: "Rosé Pine Moon";
   --author: "Kainoa Kanter <[email protected]>";
 }
 
@@ -11,8 +11,8 @@ themes {
 
     $foreground-accent: #ea9a97;
     $foreground-higher-contrast: #e0def4;
-    $foreground-high-contrast: #908caa;
-    $foreground: #6e6a86;
+    $foreground-high-contrast: #6e6a86;
+    $foreground: #e0def4;
     $foreground-low-contrast: #56526e;
     $foreground-lower-contrast: #44415a;
 
@@ -25,7 +25,7 @@ themes {
 
     // UI
     $predictive: #908caa;
-    $modified: #f6c177;
+    $modified: mix($background-low-contrast, #f6c177, 10%);
     $ignored: #6e6a86;
 
     $info: #3e8fb0;
@@ -54,7 +54,7 @@ themes {
     // Syntax highlighting
     $syntax1: #f6c177;
     $syntax2: #eb6f92;
-    $syntax3: #ea9a97;
+    $syntax3: #908caa;
     $syntax4: #e0def4;
     $syntax5: #c4a7e7;
     $syntax6: #ea9a97;
@@ -83,7 +83,7 @@ themes {
 
       /* Text */
       --text: #{$foreground-high-contrast};
-      --text-muted: #{$foreground};
+      --text-muted: #{$foreground-high-contrast};
       --text-placeholder: #{$foreground-lower-contrast};
       --text-disabled: #{$foreground-lower-contrast};
       --text-accent: #{$foreground-accent};
@@ -179,17 +179,17 @@ themes {
           color: #{$syntax3};
         }
         boolean {
-          color: #{$syntax3};
+          color: #{$syntax6};
         }
         comment {
           color: #{$foreground-low-contrast};
           font-style: italic;
         }
         comment.doc {
-          color: #{$syntax4};
+          color: #{$syntax3};
         }
         constant {
-          color: #{$syntax3};
+          color: #{$syntax4};
         }
         constructor {
           color: #{$syntax2};
@@ -212,28 +212,28 @@ themes {
           color: #{$syntax6};
         }
         hint {
-          color: #{$syntax4};
+          color: #{$syntax5};
         }
         keyword {
-          color: #{$syntax5};
+          color: #{$syntax8};
         }
         label {
           color: #{$syntax6};
         }
         link_text {
-          color: #{$syntax6};
+          color: #{$syntax5};
         }
         link_uri {
-          color: #{$syntax5};
+          color: #{$syntax8};
         }
         number {
           color: #{$syntax7};
         }
         operator {
-          color: #{$syntax8};
+          color: #{$syntax3};
         }
         predictive {
-          color: #{$syntax4};
+          color: #{$syntax3};
         }
         preproc {
           color: #{$syntax1};

diff --git a/src/rose-pine.scss b/src/rose-pine.scss
@@ -11,8 +11,8 @@ themes {
 
     $foreground-accent: #ebbcba;
     $foreground-higher-contrast: #e0def4;
-    $foreground-high-contrast: #908caa;
-    $foreground: #6e6a86;
+    $foreground-high-contrast: #6e6a86;
+    $foreground: #e0def4;
     $foreground-low-contrast: #524f67;
     $foreground-lower-contrast: #403d52;
 
@@ -25,7 +25,7 @@ themes {
 
     // UI
     $predictive: #908caa;
-    $modified: #f6c177;
+    $modified: mix($background-low-contrast, #f6c177, 10%);
     $ignored: #6e6a86;
 
     $info: #31748f;
@@ -54,7 +54,7 @@ themes {
     // Syntax highlighting
     $syntax1: #f6c177;
     $syntax2: #eb6f92;
-    $syntax3: #ebbcba;
+    $syntax3: #908caa;
     $syntax4: #e0def4;
     $syntax5: #c4a7e7;
     $syntax6: #ebbcba;
@@ -83,7 +83,7 @@ themes {
 
       /* Text */
       --text: #{$foreground-high-contrast};
-      --text-muted: #{$foreground};
+      --text-muted: #{$foreground-high-contrast};
       --text-placeholder: #{$foreground-lower-contrast};
       --text-disabled: #{$foreground-lower-contrast};
       --text-accent: #{$foreground-accent};
@@ -179,17 +179,17 @@ themes {
           color: #{$syntax3};
         }
         boolean {
-          color: #{$syntax3};
+          color: #{$syntax6};
         }
         comment {
           color: #{$foreground-low-contrast};
           font-style: italic;
         }
         comment.doc {
-          color: #{$syntax4};
+          color: #{$syntax3};
         }
         constant {
-          color: #{$syntax3};
+          color: #{$syntax4};
         }
         constructor {
           color: #{$syntax2};
@@ -212,28 +212,28 @@ themes {
           color: #{$syntax6};
         }
         hint {
-          color: #{$syntax4};
+          color: #{$syntax5};
         }
         keyword {
-          color: #{$syntax5};
+          color: #{$syntax8};
         }
         label {
           color: #{$syntax6};
         }
         link_text {
-          color: #{$syntax6};
+          color: #{$syntax5};
         }
         link_uri {
-          color: #{$syntax5};
+          color: #{$syntax8};
         }
         number {
           color: #{$syntax7};
         }
         operator {
-          color: #{$syntax8};
+          color: #{$syntax3};
         }
         predictive {
-          color: #{$syntax4};
+          color: #{$syntax3};
         }
         preproc {
           color: #{$syntax1};

diff --git a/src/template.scss b/src/template.scss
@@ -11,8 +11,8 @@ themes {
 
     $foreground-accent: $rose;
     $foreground-higher-contrast: $text;
-    $foreground-high-contrast: $subtle;
-    $foreground: $muted;
+    $foreground-high-contrast: $muted;
+    $foreground: $text;
     $foreground-low-contrast: $highlightHigh;
     $foreground-lower-contrast: $highlightMed;
 
@@ -25,7 +25,7 @@ themes {
 
     // UI
     $predictive: $subtle;
-    $modified: $gold;
+    $modified: mix($background-low-contrast, $gold, 10%);
     $ignored: $muted;
 
     $info: $pine;
@@ -54,7 +54,7 @@ themes {
     // Syntax highlighting
     $syntax1: $gold;
     $syntax2: $love;
-    $syntax3: $rose;
+    $syntax3: $subtle;
     $syntax4: $text;
     $syntax5: $iris;
     $syntax6: $rose;
@@ -83,7 +83,7 @@ themes {
 
       /* Text */
       --text: #{$foreground-high-contrast};
-      --text-muted: #{$foreground};
+      --text-muted: #{$foreground-high-contrast};
       --text-placeholder: #{$foreground-lower-contrast};
       --text-disabled: #{$foreground-lower-contrast};
       --text-accent: #{$foreground-accent};
@@ -179,17 +179,17 @@ themes {
           color: #{$syntax3};
         }
         boolean {
-          color: #{$syntax3};
+          color: #{$syntax6};
         }
         comment {
           color: #{$foreground-low-contrast};
           font-style: italic;
         }
         comment.doc {
-          color: #{$syntax4};
+          color: #{$syntax3};
         }
         constant {
-          color: #{$syntax3};
+          color: #{$syntax4};
         }
         constructor {
           color: #{$syntax2};
@@ -212,28 +212,28 @@ themes {
           color: #{$syntax6};
         }
         hint {
-          color: #{$syntax4};
+          color: #{$syntax5};
         }
         keyword {
-          color: #{$syntax5};
+          color: #{$syntax8};
         }
         label {
           color: #{$syntax6};
         }
         link_text {
-          color: #{$syntax6};
+          color: #{$syntax5};
         }
         link_uri {
-          color: #{$syntax5};
+          color: #{$syntax8};
         }
         number {
           color: #{$syntax7};
         }
         operator {
-          color: #{$syntax8};
+          color: #{$syntax3};
         }
         predictive {
-          color: #{$syntax4};
+          color: #{$syntax3};
         }
         preproc {
           color: #{$syntax1};