Skip to content

Commit 0d30b7a

Browse files
WhiteVermouthWhiteVermouth
committed
🎨 Align Dracula and Colorful panel backgrounds and selections
1 parent 15d5857 commit 0d30b7a

2 files changed

Lines changed: 62 additions & 56 deletions

File tree

‎src/main/resources/themes/Dracula.theme.json‎

Lines changed: 31 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,28 @@
1010
"primaryBackground": "#282a36",
1111
"secondaryBackground": "#3a3d4c",
1212
"hoverBackground": "#44475a",
13-
"selectionBackground": "#4b506a",
14-
"selectionInactiveBackground": "#424860",
13+
"selectionBackground": "#8063a6",
14+
"selectionInactiveBackground": "#60657d",
15+
"controlBorderColor": "#4b506a",
1516
"borderColor": "#44475a",
1617
"separatorColor": "#4f526a",
1718
"editorBackground": "#282a36"
1819
},
1920
"ui": {
2021
"*": {
2122
"arc": "7",
22-
"background": "primaryBackground",
23+
"background": "secondaryBackground",
2324
"foreground": "primaryForeground",
2425
"textForeground": "primaryForeground",
2526
"caretForeground": "primaryForeground",
2627
"selectionForeground": "primaryForeground",
28+
"selectionForegroundInactive": "primaryForeground",
2729
"selectionInactiveForeground": "primaryForeground",
2830
"selectionBackground": "selectionBackground",
31+
"selectionBackgroundInactive": "selectionInactiveBackground",
2932
"selectionInactiveBackground": "selectionInactiveBackground",
30-
"inactiveBackground": "primaryBackground",
31-
"disabledBackground": "primaryBackground",
33+
"inactiveBackground": "secondaryBackground",
34+
"disabledBackground": "secondaryBackground",
3235
"borderColor": "borderColor",
3336
"separatorColor": "separatorColor"
3437
},
@@ -58,8 +61,8 @@
5861
},
5962
"Button": {
6063
"foreground": "primaryForeground",
61-
"startBorderColor": "selectionBackground",
62-
"endBorderColor": "selectionBackground",
64+
"startBorderColor": "controlBorderColor",
65+
"endBorderColor": "controlBorderColor",
6366
"startBackground": "#565b75",
6467
"endBackground": "#565b75",
6568
"focusedBorderColor": "secondaryAccentColor",
@@ -89,7 +92,7 @@
8992
"disabledIconColor": "#576285",
9093
"iconColor": "secondaryAccentColor"
9194
},
92-
"selectionBackground": "secondaryAccentColor",
95+
"selectionBackground": "selectionBackground",
9396
"nonEditableBackground": "secondaryBackground"
9497
},
9598
"CompletionPopup": {
@@ -99,9 +102,9 @@
99102
},
100103
"Component": {
101104
"focusColor": "secondaryAccentColor",
102-
"borderColor": "selectionBackground",
105+
"borderColor": "controlBorderColor",
103106
"focusedBorderColor": "secondaryAccentColor",
104-
"disabledBorderColor": "selectionBackground",
107+
"disabledBorderColor": "controlBorderColor",
105108
"errorFocusColor": "#ff5554",
106109
"inactiveErrorFocusColor": "#a64a50",
107110
"warningFocusColor": "#f1fa8c",
@@ -134,8 +137,8 @@
134137
"List": {
135138
"selectionBackground": "selectionBackground",
136139
"selectionInactiveBackground": "selectionInactiveBackground",
137-
"hoverBackground": "selectionInactiveBackground",
138-
"hoverInactiveBackground": "selectionInactiveBackground"
140+
"hoverBackground": "hoverBackground",
141+
"hoverInactiveBackground": "hoverBackground"
139142
},
140143
"Link": {
141144
"activeForeground": "accentColor",
@@ -148,19 +151,19 @@
148151
"allocatedBackground": "#515872"
149152
},
150153
"Notification": {
151-
"borderColor": "selectionBackground",
154+
"borderColor": "controlBorderColor",
152155
"errorBorderColor": "#ff5554",
153-
"errorBackground": "primaryBackground",
156+
"errorBackground": "secondaryBackground",
154157
"errorForeground": "primaryForeground",
155158
"ToolWindow": {
156159
"warningForeground": "primaryForeground",
157-
"warningBackground": "primaryBackground",
160+
"warningBackground": "secondaryBackground",
158161
"warningBorderColor": "#ffb86c",
159162
"errorForeground": "primaryForeground",
160163
"errorBorderColor": "#ff5554",
161-
"errorBackground": "primaryBackground",
164+
"errorBackground": "secondaryBackground",
162165
"informativeForeground": "primaryForeground",
163-
"informativeBackground": "primaryBackground",
166+
"informativeBackground": "secondaryBackground",
164167
"informativeBorderColor": "#50fa7b"
165168
}
166169
},
@@ -188,10 +191,10 @@
188191
"Button": {
189192
"installBorderColor": "secondaryAccentColor",
190193
"installForeground": "secondaryAccentColor",
191-
"installBackground": "primaryBackground",
194+
"installBackground": "secondaryBackground",
192195
"installFillForeground": "primaryBackground",
193196
"installFillBackground": "secondaryAccentColor",
194-
"installFocusedBackground": "primaryBackground",
197+
"installFocusedBackground": "secondaryBackground",
195198
"updateBorderColor": "#5da3f4",
196199
"updateForeground": "primaryBackground",
197200
"updateBackground": "#5da3f4"
@@ -205,7 +208,7 @@
205208
"ProgressBar": {
206209
"failedColor": "#ff5554",
207210
"failedEndColor": "#ff5554",
208-
"trackColor": "selectionBackground",
211+
"trackColor": "controlBorderColor",
209212
"progressColor": "accentColor",
210213
"indeterminateStartColor": "#93b8f9",
211214
"indeterminateEndColor": "secondaryAccentColor",
@@ -243,7 +246,7 @@
243246
"separatorColor": "separatorColor"
244247
},
245248
"SidePanel": {
246-
"background": "primaryBackground"
249+
"background": "secondaryBackground"
247250
},
248251
"TabbedPane": {
249252
"tabSelectionHeight": 1,
@@ -278,7 +281,7 @@
278281
"hoverBackground": "hoverBackground"
279282
},
280283
"Header": {
281-
"background": "primaryBackground",
284+
"background": "secondaryBackground",
282285
"inactiveBackground": "secondaryBackground"
283286
},
284287
"HeaderTab": {
@@ -293,8 +296,8 @@
293296
"modifiedItemForeground": "accentColor",
294297
"selectionBackground": "selectionBackground",
295298
"selectionInactiveBackground": "selectionInactiveBackground",
296-
"hoverBackground": "selectionInactiveBackground",
297-
"hoverInactiveBackground": "selectionInactiveBackground",
299+
"hoverBackground": "hoverBackground",
300+
"hoverInactiveBackground": "hoverBackground",
298301
"hash": "hoverBackground"
299302
},
300303
"ValidationTooltip": {
@@ -316,7 +319,7 @@
316319
},
317320
"Log": {
318321
"Commit": {
319-
"hoveredBackground": "selectionBackground",
322+
"hoveredBackground": "hoverBackground",
320323
"currentBranchBackground": "#2e3040"
321324
}
322325
},
@@ -325,7 +328,7 @@
325328
}
326329
},
327330
"MainWindow.Tab": {
328-
"background": "primaryBackground",
331+
"background": "secondaryBackground",
329332
"foreground": "primaryForeground",
330333
"selectedBackground": "#484c60",
331334
"selectedForeground": "primaryForeground",
@@ -341,8 +344,8 @@
341344
"separatorColor": "separatorColor",
342345
"Projects": {
343346
"background": "hoverBackground",
344-
"selectionBackground": "secondaryBackground",
345-
"selectionInactiveBackground": "secondaryBackground",
347+
"selectionBackground": "selectionBackground",
348+
"selectionInactiveBackground": "selectionInactiveBackground",
346349
"actions": {
347350
"background": "secondaryBackground"
348351
}

‎src/main/resources/themes/DraculaColorful.theme.json‎

Lines changed: 31 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,28 @@
1010
"primaryBackground": "#282a36",
1111
"secondaryBackground": "#3a3d4c",
1212
"hoverBackground": "#44475a",
13-
"selectionBackground": "#4b506a",
14-
"selectionInactiveBackground": "#424860",
13+
"selectionBackground": "#8063a6",
14+
"selectionInactiveBackground": "#60657d",
15+
"controlBorderColor": "#4b506a",
1516
"borderColor": "#44475a",
1617
"separatorColor": "#4f526a",
1718
"editorBackground": "#282a36"
1819
},
1920
"ui": {
2021
"*": {
2122
"arc": "7",
22-
"background": "primaryBackground",
23+
"background": "secondaryBackground",
2324
"foreground": "primaryForeground",
2425
"textForeground": "primaryForeground",
2526
"caretForeground": "primaryForeground",
2627
"selectionForeground": "primaryForeground",
28+
"selectionForegroundInactive": "primaryForeground",
2729
"selectionInactiveForeground": "primaryForeground",
2830
"selectionBackground": "selectionBackground",
31+
"selectionBackgroundInactive": "selectionInactiveBackground",
2932
"selectionInactiveBackground": "selectionInactiveBackground",
30-
"inactiveBackground": "primaryBackground",
31-
"disabledBackground": "primaryBackground",
33+
"inactiveBackground": "secondaryBackground",
34+
"disabledBackground": "secondaryBackground",
3235
"borderColor": "borderColor",
3336
"separatorColor": "separatorColor"
3437
},
@@ -58,8 +61,8 @@
5861
},
5962
"Button": {
6063
"foreground": "primaryForeground",
61-
"startBorderColor": "selectionBackground",
62-
"endBorderColor": "selectionBackground",
64+
"startBorderColor": "controlBorderColor",
65+
"endBorderColor": "controlBorderColor",
6366
"startBackground": "#565b75",
6467
"endBackground": "#565b75",
6568
"focusedBorderColor": "secondaryAccentColor",
@@ -89,7 +92,7 @@
8992
"disabledIconColor": "#576285",
9093
"iconColor": "secondaryAccentColor"
9194
},
92-
"selectionBackground": "secondaryAccentColor",
95+
"selectionBackground": "selectionBackground",
9396
"nonEditableBackground": "secondaryBackground"
9497
},
9598
"CompletionPopup": {
@@ -99,9 +102,9 @@
99102
},
100103
"Component": {
101104
"focusColor": "secondaryAccentColor",
102-
"borderColor": "selectionBackground",
105+
"borderColor": "controlBorderColor",
103106
"focusedBorderColor": "secondaryAccentColor",
104-
"disabledBorderColor": "selectionBackground",
107+
"disabledBorderColor": "controlBorderColor",
105108
"errorFocusColor": "#ff5554",
106109
"inactiveErrorFocusColor": "#a64a50",
107110
"warningFocusColor": "#f1fa8c",
@@ -134,8 +137,8 @@
134137
"List": {
135138
"selectionBackground": "selectionBackground",
136139
"selectionInactiveBackground": "selectionInactiveBackground",
137-
"hoverBackground": "selectionInactiveBackground",
138-
"hoverInactiveBackground": "selectionInactiveBackground"
140+
"hoverBackground": "hoverBackground",
141+
"hoverInactiveBackground": "hoverBackground"
139142
},
140143
"Link": {
141144
"activeForeground": "accentColor",
@@ -148,19 +151,19 @@
148151
"allocatedBackground": "#515872"
149152
},
150153
"Notification": {
151-
"borderColor": "selectionBackground",
154+
"borderColor": "controlBorderColor",
152155
"errorBorderColor": "#ff5554",
153-
"errorBackground": "primaryBackground",
156+
"errorBackground": "secondaryBackground",
154157
"errorForeground": "primaryForeground",
155158
"ToolWindow": {
156159
"warningForeground": "primaryForeground",
157-
"warningBackground": "primaryBackground",
160+
"warningBackground": "secondaryBackground",
158161
"warningBorderColor": "#ffb86c",
159162
"errorForeground": "primaryForeground",
160163
"errorBorderColor": "#ff5554",
161-
"errorBackground": "primaryBackground",
164+
"errorBackground": "secondaryBackground",
162165
"informativeForeground": "primaryForeground",
163-
"informativeBackground": "primaryBackground",
166+
"informativeBackground": "secondaryBackground",
164167
"informativeBorderColor": "#50fa7b"
165168
}
166169
},
@@ -188,10 +191,10 @@
188191
"Button": {
189192
"installBorderColor": "secondaryAccentColor",
190193
"installForeground": "secondaryAccentColor",
191-
"installBackground": "primaryBackground",
194+
"installBackground": "secondaryBackground",
192195
"installFillForeground": "primaryBackground",
193196
"installFillBackground": "secondaryAccentColor",
194-
"installFocusedBackground": "primaryBackground",
197+
"installFocusedBackground": "secondaryBackground",
195198
"updateBorderColor": "#5da3f4",
196199
"updateForeground": "primaryBackground",
197200
"updateBackground": "#5da3f4"
@@ -205,7 +208,7 @@
205208
"ProgressBar": {
206209
"failedColor": "#ff5554",
207210
"failedEndColor": "#ff5554",
208-
"trackColor": "selectionBackground",
211+
"trackColor": "controlBorderColor",
209212
"progressColor": "accentColor",
210213
"indeterminateStartColor": "#93b8f9",
211214
"indeterminateEndColor": "secondaryAccentColor",
@@ -243,7 +246,7 @@
243246
"separatorColor": "separatorColor"
244247
},
245248
"SidePanel": {
246-
"background": "primaryBackground"
249+
"background": "secondaryBackground"
247250
},
248251
"TabbedPane": {
249252
"tabSelectionHeight": 1,
@@ -278,7 +281,7 @@
278281
"hoverBackground": "hoverBackground"
279282
},
280283
"Header": {
281-
"background": "primaryBackground",
284+
"background": "secondaryBackground",
282285
"inactiveBackground": "secondaryBackground"
283286
},
284287
"HeaderTab": {
@@ -293,8 +296,8 @@
293296
"modifiedItemForeground": "accentColor",
294297
"selectionBackground": "selectionBackground",
295298
"selectionInactiveBackground": "selectionInactiveBackground",
296-
"hoverBackground": "selectionInactiveBackground",
297-
"hoverInactiveBackground": "selectionInactiveBackground",
299+
"hoverBackground": "hoverBackground",
300+
"hoverInactiveBackground": "hoverBackground",
298301
"hash": "hoverBackground"
299302
},
300303
"ValidationTooltip": {
@@ -316,7 +319,7 @@
316319
},
317320
"Log": {
318321
"Commit": {
319-
"hoveredBackground": "selectionBackground",
322+
"hoveredBackground": "hoverBackground",
320323
"currentBranchBackground": "#2e3040"
321324
}
322325
},
@@ -325,7 +328,7 @@
325328
}
326329
},
327330
"MainWindow.Tab": {
328-
"background": "primaryBackground",
331+
"background": "secondaryBackground",
329332
"foreground": "primaryForeground",
330333
"selectedBackground": "#484c60",
331334
"selectedForeground": "primaryForeground",
@@ -341,8 +344,8 @@
341344
"separatorColor": "separatorColor",
342345
"Projects": {
343346
"background": "hoverBackground",
344-
"selectionBackground": "secondaryBackground",
345-
"selectionInactiveBackground": "secondaryBackground",
347+
"selectionBackground": "selectionBackground",
348+
"selectionInactiveBackground": "selectionInactiveBackground",
346349
"actions": {
347350
"background": "secondaryBackground"
348351
}

0 commit comments

Comments
 (0)