Revise UI colors, fix compatibility with Gateway

samdark · Jul 1, 2023 · ca4b02b · ca4b02b
1 parent 51f14ce
commit ca4b02b
Show file tree

Hide file tree

Showing 5 changed files with 84 additions and 59 deletions.
diff --git a/phpstorm.png b/phpstorm.png
diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml
@@ -1,14 +1,21 @@
 <idea-plugin>
   <id>com.samdark.intellij-visual-studio-code-dark-plus</id>
   <name>Visual Studio Code Dark Plus Theme</name>
-  <version>2.7</version>
+  <version>2.8</version>
   <vendor email="sam@rmcreative.ru" url="https://rmcreative.ru">Alexander Makarov</vendor>
 
   <description><![CDATA[
       A dark theme for JetBrains IDEs inspired by default Visual Studio Code "Dark Plus" theme
     ]]></description>
 
   <change-notes><![CDATA[
+    <b>2.8</b>
+
+    <ul>
+      <li>Revise UI colors.</li>
+      <li>Fix compatibility with Gateway.</li>
+    </ul>
+
     <b>2.7</b>
 
     <ul>
@@ -124,5 +131,5 @@
     <!-- Add your actions here -->
   </actions>
 
-  <depends>com.intellij.modules.lang</depends>
+  <depends>com.intellij.modules.platform</depends>
 </idea-plugin>
diff --git a/resources/visual_studio_code_dark_plus.theme.json b/resources/visual_studio_code_dark_plus.theme.json
@@ -3,70 +3,88 @@
   "dark": true,
   "author": "Alexander Makarov",
   "editorScheme": "/visual_studio_code_dark_plus.xml",
+  "colors": {
+    "background": "#252526",
+    "editor": "#1e1e1e",
+    "inactiveTab": "#2d2d2d",
+    "selection": "#094770",
+    "text": "#c2c2c2",
+    "selectedText": "#ffffff",
+    "inactiveSelection": "#2a2d2e",
+    "accent": "#4a88c7",
+    "menuBorder": "#454545"
+  },
   "ui": {
     "*": {
-      "background": "#323232"
+      "foreground": "text",
+      "background": "background",
+      "selectionBackground": "selection",
+      "selectionForeground": "selectedText",
+      "separatorColor": "menuBorder",
+      "arc": 8
+    },
+    "MainToolbar": {
+      "background": "background"
+    },
+    "Editor": {
+      "background": "editor"
     },
     "Borders": {
-      "color": "#323232",
-      "ContrastBorderColor": "#323232"
+      "color": "background",
+      "ContrastBorderColor": "background"
+    },
+    "DefaultTabs": {
+      "background": "inactiveTab",
+      "hoverBackground": "inactiveTab",
+      "borderColor": "background"
     },
     "EditorTabs": {
-      "selectedBackground": "#1d1d1d",
-      "underlinedTabBackground": "#2080f0",
-      "selectedForeground": "#e6e6e6",
-      "inactiveMaskColor": "#2c2c2c",
-      "inactiveColoredFileBackground": "#2c2c2c",
       "underlineHeight": 3,
-      "borderColor": "#323232"
+      "inactiveUnderlineColor": "accent",
+      "underlineColor": "accent",
+      "underlinedTabBackground": "editor",
+      "underlinedTabForeground": "selectedText",
+
+      "selectedBackground": "inactiveTab"
     },
     "Panel" : {
-      "foreground": "#acacac",
-      "background": "#323232"
+      "foreground": "#acacac"
     },
     "Tree": {
-      "background": "#242425",
-      "foreground": "#c7c7c7",
-      "selectionBackground": "#094770",
-      "selectionForeground": "#f8fafb"
+      "modifiedItemForeground": "accent",
+      "selectionInactiveBackground": "inactiveSelection",
+      "Selection.arc": 0
     },
     "Menu": {
-      "background": "#323232",
-      "foreground": "#cbcbc2",
-      "borderColor": "#141414",
-      "separatorColor": "#606060"
+      "borderColor": "menuBorder"
+    },
+    "Popup": {
+      "borderColor": "menuBorder"
     },
     "PopupMenuSeparator": {
       "height": 13,
       "stripeIndent": 6,
       "stripeWidth": 1
     },
     "MenuBar": {
-      "borderColor": "#323232"
-    },
-    "MenuItem": {
-      "background": "#242425",
-      "foreground": "#cbcbc2",
-      "selectionBackground": "#094770"
+      "borderColor": "background"
     },
     "NavBar": {
       "borderColor": "#323232"
     },
-    "CompletionPopup": {
-      "background": "#242425",
-      "foreground": "#cecece"
-    },
     "Button": {
       "arc": 2
     },
     "StatusBar": {
-      "borderColor": "#323232"
+      "borderColor": "background"
     },
     "ToolWindow": {
       "Header": {
-        "borderColor": "#323232",
-        "background": "#323232",
-        "inactiveBackground": "#323232"
+        "borderColor": "background",
+        "inactiveBackground": "background"
+      },
+      "Button": {
+        "hoverBackground": "inactiveSelection"
       }
     }
   }

diff --git a/resources/visual_studio_code_dark_plus.xml b/resources/visual_studio_code_dark_plus.xml
@@ -10,26 +10,26 @@
     <option name="CARET_COLOR" value="adaeac" />
     <option name="CARET_ROW_COLOR" value="262626" />
     <option name="CONSOLE_BACKGROUND_KEY" value="1d1d1d" />
+    <option name="DOCUMENTATION_COLOR" value="242425" />
     <option name="GUTTER_BACKGROUND" value="1d1d1d" />
     <option name="INDENT_GUIDE" value="3b3b3b" />
+    <option name="LINE_NUMBERS_COLOR" value="848484" />
+    <option name="LOOKUP_COLOR" value="242425" />
     <option name="RIGHT_MARGIN_COLOR" value="3b3b3b" />
     <option name="SELECTION_BACKGROUND" value="264e77" />
-    <option name="LINE_NUMBERS_COLOR" value="848484" />
+    <option name="ScrollBar.Mac.hoverThumbBorderColor" value="4e4e4e" />
+    <option name="ScrollBar.Mac.hoverThumbColor" value="4e4e4e" />
+    <option name="ScrollBar.Mac.hoverTrackColor" value="1d1d1d" />
+    <option name="ScrollBar.Mac.thumbBorderColor" value="414141" />
+    <option name="ScrollBar.Mac.thumbColor" value="414141" />
+    <option name="ScrollBar.Mac.trackColor" value="1d1d1d" />
+    <option name="ScrollBar.Transparent.hoverThumbBorderColor" value="4e4e4e" />
+    <option name="ScrollBar.Transparent.hoverThumbColor" value="4e4e4e" />
+    <option name="ScrollBar.Transparent.hoverTrackColor" value="1d1d1d" />
+    <option name="ScrollBar.Transparent.thumbBorderColor" value="414141" />
+    <option name="ScrollBar.Transparent.thumbColor" value="414141" />
+    <option name="ScrollBar.Transparent.trackColor" value="1d1d1d" />
     <option name="VISUAL_INDENT_GUIDE" value="3b3b3b" />
-
-    <option name="ScrollBar.Mac.trackColor" value="1d1d1d"/>
-    <option name="ScrollBar.Mac.thumbColor" value="414141"/>
-    <option name="ScrollBar.Mac.thumbBorderColor" value="414141"/>
-    <option name="ScrollBar.Mac.hoverTrackColor" value="1d1d1d"/>
-    <option name="ScrollBar.Mac.hoverThumbColor" value="4e4e4e"/>
-    <option name="ScrollBar.Mac.hoverThumbBorderColor" value="4e4e4e"/>
-
-    <option name="ScrollBar.Transparent.trackColor" value="1d1d1d"/>
-    <option name="ScrollBar.Transparent.thumbColor" value="414141"/>
-    <option name="ScrollBar.Transparent.thumbBorderColor" value="414141"/>
-    <option name="ScrollBar.Transparent.hoverTrackColor" value="1d1d1d"/>
-    <option name="ScrollBar.Transparent.hoverThumbColor" value="4e4e4e"/>
-    <option name="ScrollBar.Transparent.hoverThumbBorderColor" value="4e4e4e"/>
   </colors>
   <attributes>
     <option name="ANNOTATION_ATTRIBUTE_NAME_ATTRIBUTES">
@@ -495,7 +495,7 @@
     <option name="IDENTIFIER_UNDER_CARET_ATTRIBUTES">
       <value>
         <option name="BACKGROUND" value="33393f" />
-        <option name="ERROR_STRIPE_COLOR" value="A0A0A0" />
+        <option name="ERROR_STRIPE_COLOR" value="a0a0a0" />
         <option name="EFFECT_TYPE" value="1" />
       </value>
     </option>
@@ -759,7 +759,7 @@
     <option name="PROPERTIES.KEY" baseAttributes="DEFAULT_KEYWORD" />
     <option name="PROPERTIES.KEY_VALUE_SEPARATOR" baseAttributes="DEFAULT_OPERATION_SIGN" />
     <option name="PROPERTIES.VALID_STRING_ESCAPE" baseAttributes="DEFAULT_VALID_STRING_ESCAPE" />
-     <option name="PY.BUILTIN_NAME">
+    <option name="PY.BUILTIN_NAME">
       <value>
         <option name="FOREGROUND" value="39c8b0" />
       </value>
@@ -798,6 +798,12 @@
         <option name="FONT_TYPE" value="1" />
       </value>
     </option>
+    <option name="ReSharper.ASP_NET_RAZOR_CODE_BLOCK">
+      <value>
+        <option name="BACKGROUND" value="1e1e1e" />
+        <option name="EFFECT_TYPE" value="5" />
+      </value>
+    </option>
     <option name="SEARCH_RESULT_ATTRIBUTES">
       <value>
         <option name="FOREGROUND" value="dcdcaa" />
@@ -894,11 +900,5 @@
     </option>
     <option name="XPATH.KEYWORD" baseAttributes="DEFAULT_KEYWORD" />
     <option name="XPATH.XPATH_VARIABLE" baseAttributes="DEFAULT_LOCAL_VARIABLE" />
-    <option name="ReSharper.ASP_NET_RAZOR_CODE_BLOCK">
-      <value>
-        <option name="BACKGROUND" value="1e1e1e" />
-        <option name="EFFECT_TYPE" value="5" />
-      </value>
-    </option>
   </attributes>
-</scheme>
+</scheme>
diff --git a/screenshot.png b/screenshot.png