From 156112a911dc814133bdb9528ee18b7f55705770 Mon Sep 17 00:00:00 2001 From: ThatOneCalculator Date: Thu, 25 Apr 2024 18:30:56 -0700 Subject: [PATCH] fixup --- extension.json | 2 +- src/rose-pine-dawn.scss | 30 +++++++++++++++--------------- src/rose-pine-moon.scss | 30 +++++++++++++++--------------- src/rose-pine.scss | 28 ++++++++++++++-------------- src/template.scss | 28 ++++++++++++++-------------- themes/rose-pine-dawn.json | 32 ++++++++++++++++---------------- themes/rose-pine.json | 30 +++++++++++++++--------------- 7 files changed, 90 insertions(+), 90 deletions(-) diff --git a/extension.json b/extension.json index f6c4a78..f3271c3 100644 --- a/extension.json +++ b/extension.json @@ -1,6 +1,6 @@ { "name": "Rosé Pine", - "version": "1.0.1", + "version": "1.0.2", "authors": [ "Kainoa Kanter " ], diff --git a/src/rose-pine-dawn.scss b/src/rose-pine-dawn.scss index 444bfd8..0248d59 100644 --- 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 "; } @@ -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 index 0a79007..63b0fc2 100644 --- 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 "; } @@ -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 index 572ea92..411d61a 100644 --- 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 index 86f07d9..5fa30c2 100644 --- 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}; diff --git a/themes/rose-pine-dawn.json b/themes/rose-pine-dawn.json index a37139c..99f585a 100644 --- a/themes/rose-pine-dawn.json +++ b/themes/rose-pine-dawn.json @@ -3,19 +3,19 @@ "\"UTF.8\"": true }, "$schema": "https://zed.dev/schema/themes/v0.1.0.json", - "name": "Rosé Pine", + "name": "Rosé Pine Dawn", "author": "Kainoa Kanter ", "themes": [ { "appearance": "light", "name": "Rosé Pine Dawn", "style": { - "editor.foreground": "#9893a5", + "editor.foreground": "#575279", "editor.background": "#faf4ed", "editor.gutter.background": "#faf4ed", "editor.active_line.background": "#fffaf3", "editor.line_number": "#dfdad9", - "editor.active_line_number": "#9893a5", + "editor.active_line_number": "#575279", "editor.invisible": "#dfdad9", "editor.wrap_guide": "#dfdad9", "editor.active_wrap_guide": "#dfdad9", @@ -25,7 +25,7 @@ "border.selected": "#faf4ed", "border.transparent": "#faf4ed", "border.disabled": "#faf4ed", - "text": "#797593", + "text": "#9893a5", "text.muted": "#9893a5", "text.placeholder": "#dfdad9", "text.disabled": "#dfdad9", @@ -47,7 +47,7 @@ "element.selected": "#f2e9e1", "element.disabled": "#f2e9e1", "predictive": "#797593", - "modified": "#ea9d34", + "modified": "#eca647", "ignored": "#9893a5", "deleted": "#b4637a", "created": "#56949f", @@ -58,7 +58,7 @@ "error.background": "#f0dcdb", "error.border": "#b4637a", "info": "#286983", - "scrollbar.thumb.background": "#9893a544", + "scrollbar.thumb.background": "#57527944", "scrollbar.thumb.border": "transparent", "scrollbar.track.background": "transparent", "terminal.background": "#faf4ed", @@ -99,7 +99,7 @@ ], "syntax": { "attribute": { - "color": "#d7827e" + "color": "#797593" }, "boolean": { "color": "#d7827e" @@ -109,10 +109,10 @@ "font_style": "italic" }, "comment.doc": { - "color": "#575279" + "color": "#797593" }, "constant": { - "color": "#d7827e" + "color": "#575279" }, "constructor": { "color": "#b4637a" @@ -135,28 +135,28 @@ "color": "#d7827e" }, "hint": { - "color": "#575279" + "color": "#907aa9" }, "keyword": { - "color": "#907aa9" + "color": "#286983" }, "label": { "color": "#d7827e" }, "link_text": { - "color": "#d7827e" + "color": "#907aa9" }, "link_uri": { - "color": "#907aa9" + "color": "#286983" }, "number": { "color": "#56949f" }, "operator": { - "color": "#286983" + "color": "#797593" }, "predictive": { - "color": "#575279" + "color": "#797593" }, "preproc": { "color": "#ea9d34" @@ -171,7 +171,7 @@ "color": "#56949f" }, "punctuation.bracket": { - "color": "#d7827e" + "color": "#797593" }, "punctuation.delimiter": { "color": "#56949f" diff --git a/themes/rose-pine.json b/themes/rose-pine.json index 6911d3d..d0d84a9 100644 --- a/themes/rose-pine.json +++ b/themes/rose-pine.json @@ -10,12 +10,12 @@ "appearance": "dark", "name": "Rosé Pine", "style": { - "editor.foreground": "#6e6a86", + "editor.foreground": "#e0def4", "editor.background": "#191724", "editor.gutter.background": "#191724", "editor.active_line.background": "#1f1d2e", "editor.line_number": "#403d52", - "editor.active_line_number": "#6e6a86", + "editor.active_line_number": "#e0def4", "editor.invisible": "#403d52", "editor.wrap_guide": "#403d52", "editor.active_wrap_guide": "#403d52", @@ -25,7 +25,7 @@ "border.selected": "#191724", "border.transparent": "#191724", "border.disabled": "#191724", - "text": "#908caa", + "text": "#6e6a86", "text.muted": "#6e6a86", "text.placeholder": "#403d52", "text.disabled": "#403d52", @@ -47,7 +47,7 @@ "element.selected": "#26233a", "element.disabled": "#26233a", "predictive": "#908caa", - "modified": "#f6c177", + "modified": "#e1b170", "ignored": "#6e6a86", "deleted": "#eb6f92", "created": "#9ccfd8", @@ -58,7 +58,7 @@ "error.background": "#482d42", "error.border": "#eb6f92", "info": "#31748f", - "scrollbar.thumb.background": "#6e6a8644", + "scrollbar.thumb.background": "#e0def444", "scrollbar.thumb.border": "transparent", "scrollbar.track.background": "transparent", "terminal.background": "#191724", @@ -99,7 +99,7 @@ ], "syntax": { "attribute": { - "color": "#ebbcba" + "color": "#908caa" }, "boolean": { "color": "#ebbcba" @@ -109,10 +109,10 @@ "font_style": "italic" }, "comment.doc": { - "color": "#e0def4" + "color": "#908caa" }, "constant": { - "color": "#ebbcba" + "color": "#e0def4" }, "constructor": { "color": "#eb6f92" @@ -135,28 +135,28 @@ "color": "#ebbcba" }, "hint": { - "color": "#e0def4" + "color": "#c4a7e7" }, "keyword": { - "color": "#c4a7e7" + "color": "#31748f" }, "label": { "color": "#ebbcba" }, "link_text": { - "color": "#ebbcba" + "color": "#c4a7e7" }, "link_uri": { - "color": "#c4a7e7" + "color": "#31748f" }, "number": { "color": "#9ccfd8" }, "operator": { - "color": "#31748f" + "color": "#908caa" }, "predictive": { - "color": "#e0def4" + "color": "#908caa" }, "preproc": { "color": "#f6c177" @@ -171,7 +171,7 @@ "color": "#9ccfd8" }, "punctuation.bracket": { - "color": "#ebbcba" + "color": "#908caa" }, "punctuation.delimiter": { "color": "#9ccfd8"