Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 8a0dc1b

Browse files
Custom colors clean up (#1252)
1 parent 564862e commit 8a0dc1b

14 files changed

+75
-109
lines changed

‎arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx‎

Lines changed: 16 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -183,34 +183,6 @@ export class ArduinoFrontendContribution
183183

184184
registerColors(colors: ColorRegistry): void {
185185
colors.register(
186-
{
187-
id: 'arduino.branding.primary',
188-
defaults: {
189-
dark: 'statusBar.background',
190-
light: 'statusBar.background',
191-
},
192-
description:
193-
'The primary branding color, such as dialog titles, library, and board manager list labels.',
194-
},
195-
{
196-
id: 'arduino.branding.secondary',
197-
defaults: {
198-
dark: 'statusBar.background',
199-
light: 'statusBar.background',
200-
},
201-
description:
202-
'Secondary branding color for list selections, dropdowns, and widget borders.',
203-
},
204-
{
205-
id: 'arduino.foreground',
206-
defaults: {
207-
dark: 'editorWidget.background',
208-
light: 'editorWidget.background',
209-
hc: 'editorWidget.background',
210-
},
211-
description:
212-
'Color of the Arduino IDE foreground which is used for dialogs, such as the Select Board dialog.',
213-
},
214186
{
215187
id: 'arduino.toolbar.button.background',
216188
defaults: {
@@ -225,8 +197,8 @@ export class ArduinoFrontendContribution
225197
id: 'arduino.toolbar.button.hoverBackground',
226198
defaults: {
227199
dark: 'button.hoverBackground',
228-
light: 'button.foreground',
229-
hc: 'textLink.foreground',
200+
light: 'button.hoverBackground',
201+
hc: 'button.background',
230202
},
231203
description:
232204
'Background color of the toolbar items when hovering over them. Such as Upload, Verify, etc.',
@@ -261,24 +233,6 @@ export class ArduinoFrontendContribution
261233
description:
262234
'Toggle color of the toolbar items when they are currently toggled (the command is in progress)',
263235
},
264-
{
265-
id: 'arduino.output.foreground',
266-
defaults: {
267-
dark: 'editor.foreground',
268-
light: 'editor.foreground',
269-
hc: 'editor.foreground',
270-
},
271-
description: 'Color of the text in the Output view.',
272-
},
273-
{
274-
id: 'arduino.output.background',
275-
defaults: {
276-
dark: 'editor.background',
277-
light: 'editor.background',
278-
hc: 'editor.background',
279-
},
280-
description: 'Background color of the Output view.',
281-
},
282236
{
283237
id: 'arduino.toolbar.dropdown.border',
284238
defaults: {
@@ -303,46 +257,46 @@ export class ArduinoFrontendContribution
303257
id: 'arduino.toolbar.dropdown.background',
304258
defaults: {
305259
dark: 'tab.unfocusedActiveBackground',
306-
light: 'tab.unfocusedActiveBackground',
307-
hc: 'tab.unfocusedActiveBackground',
260+
light: 'dropdown.background',
261+
hc: 'dropdown.background',
308262
},
309263
description: 'Background color of the Board Selector.',
310264
},
311265

312266
{
313267
id: 'arduino.toolbar.dropdown.label',
314268
defaults: {
315-
dark: 'foreground',
316-
light: 'foreground',
317-
hc: 'foreground',
269+
dark: 'dropdown.foreground',
270+
light: 'dropdown.foreground',
271+
hc: 'dropdown.foreground',
318272
},
319273
description: 'Font color of the Board Selector.',
320274
},
321275
{
322276
id: 'arduino.toolbar.dropdown.iconSelected',
323277
defaults: {
324-
dark: 'statusBar.background',
325-
light: 'statusBar.background',
326-
hc: 'statusBar.background',
278+
dark: 'list.activeSelectionIconForeground',
279+
light: 'list.activeSelectionIconForeground',
280+
hc: 'list.activeSelectionIconForeground',
327281
},
328282
description:
329283
'Color of the selected protocol icon in the Board Selector.',
330284
},
331285
{
332286
id: 'arduino.toolbar.dropdown.option.backgroundHover',
333287
defaults: {
334-
dark: 'editor.background',
335-
light: 'editor.background',
336-
hc: 'editor.background',
288+
dark: 'list.hoverBackground',
289+
light: 'list.hoverBackground',
290+
hc: 'list.hoverBackground',
337291
},
338292
description: 'Background color on hover of the Board Selector options.',
339293
},
340294
{
341295
id: 'arduino.toolbar.dropdown.option.backgroundSelected',
342296
defaults: {
343-
dark: 'editor.background',
344-
light: 'editor.background',
345-
hc: 'editor.background',
297+
dark: 'list.activeSelectionBackground',
298+
light: 'list.activeSelectionBackground',
299+
hc: 'list.activeSelectionBackground',
346300
},
347301
description:
348302
'Background color of the selected board in the Board Selector.',

‎arduino-ide-extension/src/browser/data/dark.color-theme.json‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"list.inactiveSelectionForeground": "#dae3e3",
99
"list.inactiveSelectionBackground": "#434f54",
1010
"list.hoverBackground": "#1f272a",
11+
"list.activeSelectionIconForeground": "#0ca1a6",
1112
"progressBar.background": "#005c5f",
1213
"editor.background": "#1f272a",
1314
"editor.foreground": "#dae3e3",
@@ -16,6 +17,7 @@
1617
"editorCursor.foreground": "#434f54",
1718
"editorWhitespace.foreground": "#bfbfbf",
1819
"editorWidget.background": "#171e21",
20+
"editorWidget.foreground": "#dae3e3",
1921
"focusBorder": "#dae3e3",
2022
"menubar.selectionBackground": "#ffffff",
2123
"menubar.selectionForeground": "#212121",
@@ -28,7 +30,7 @@
2830
"titleBar.activeBackground": "#171e21",
2931
"titleBar.activeForeground": "#dae3e3",
3032
"terminal.background": "#000000",
31-
"terminal.foreground": "#e0e0e0",
33+
"terminal.foreground": "#ffffff",
3234
"dropdown.border": "#7fcbcd",
3335
"dropdown.background": "#2c353a",
3436
"dropdown.foreground": "#dae3e3",
@@ -64,7 +66,8 @@
6466
"settings.headerForeground": "#dae3e3",
6567
"tree.indentGuidesStroke": "#374146",
6668
"tab.unfocusedActiveForeground": "#dae3e3",
67-
"tab.inactiveBackground": "#171e21"
69+
"tab.inactiveBackground": "#171e21",
70+
"textLink.foreground": "#0ca1a6"
6871
},
6972
"tokenColors": [
7073
{

‎arduino-ide-extension/src/browser/data/default.color-theme.json‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"list.inactiveSelectionForeground": "#4e5b61",
99
"list.inactiveSelectionBackground": "#dae3e3",
1010
"list.hoverBackground": "#ecf1f1",
11+
"list.activeSelectionIconForeground": "#008184",
1112
"progressBar.background": "#005c5f",
1213
"editor.background": "#ffffff",
1314
"editor.foreground": "#4e5b61",
@@ -16,6 +17,7 @@
1617
"editorCursor.foreground": "#434f54",
1718
"editorWhitespace.foreground": "#bfbfbf",
1819
"editorWidget.background": "#f7f9f9",
20+
"editorWidget.foreground": "#4e5b61",
1921
"focusBorder": "#7fcbcd",
2022
"menubar.selectionBackground": "#ffffff",
2123
"menubar.selectionForeground": "#212121",
@@ -28,7 +30,7 @@
2830
"titleBar.activeBackground": "#006d70",
2931
"titleBar.activeForeground": "#f7f9f9",
3032
"terminal.background": "#000000",
31-
"terminal.foreground": "#e0e0e0",
33+
"terminal.foreground": "#ffffff",
3234
"dropdown.border": "#dae3e3",
3335
"dropdown.background": "#ffffff",
3436
"dropdown.foreground": "#4e5b61",
@@ -64,7 +66,8 @@
6466
"settings.headerForeground": "#4e5b61",
6567
"tree.indentGuidesStroke": "#dae3e3",
6668
"tab.unfocusedActiveForeground": "#4e5b61",
67-
"tab.inactiveBackground": "#ecf1f1"
69+
"tab.inactiveBackground": "#ecf1f1",
70+
"textLink.foreground": "#008184"
6871
},
6972
"tokenColors": [
7073
{

‎arduino-ide-extension/src/browser/style/boards-config-dialog.css‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ div.dialogContent.select-board-dialog > div.head .title {
1515
font-weight: 400;
1616
letter-spacing: 0.02em;
1717
font-size: 1.2em;
18-
color: var(--theia-arduino-branding-primary);
18+
color: var(--theia-editorWidget-foreground);
1919
margin-bottom: 10px;
2020
}
2121

@@ -24,7 +24,7 @@ div#select-board-dialog .selectBoardContainer .body .list .item.selected {
2424
}
2525

2626
div#select-board-dialog .selectBoardContainer .body .list .item.selected i {
27-
color: var(--theia-arduino-branding-primary);
27+
color: var(--theia-list-activeSelectionIconForeground);
2828
}
2929

3030
#select-board-dialog .selectBoardContainer .search,
@@ -43,7 +43,7 @@ div#select-board-dialog .selectBoardContainer .body .list .item.selected i {
4343
margin: 0;
4444
vertical-align: top;
4545
display: flex;
46-
color: var(--theia-editor-foreground);
46+
color: var(--theia-input-foreground);
4747
}
4848

4949
#select-board-dialog .selectBoardContainer .body .search input:focus {
@@ -66,7 +66,7 @@ div#select-board-dialog .selectBoardContainer .body .list .item.selected i {
6666
}
6767

6868
#select-board-dialog .selectBoardContainer .body .container .content .title {
69-
color: #7f8c8d;
69+
color: var(--theia-editorWidget-foreground);
7070
padding: 0px 0px 10px 0px;
7171
text-transform: uppercase;
7272
}
@@ -77,7 +77,7 @@ div#select-board-dialog .selectBoardContainer .body .list .item.selected i {
7777

7878
#select-board-dialog .selectBoardContainer .body .container .content .loading {
7979
font-size: var(--theia-ui-font-size1);
80-
color: var(--theia-arduino-branding-secondary);
80+
color: var(--theia-editorWidget-foreground);
8181
padding: 10px 5px 10px 10px;
8282
text-transform: uppercase;
8383
/* The max, min-height comes from `.body .list` 200px + 47px top padding - 2 * 10px top padding */
@@ -148,7 +148,7 @@ div#select-board-dialog .selectBoardContainer .body .list .item.selected i {
148148
background: var(--theia-arduino-toolbar-dropdown-background);
149149
border-radius: 1px;
150150
color: var(--theia-arduino-toolbar-dropdown-label);
151-
border: 1px solid var(--theia-dropdown-border);
151+
border: 1px solid var(--theia-arduino-toolbar-dropdown-border);
152152
display: flex;
153153
gap: 10px;
154154
height: 28px;
@@ -165,10 +165,7 @@ div#select-board-dialog .selectBoardContainer .body .list .item.selected i {
165165
font-size: 16px;
166166
}
167167

168-
.arduino-boards-toolbar-item--protocol {
169-
color: var(--theia-arduino-toolbar-dropdown-label);
170-
}
171-
168+
.arduino-boards-toolbar-item--protocol ,
172169
.arduino-boards-dropdown-item--protocol {
173170
color: var(--theia-arduino-toolbar-dropdown-label);
174171
}
@@ -206,6 +203,7 @@ div#select-board-dialog .selectBoardContainer .body .list .item.selected i {
206203
.arduino-boards-dropdown-list--items-container {
207204
overflow: auto;
208205
max-height: 404px;
206+
background: var(--theia-arduino-toolbar-dropdown-background);
209207
}
210208

211209
.arduino-boards-dropdown-list--items-container::-webkit-scrollbar {
@@ -247,8 +245,8 @@ div#select-board-dialog .selectBoardContainer .body .list .item.selected i {
247245
}
248246

249247
.arduino-boards-dropdown-item--selected
250-
.arduino-boards-dropdown-item--port-label {
251-
color: var(--theia-arduino-toolbar-dropdown-label);
248+
.arduino-boards-dropdown-item--port-label {
249+
color: var(--theia-arduino-toolbar-dropdown-label);
252250
}
253251

254252
.arduino-boards-dropdown-item--selected .fa {
@@ -260,8 +258,8 @@ div#select-board-dialog .selectBoardContainer .body .list .item.selected i {
260258
}
261259

262260
.arduino-board-dropdown-footer {
263-
color: var(--theia-arduino-branding-primary);
264-
border-top: 1px solid var(--theia-arduino-toolbar-dropdown-border);
261+
color: var(--theia-secondaryButton-foreground);
262+
border-top: 1px solid var(--theia-dropdown-border);
265263
}
266264

267265
/* High Contrast Theme rules */

‎arduino-ide-extension/src/browser/style/certificate-uploader-dialog.css‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,18 @@
77
}
88
.certificate-uploader-dialog .arduino-select__control {
99
height: 31px;
10-
background: var(--theia-menubar-selectionBackground) !important;
10+
background: var(--theia-dropdown-background) !important;
1111
}
1212

1313
.certificate-uploader-dialog .dialogRow > button{
1414
margin-right: 3px;
1515
}
1616

1717
.certificate-uploader-dialog .certificate-list {
18-
border: 1px solid #BDC7C7;
18+
border: 1px solid var(--theia-editorWidget-border);
1919
border-radius: 2px;;
20-
background: var(--theia-menubar-selectionBackground) !important;
20+
color: var(--theia-editor-foreground);
21+
background-color: var(--theia-editor-background);
2122
overflow: auto;
2223
height: 120px;
2324
flex: 1;
@@ -60,9 +61,10 @@
6061

6162
.certificate-add {
6263
padding: 16px;
63-
background-color: var(--theia-list-hoverBackground);
6464
border-radius: 3px;
65-
border: 1px solid #BDC7C7;
65+
border: 1px solid var(--theia-editorWidget-border);
66+
color: var(--theia-editorWidget-foreground);
67+
background-color: var(--theia-editorWidget-background);
6668
}
6769

6870
.certificate-add input {
@@ -72,9 +74,3 @@
7274
box-sizing: border-box;
7375

7476
}
75-
76-
/* High Contrast Theme rules */
77-
/* TODO: Remove it when the Theia version is upgraded to 1.27.0 and use Theia APIs to implement it*/
78-
.hc-black.hc-theia.theia-hc .certificate-add {
79-
background-color: var(--theia-editorWidget-background);
80-
}

‎arduino-ide-extension/src/browser/style/cloud-sketchbook.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696

9797
.cloud-sketchbook-welcome > .item .link {
9898
cursor: pointer;
99-
color: var(--theia-arduino-branding-primary);
99+
color: var(--theia-textLink-foreground);
100100
}
101101

102102
.pull-sketch-icon {

‎arduino-ide-extension/src/browser/style/dialogs.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
font-weight: 500;
1818
background-color: transparent;
1919
font-size: var(--theia-ui-font-size2);
20-
color: var(--theia-list-inactiveSelectionForeground);
20+
color: var(--theia-editorWidget-foreground);
2121
min-height: 0;
2222
}
2323

‎arduino-ide-extension/src/browser/style/editor.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
}
77

88
.monaco-list-row.show-file-icons.focused {
9-
background-color: #d6ebff;
9+
background-color: var(--theia-quickInputList-focusBackground);
1010
}
1111

1212
.monaco-editor .view-overlays .compiler-error {

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /