Skip to content

Commit

Permalink
fix: formatting changes (#34)
Browse files Browse the repository at this point in the history
  • Loading branch information
bhushan authored Nov 28, 2021
1 parent 049be97 commit dd34807
Show file tree
Hide file tree
Showing 9 changed files with 81 additions and 106 deletions.
3 changes: 2 additions & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Description

⚠️ Remember to update changelog!.
- ⚠️ Remember to update changelog!.
- ⚠️ Remember to update property `pluginVersion` in gradle.properties file!.

## Type of change

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ jobs:
releaseDraft:
name: Release Draft
if: github.event_name != 'pull_request'
needs: [build]
needs: [ build ]
runs-on: ubuntu-latest
steps:

Expand Down
46 changes: 23 additions & 23 deletions .run/Run IDE with Plugin.run.xml
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Run Plugin" type="GradleRunConfiguration" factoryName="Gradle">
<log_file alias="idea.log" path="$PROJECT_DIR$/build/idea-sandbox/system/log/idea.log" />
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" value="" />
<option name="taskDescriptions">
<list />
</option>
<option name="taskNames">
<list>
<option value="runIde" />
</list>
</option>
<option name="vmOptions" value="" />
</ExternalSystemSettings>
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<method v="2" />
</configuration>
</component>
<configuration default="false" name="Run Plugin" type="GradleRunConfiguration" factoryName="Gradle">
<log_file alias="idea.log" path="$PROJECT_DIR$/build/idea-sandbox/system/log/idea.log"/>
<ExternalSystemSettings>
<option name="executionName"/>
<option name="externalProjectPath" value="$PROJECT_DIR$"/>
<option name="externalSystemIdString" value="GRADLE"/>
<option name="scriptParameters" value=""/>
<option name="taskDescriptions">
<list/>
</option>
<option name="taskNames">
<list>
<option value="runIde"/>
</list>
</option>
<option name="vmOptions" value=""/>
</ExternalSystemSettings>
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<method v="2"/>
</configuration>
</component>
46 changes: 23 additions & 23 deletions .run/Run Plugin Tests.run.xml
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Run Tests" type="GradleRunConfiguration" factoryName="Gradle">
<log_file alias="idea.log" path="$PROJECT_DIR$/build/idea-sandbox/system/log/idea.log" />
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" value="" />
<option name="taskDescriptions">
<list />
</option>
<option name="taskNames">
<list>
<option value="check" />
</list>
</option>
<option name="vmOptions" value="" />
</ExternalSystemSettings>
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<method v="2" />
</configuration>
</component>
<configuration default="false" name="Run Tests" type="GradleRunConfiguration" factoryName="Gradle">
<log_file alias="idea.log" path="$PROJECT_DIR$/build/idea-sandbox/system/log/idea.log"/>
<ExternalSystemSettings>
<option name="executionName"/>
<option name="externalProjectPath" value="$PROJECT_DIR$"/>
<option name="externalSystemIdString" value="GRADLE"/>
<option name="scriptParameters" value=""/>
<option name="taskDescriptions">
<list/>
</option>
<option name="taskNames">
<list>
<option value="check"/>
</list>
</option>
<option name="vmOptions" value=""/>
</ExternalSystemSettings>
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<method v="2"/>
</configuration>
</component>
51 changes: 26 additions & 25 deletions .run/Run Plugin Verification.run.xml
Original file line number Diff line number Diff line change
@@ -1,26 +1,27 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Run Verifications" type="GradleRunConfiguration" factoryName="Gradle">
<log_file alias="idea.log" path="$PROJECT_DIR$/build/idea-sandbox/system/log/idea.log" />
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" value="" />
<option name="taskDescriptions">
<list />
</option>
<option name="taskNames">
<list>
<option value="runPluginVerifier" />
</list>
</option>
<option name="vmOptions" value="" />
</ExternalSystemSettings>
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<method v="2">
<option name="Gradle.BeforeRunTask" enabled="true" tasks="clean" externalProjectPath="$PROJECT_DIR$" vmOptions="" scriptParameters="" />
</method>
</configuration>
</component>
<configuration default="false" name="Run Verifications" type="GradleRunConfiguration" factoryName="Gradle">
<log_file alias="idea.log" path="$PROJECT_DIR$/build/idea-sandbox/system/log/idea.log"/>
<ExternalSystemSettings>
<option name="executionName"/>
<option name="externalProjectPath" value="$PROJECT_DIR$"/>
<option name="externalSystemIdString" value="GRADLE"/>
<option name="scriptParameters" value=""/>
<option name="taskDescriptions">
<list/>
</option>
<option name="taskNames">
<list>
<option value="runPluginVerifier"/>
</list>
</option>
<option name="vmOptions" value=""/>
</ExternalSystemSettings>
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<method v="2">
<option name="Gradle.BeforeRunTask" enabled="true" tasks="clean" externalProjectPath="$PROJECT_DIR$"
vmOptions="" scriptParameters=""/>
</method>
</configuration>
</component>
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
# GitHub Theme Changelog

## [Unreleased]

Fix: Formatting Changes

## [1.1.3]

Fix: Warning background on light mode made visible
Expand All @@ -14,6 +17,7 @@ Fix: Warning background on light mode made visible
## [1.1.1]

### Fixed

- Fix some colors

## [1.1.0]
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

pluginGroup = club.nutsoft
pluginName = GitHub Theme
pluginVersion = 1.1.3
pluginVersion = 1.1.4

# Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl
# See https://jb.gg/intellij-platform-builds-list for available build versions.
Expand Down
4 changes: 0 additions & 4 deletions src/main/resources/GitHub_Dark_Dimmed.theme.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,12 @@
"foreground": "#adbac7",
"disabledBackground": "#2F3032",
"inactiveBackground": "#22272d",

"selectionBackground": "#2d333b",
"selectionInactiveBackground": "#2d333b",

"lightSelectionBackground": "#393a3d",
"lightSelectionInactiveBackground": "#2f3032",

"borderColor": "#444c56",
"disabledBorderColor": "#333336",

"separatorForeground": "#444c56",
"separatorColor": "#444c56",
"lineSeparatorColor": "#444c56"
Expand Down
29 changes: 1 addition & 28 deletions src/main/resources/GitHub_Light.theme.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,28 +5,22 @@
"editorScheme": "/GitHub_Light.xml",
"ui": {
"*": {
"selectionBackground": "#2675BF",
"selectionBackground": "#2675BF",
"selectionBackgroundInactive": "#D5D5D5",
"selectionInactiveBackground": "#D5D5D5",

"disabledForeground": "#8C8C8C",
"disabledText": "#8C8C8C",
"inactiveForeground": "#8C8C8C",

"infoForeground": "#808080",
"modifiedItemForeground": "#005ad9",

"acceleratorSelectionForeground": "#FFFFFF",

"separatorColor": "#d1d1d1",
"separatorForeground": "#999999"
},

"Borders": {
"color": "#D1D1D1",
"ContrastBorderColor": "#D1D1D1"
},

"Button": {
"shadowColor": "#A6A6A620",
"startBorderColor": "#C4C4C4",
Expand All @@ -41,80 +35,59 @@
"focusedBorderColor": "#A9C9F5"
}
},

"ComboBox": {
"background": "#FFFFFF",
"nonEditableBackground": "#FFFFFF",
"ArrowButton.background": "#fafafa"
},

"ComboBoxButton.background": "#FFFFFF",

"CompletionPopup": {
"selectionBackground": "#c5dffc",
"selectionInactiveBackground": "#e0e0e0"
},

"Component.borderColor": "#C4C4C4",

"DefaultTabs.background": "#F2F2F2",

"EditorTabs.underlinedTabBackground": "#ffffff",

"Editor": {
"background": "#cccccc",
"foreground": "#737373",
"shortcutForeground": "#4274A6"
},

"Label.errorForeground": "#C7222D",

"Link": {
"activeForeground": "#2470B3",
"hoverForeground": "#2470B3",
"pressedForeground": "#2470B3",
"visitedForeground": "#2470B3",
"secondaryForeground": "#77a8d9"
},

"Notification": {
"borderColor": "#D1D1D1"
},

"Menu.borderColor": "#d9d9d9",

"Panel.background": "#F2F2F2",

"PasswordField.background": "#FFFFFF",

"Popup": {
"separatorColor": "#d9d9d9",
"Advertiser.borderColor": "#D1D1D1",
"borderColor": "#adadad"
},

"ProgressBar": {
"trackColor": "#D1D1D1",
"progressColor": "#1E82E6",
"indeterminateStartColor": "#91C5F2",
"indeterminateEndColor": "#1E82E6"
},

"StatusBar.borderColor": "#D1D1D1",

"ToolWindow.Header.inactiveBackground": "#F2F2F2",

"Tree.foreground": "#24292e",
"Tree.rowHeight": 20
},

"icons": {

"ColorPalette": {
"Checkbox.Border.Default": "#b0b0b0",
"Checkbox.Background.Selected": "#4F9EE3",
"Checkbox.Border.Selected": "#4B97D9"
}
}

}

0 comments on commit dd34807

Please sign in to comment.