Merge pull request #2 from delameter/dev

1.1.0
delameter · Mar 16, 2023 · 79ba320 · 79ba320
2 parents ffa9cfd + e4e6488
commit 79ba320
Show file tree

Hide file tree

Showing 7 changed files with 315 additions and 57 deletions.
diff --git a/SUMMARY.rst b/SUMMARY.rst
diff --git a/Solid-Cherry.scheme.xml b/Solid-Cherry.scheme.xml
diff --git a/palette.json b/palette.json
@@ -12,15 +12,15 @@
     "solid_3": "#0f1011",
     "solid_4": "#131518",
     "solid_5": "#212325",
-    "solid_6": "#292A2B",
+    "solid_6": "#292a2b",
     "solid_7": "#2f3132",
     "solid_8": "#313233",
     "label_1": "#4d4e4e",
     "label_2": "#636265",
-    "label_3": "#7E8185",
+    "label_3": "#7e8185",
     "label_4": "#abb2bf",
     "label_5": "#cfd2d5",
     "label_6": "#d7dae0",
     "label_7": "#eef3ff",
-    "label_8": "#fdfdfd",
+    "label_8": "#fdfdfd"
 }
diff --git a/palette.yml b/palette.yml
@@ -0,0 +1,24 @@
+cherry_1: '#231515'
+cherry_2: '#2c1d1f'
+cherry_3: '#3d1c1f'
+cherry_4: '#4c2526'
+cherry_5: '#6e2a2c'
+cherry_6: '#9f3334'
+cherry_7: '#b73838'
+cherry_8: '#e64252'
+solid_1: '#010102'
+solid_2: '#060709'
+solid_3: '#0f1011'
+solid_4: '#131518'
+solid_5: '#212325'
+solid_6: '#292a2b'
+solid_7: '#2f3132'
+solid_8: '#313233'
+label_1: '#4d4e4e'
+label_2: '#636265'
+label_3: '#7e8185'
+label_4: '#abb2bf'
+label_5: '#cfd2d5'
+label_6: '#d7dae0'
+label_7: '#eef3ff'
+label_8: '#fdfdfd'
diff --git a/picking.rst b/picking.rst
diff --git a/src/META-INF/plugin.xml b/src/META-INF/plugin.xml
@@ -1,7 +1,7 @@
 <idea-plugin>
   <id>link.dlup.solidCherryTheme</id>
   <name>Solid Cherry Theme</name>
-  <version>1.0.6</version>
+  <version>1.1.0</version>
   <vendor email="0.delameter@gmail.com">Aleksandr Shavykin</vendor>
 
   <description><![CDATA[
@@ -15,10 +15,19 @@
         <li>Go to <i>Settings (Preferences) -> Plugins</i>, find the theme plugin and install it</li>
         <li>Restart IDE</li>
         <li>Go to <i>Settings (Preferences) -> Appearance & Behavior -> Appearance</i> and see the <i>Theme</i> dropdown</li>
+        <li>
+          <i>(optional)</i> Go to <i>Settings → Editor → Color Scheme</i> and select <b>Solid Cherry</b> in <i>Scheme</i>
+          dropdown, which will correct several editor colors (e.g., git diff backgrounds) to the ones better matching
+          the theme <i>(should be done automatically, but just in case)</i>
+        </li>
     </ul>
     ]]></description>
 
   <change-notes><![CDATA[
+    <h2>1.1.0</h2>
+    <ul>
+      <li>🌱 NEW: add colors for editor popup backgrounds and semantic highlighting defaults.
+    </ul>
     <h2>1.0.6</h2>
     <ul>
       <li>🐞 FIX: console bg set to transparent (=default bg)</li>

diff --git a/src/Solid_Cherry.iml b/src/Solid_Cherry.iml
@@ -1,27 +1,30 @@
 <scheme name="Solid Cherry" version="142" parent_scheme="Darcula">
   <metaInfo>
     <property name="created">2023-03-10T18:30:48</property>
-    <property name="ide">PhpStorm</property>
+    <property name="ide">Python</property>
     <property name="ideVersion">2022.3.2.0.0</property>
-    <property name="modified">2023-03-11T03:27:04</property>
+    <property name="modified">2023-03-16T12:35:52</property>
     <property name="originalScheme">Solid Cherry</property>
   </metaInfo>
   <colors>
     <option name="ADDED_LINES_COLOR" value="27362a" />
-    <option name="CARET_COLOR" value="f7f7f7" />
-    <option name="CARET_ROW_COLOR" value="323234" />
+    <option name="CARET_COLOR" value="fdfdfd" />
+    <option name="CARET_ROW_COLOR" value="313233" />
     <option name="CONSOLE_BACKGROUND_KEY" value="" />
     <option name="DELETED_LINES_COLOR" value="545353" />
     <option name="DIFF_SEPARATOR_WAVE" value="313233" />
+    <option name="DOCUMENTATION_COLOR" value="131518" />
     <option name="GUTTER_BACKGROUND" value="131518" />
+    <option name="HINT_BORDER" value="2f3132" />
     <option name="IGNORED_ADDED_LINES_BORDER_COLOR" value="29442d" />
     <option name="IGNORED_DELETED_LINES_BORDER_COLOR" value="696767" />
     <option name="IGNORED_MODIFIED_LINES_BORDER_COLOR" value="293b4b" />
-    <option name="INDENT_GUIDE" value="2c2c2d" />
+    <option name="INDENT_GUIDE" value="292a2b" />
     <option name="INFORMATION_HINT" value="0f1011" />
+    <option name="LOOKUP_COLOR" value="131518" />
     <option name="METHOD_SEPARATORS_COLOR" value="2c2c33" />
     <option name="MODIFIED_LINES_COLOR" value="27333e" />
-    <option name="READONLY_BACKGROUND" value="171717" />
+    <option name="READONLY_BACKGROUND" value="1f1b18" />
     <option name="RIGHT_MARGIN_COLOR" value="2c2c2d" />
     <option name="SELECTED_INDENT_GUIDE" value="313132" />
     <option name="SELECTED_TEARLINE_COLOR" value="5e6063" />
@@ -38,6 +41,11 @@
     <option name="WHITESPACES_MODIFIED_LINES_COLOR" value="303030" />
   </colors>
   <attributes>
+    <option name="CODE_LENS_BORDER_COLOR">
+      <value>
+        <option name="EFFECT_COLOR" value="7e8185" />
+      </value>
+    </option>
     <option name="DIFF_CONFLICT">
       <value>
         <option name="FOREGROUND" value="2c2c22" />
@@ -83,11 +91,35 @@
         <option name="FOREGROUND" value="45452b" />
       </value>
     </option>
+    <option name="RAINBOW_COLOR0">
+      <value>
+        <option name="FOREGROUND" value="b9fdff" />
+      </value>
+    </option>
+    <option name="RAINBOW_COLOR1">
+      <value>
+        <option name="FOREGROUND" value="b9eaff" />
+      </value>
+    </option>
+    <option name="RAINBOW_COLOR2">
+      <value>
+        <option name="FOREGROUND" value="b9e0ff" />
+      </value>
+    </option>
+    <option name="RAINBOW_COLOR3">
+      <value>
+        <option name="FOREGROUND" value="b9c5ff" />
+      </value>
+    </option>
+    <option name="RAINBOW_COLOR4">
+      <value>
+        <option name="FOREGROUND" value="beb9ff" />
+      </value>
+    </option>
     <option name="TEXT">
       <value>
         <option name="FOREGROUND" value="cfd2d5" />
         <option name="BACKGROUND" value="0f1011" />
-        <option name="EFFECT_TYPE" value="5" />
       </value>
     </option>
   </attributes>