diff --git a/build.gradle b/build.gradle index 8e5c7dd07..4f6ae4d28 100644 --- a/build.gradle +++ b/build.gradle @@ -81,13 +81,13 @@ jacocoTestReport { intellij { pluginName 'Material Theme' - version ideaVersion + version '172.4155.24' type 'IU' downloadSources false sameSinceUntilBuild true alternativeIdePath idePath updateSinceUntilBuild = false - plugins = ['com.jetbrains.php:172.3317.83', 'yaml','properties', 'CSS', 'JavaScriptLanguage', 'com.jetbrains.twig:172' + + plugins = ['com.jetbrains.php:172.4155.25', 'yaml','properties', 'CSS', 'JavaScriptLanguage', 'com.jetbrains.twig:172' + '.2827.17', 'Pythonid:2017.2.172.3317.93'] // systemProperty "idea.platform.prefix","DataGrip" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 226c0cda0..c77d3908a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,4 +1,4 @@ -#Thu Aug 31 09:19:22 IDT 2017 +#Wed Sep 06 11:32:34 IDT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/java/com/chrisrm/idea/themes/MonokaiTheme.java b/src/main/java/com/chrisrm/idea/themes/MonokaiTheme.java index 7c669efac..e8a2968da 100644 --- a/src/main/java/com/chrisrm/idea/themes/MonokaiTheme.java +++ b/src/main/java/com/chrisrm/idea/themes/MonokaiTheme.java @@ -174,7 +174,9 @@ protected String[] getSecondBorderResources() { protected String[] getTableSelectedResources() { return new String[] { "Table.selectionBackground", - "Button.mt.background", + "Button.darcula.selection.color1", + "Button.darcula.selection.color2", + "Button.mt.selection.color1", "MemoryIndicator.unusedColor" }; } @@ -207,8 +209,6 @@ protected String[] getSecondaryBackgroundResources() { "TextArea.selectionForeground", "Button.darcula.selection.color1", "Button.darcula.selection.color2", - "Button.mt.color1", - "Button.mt.selection.color1", "List.background", "material.disabled" }; @@ -223,7 +223,8 @@ protected String[] getCaretResources() { @Override protected String[] getInactiveResources() { return new String[] { - + "Button.mt.background", + "Button.mt.color1", }; } diff --git a/src/main/java/com/chrisrm/idea/themes/OneDarkTheme.java b/src/main/java/com/chrisrm/idea/themes/OneDarkTheme.java index 31b785d3f..4ca9a649b 100644 --- a/src/main/java/com/chrisrm/idea/themes/OneDarkTheme.java +++ b/src/main/java/com/chrisrm/idea/themes/OneDarkTheme.java @@ -153,6 +153,7 @@ protected String[] getHighlightResources() { "Focus.color", "TextField.separatorColor", "ProgressBar.halfColor", + "CheckBox.darcula.inactiveFillColor", "MemoryIndicator.usedColor" }; }