Skip to content

Commit 403fdbf

Browse files
author
Akos Kitta
committed
Removed a few custom colors and derived them from existing ones.
Fixed the color for the: - selected items in the Explorer, - warning `input`s, - set custom dialog background for the Arduino theme, - the query term matches in the command palette, and - react-select. Signed-off-by: Akos Kitta <[email protected]>
1 parent cbe603a commit 403fdbf

14 files changed

+1660
-1552
lines changed

‎.gitignore

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ downloads/
66
build/
77
!electron/build/
88
src-gen/
9-
browser-app/webpack.config.js
10-
electron-app/webpack.config.js
9+
*-app/*webpack.config.js
10+
.DS_Store
1111
/workspace/static
1212
.DS_Store
1313
# switching from `electron` to `browser` in dev mode.

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

+10-165
Original file line numberDiff line numberDiff line change
@@ -582,184 +582,29 @@ export class ArduinoFrontendContribution implements FrontendApplicationContribut
582582
registerColors(colors: ColorRegistry): void {
583583
colors.register(
584584
{
585-
id: 'arduino.base',
585+
id: 'arduino.branding.primary',
586586
defaults: {
587-
dark: '#616161',
588-
light: '#616161',
589-
hc: '#FFFFFF'
587+
dark: 'statusBar.background',
588+
light: 'statusBar.background'
590589
},
591-
description: 'Base layout color.'
590+
description: 'The primary branding color, such as dialog titles, library, and board manager list labels.'
592591
},
593592
{
594-
id: 'arduino.toolbarTooltip',
593+
id: 'arduino.branding.secondary',
595594
defaults: {
596-
dark: '#616161',
597-
light: '#616161',
598-
hc: '#FFFFFF'
595+
dark: 'statusBar.background',
596+
light: 'statusBar.background'
599597
},
600-
description: 'The color of the toolbar tooltip (shown next to the buttons).'
598+
description: 'Secondary branding color for list selections, dropdowns, and widget borders.'
601599
},
602600
{
603-
id: 'arduino.editorMargin',
604-
defaults: {
605-
dark: '#2e2e2e',
606-
light: '#EEEEEE',
607-
hc: 'contrastBorder'
608-
},
609-
description: 'The color of the border which separates line numbers from code area.'
610-
},
611-
{
612-
id: 'arduino.dialogTitle',
613-
defaults: {
614-
dark: 'foreground',
615-
light: 'foreground',
616-
hc: 'contrastBorder'
617-
},
618-
description: 'The color of a dialog title (e.g. in board selector dialog).'
619-
},
620-
{
621-
id: 'arduino.select',
622-
defaults: {
623-
624-
},
625-
description: 'Color of background and border of select component (in serial monitor).'
626-
},
627-
{
628-
id: 'arduino.selectItemHoverBackground',
629-
defaults: {
630-
light: '#d7eaf8',
631-
dark: '#24455e'
632-
},
633-
description: 'Color of background of hovered Item in select component (in serial monitor).'
634-
},
635-
{
636-
id: 'arduino.dialogSecondaryTitle',
637-
defaults: {
638-
dark: '#7f8c8d',
639-
light: '#7f8c8d'
640-
},
641-
description: 'Color of secondary titles in Arduino Dialogs.'
642-
},
643-
{
644-
id: 'arduino.secondaryButtonShadow',
645-
defaults: {
646-
dark: '#95a5a6',
647-
light: '#95a5a6'
648-
},
649-
description: 'Color of secondary button shadow.'
650-
},
651-
{
652-
id: 'arduino.buttonShadow',
653-
defaults: {
654-
dark: '#006468',
655-
light: '#006468'
656-
},
657-
description: 'Color of button shadow.'
658-
},
659-
{
660-
id: 'arduino.toolbarItemForeground',
661-
defaults: {
662-
dark: 'button.foreground',
663-
light: 'button.foreground'
664-
},
665-
description: 'Foreground color of toolbar items.'
666-
},
667-
{
668-
id: 'arduino.boardSelectorBackground',
601+
id: 'arduino.foreground',
669602
defaults: {
670603
dark: 'editorWidget.background',
671604
light: 'editorWidget.background',
672605
hc: 'editorWidget.background'
673606
},
674-
description: 'Background color of board selector toolbar item.'
675-
},
676-
{
677-
id: 'arduino.boardSelectorHoverBackground',
678-
defaults: {
679-
dark: '#383838',
680-
light: '#dae2e4'
681-
},
682-
description: 'Background color of board selector toolbar item.'
683-
},
684-
{
685-
id: 'arduino.boardSelectorBorder',
686-
defaults: {
687-
dark: '#757575',
688-
light: '#e0e0e0'
689-
},
690-
description: 'Border color of board selector toolbar item.'
691-
},
692-
{
693-
id: 'arduino.boardSelectorCheck',
694-
defaults: {
695-
dark: '#259fd8',
696-
light: '#2b75c0'
697-
},
698-
description: 'Color of board selector toolbar check item.'
699-
},
700-
{
701-
id: 'arduino.listOddItem',
702-
defaults: {
703-
dark: '#1d1d1d',
704-
light: '#ffffff'
705-
},
706-
description: 'Backgroundcolor of item with odd number in list widget'
707-
},
708-
{
709-
id: 'arduino.listEvenItem',
710-
defaults: {
711-
dark: '#252526',
712-
light: '#f7f9f9'
713-
},
714-
description: 'Backgroundcolor of item with even number in list widget'
715-
},
716-
{
717-
id: 'arduino.listItemHoverBackground',
718-
defaults: {
719-
dark: '#333333',
720-
light: '#ececec'
721-
},
722-
description: 'Backgroundcolor of hovered item in list widget'
723-
},
724-
{
725-
id: 'arduino.listItemSecondaryForeground',
726-
defaults: {
727-
dark: '#9e9e9e',
728-
light: '#9e9e9e'
729-
},
730-
description: 'Backgroundcolor of hovered item in list widget'
731-
},
732-
{
733-
id: 'arduino.listItemInstalledBadge',
734-
defaults: {
735-
dark: '#259fd8',
736-
light: '#2b75c0'
737-
},
738-
description: 'Color of badge for installed list items.'
739-
},
740-
{
741-
id: 'arduino.listItemInfoLinkForeground',
742-
defaults: {
743-
dark: '#2196f3',
744-
light: '#2196f3'
745-
},
746-
description: 'Color of info link in list items.'
747-
},
748-
{
749-
id: 'arduino.bottomPanelTabBackground',
750-
defaults: {
751-
dark: 'editorGroupHeader.tabsBackground',
752-
light: 'editorGroupHeader.tabsBackground'
753-
},
754-
description: 'Color of info link in list items.'
755-
},
756-
{
757-
id: 'arduino.toolbarToggleBackground',
758-
defaults: {
759-
dark: '#757575',
760-
light: '#9e9e9e'
761-
},
762-
description: 'Color of active toggles (as in serial monitor toolbar).'
607+
description: 'Color of the Arduino Pro IDE foreground which is used for dialogs, such as the Select Board dialog.'
763608
}
764609
);
765610
}

‎arduino-ide-extension/src/browser/arduino-frontend-module.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ const ElementQueries = require('css-element-queries/src/ElementQueries');
7676

7777
MonacoThemingService.register({
7878
id: 'arduinoTheme',
79-
label: 'Arduino Light Theme',
79+
label: 'Light (Arduino)',
8080
uiTheme: 'vs',
8181
json: require('../../src/browser/data/arduino.color-theme.json')
8282
});

‎arduino-ide-extension/src/browser/components/arduino-select.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export class ArduinoSelect<T> extends Select<T> {
4545
// `primary50`??? it's crazy but apparently, without this, we would get a light-blueish
4646
// color when selecting an option in the select by clicking and then not releasing the button.
4747
// https://react-select.com/styles#overriding-the-theme
48-
primary50: 'var(--theia-arduino-selectItemHoverBackground)',
48+
primary50: 'var(--theia-list-activeSelectionBackground)',
4949
}
5050
});
5151
const DropdownIndicator = () => <span className='fa fa-caret-down caret' />;

‎arduino-ide-extension/src/browser/components/component-list/list-item-renderer.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ export class ListItemRenderer<T extends ArduinoComponent> {
5151
const moreInfo = !!item.moreInfoLink && <a href={item.moreInfoLink} onClick={this.onMoreInfoClick}>More info</a>;
5252
const onClickInstall = () => install(item);
5353
const installButton = item.installable &&
54-
<button className='install' onClick={onClickInstall}>INSTALL</button>;
54+
<button className='theia-button install' onClick={onClickInstall}>INSTALL</button>;
5555

5656
const onSelectChange = (event: React.ChangeEvent<HTMLSelectElement>) => {
5757
const version = event.target.value;

0 commit comments

Comments
 (0)