diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 85fac7a..52c6c41 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -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 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 59ea3af..3b25be4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -146,7 +146,7 @@ jobs: releaseDraft: name: Release Draft if: github.event_name != 'pull_request' - needs: [build] + needs: [ build ] runs-on: ubuntu-latest steps: diff --git a/.run/Run IDE with Plugin.run.xml b/.run/Run IDE with Plugin.run.xml index d15ff68..48a7354 100644 --- a/.run/Run IDE with Plugin.run.xml +++ b/.run/Run IDE with Plugin.run.xml @@ -1,24 +1,24 @@ - - - - - - - true - true - false - - - \ No newline at end of file + + + + + + + true + true + false + + + diff --git a/.run/Run Plugin Tests.run.xml b/.run/Run Plugin Tests.run.xml index 03d0287..298bd6f 100644 --- a/.run/Run Plugin Tests.run.xml +++ b/.run/Run Plugin Tests.run.xml @@ -1,24 +1,24 @@ - - - - - - - true - true - false - - - \ No newline at end of file + + + + + + + true + true + false + + + diff --git a/.run/Run Plugin Verification.run.xml b/.run/Run Plugin Verification.run.xml index 3a8d688..18ad1f8 100644 --- a/.run/Run Plugin Verification.run.xml +++ b/.run/Run Plugin Verification.run.xml @@ -1,26 +1,27 @@ - - - - - - - true - true - false - - - - \ No newline at end of file + + + + + + + true + true + false + + + + diff --git a/CHANGELOG.md b/CHANGELOG.md index 83a4fac..45e1ca9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,9 @@ # GitHub Theme Changelog ## [Unreleased] + +Fix: Formatting Changes + ## [1.1.3] Fix: Warning background on light mode made visible @@ -14,6 +17,7 @@ Fix: Warning background on light mode made visible ## [1.1.1] ### Fixed + - Fix some colors ## [1.1.0] diff --git a/gradle.properties b/gradle.properties index 2266b42..3c1d02f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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. diff --git a/src/main/resources/GitHub_Dark_Dimmed.theme.json b/src/main/resources/GitHub_Dark_Dimmed.theme.json index 23ab53b..7eb2374 100644 --- a/src/main/resources/GitHub_Dark_Dimmed.theme.json +++ b/src/main/resources/GitHub_Dark_Dimmed.theme.json @@ -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" diff --git a/src/main/resources/GitHub_Light.theme.json b/src/main/resources/GitHub_Light.theme.json index ec3bdfa..22c9288 100644 --- a/src/main/resources/GitHub_Light.theme.json +++ b/src/main/resources/GitHub_Light.theme.json @@ -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", @@ -41,34 +35,25 @@ "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", @@ -76,45 +61,33 @@ "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" } } - }