From e249941d92a4c50bfe5cef1328c86b4aeab52492 Mon Sep 17 00:00:00 2001 From: Gary Lo Date: Mon, 17 Dec 2018 01:40:49 +0800 Subject: [PATCH] Fix #6 * Add Ruby Support * Fix parent theme is not Darcula causing not supported language always not work * Fix CoffeeScript, Cucumber, HarsiCorp color * [Experimental] Using explicit naming `GapStyle 2.1` to fix color scheme not updating --- intellij_androidstudio/GapStyle.jar | Bin 8912 -> 0 bytes .../GapStyle/META-INF/plugin.xml | 38 +- .../GapStyle/colors/GapStyle.xml | 370 ++++++++++++++---- intellij_androidstudio/GapStyle2.1.jar | Bin 0 -> 8921 bytes 4 files changed, 324 insertions(+), 84 deletions(-) delete mode 100644 intellij_androidstudio/GapStyle.jar create mode 100644 intellij_androidstudio/GapStyle2.1.jar diff --git a/intellij_androidstudio/GapStyle.jar b/intellij_androidstudio/GapStyle.jar deleted file mode 100644 index 55ee1adb85a7779a63703e8618746f777bc92f40..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8912 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 diff --git a/intellij_androidstudio/GapStyle/META-INF/plugin.xml b/intellij_androidstudio/GapStyle/META-INF/plugin.xml index 5bb7d8d..d8b0a12 100755 --- a/intellij_androidstudio/GapStyle/META-INF/plugin.xml +++ b/intellij_androidstudio/GapStyle/META-INF/plugin.xml @@ -1,24 +1,34 @@ color.scheme.GapStyle GapStyle Color Scheme - 2.0 + 2.1 Gary Lo - - <p>GapStyle is designed base on key theme color of 'Darcula' and 'Monokai'.</p> - <p>GapStyle is a productivity-oriented color scheme with a list of supported languages.</p> - <p>Each supported language is tailor made and carefully tuned with rationale.</p> - <ul> - <li><b>Objective 1:</b> Optimize languages' color schemes to boost productivity on reading/writing code (Especially the language your are not familiar)</li> - <li><b>Objective 2:</b> Quickly learn similar syntax with a universal designed color across different languages. </li> - <li><b>Supported Languages:</b> Kotlin, Java, Swift, Scala, Javascript, Go, Python, Android Logcat, Android Native (C / C++), SQL, HTML, CSS, PHP</li> - </ul> - + GapStyle is designed base on key theme color of 'Darcula' and 'Monokai'.

+

GapStyle is a productivity-oriented color scheme with a list of supported languages.

+

Each supported language is tailor made and carefully tuned with rationale.

+
    +
  • Objective 1: Optimize languages' color schemes to boost productivity on reading/writing code (Especially the language your are not familiar)
  • +
  • Objective 2: Quickly learn similar syntax with a universal designed color across different languages.
  • +
  • Supported Languages: Kotlin, Java, Swift, Scala, Javascript, Go, Python, Android Logcat, Android Native (C / C++), SQL, HTML, CSS, PHP
  • +
+ ]]>
2.1 +
    +
  • Add Ruby Support
  • +
  • Fix parent theme is not Darcula causing not supported language always not work
  • +
  • Fix CoffeeScript, Cucumber, HarsiCorp color
  • +
  • [Experimental] Using explicit naming `GapStyle 2.1` to fix color scheme not updating
  • +
+

2.0

+
    +
  • Completely remove color inheritance for better compatibility.
  • +
  • Fix HTML & Java & Kotlin keyword color is damaged by color inheritance.
  • +
  • Kotlin Smart cast styling enhancement.
  • +
]]>
diff --git a/intellij_androidstudio/GapStyle/colors/GapStyle.xml b/intellij_androidstudio/GapStyle/colors/GapStyle.xml index 53b133b..fb24978 100755 --- a/intellij_androidstudio/GapStyle/colors/GapStyle.xml +++ b/intellij_androidstudio/GapStyle/colors/GapStyle.xml @@ -1,10 +1,9 @@ - + 2018-10-15T04:33:26 idea - 2018.2.4.0.0 - 2018-10-15T04:33:51 - GapStyle + 2018.3.1.0.0 + 2018-12-17T01:03:41