diff --git a/bundles/org.eclipse.ui.themes/css/dark/e4-dark_ide_colorextensions.css b/bundles/org.eclipse.ui.themes/css/dark/e4-dark_ide_colorextensions.css index e0304a3b7d4..639ccc32110 100644 --- a/bundles/org.eclipse.ui.themes/css/dark/e4-dark_ide_colorextensions.css +++ b/bundles/org.eclipse.ui.themes/css/dark/e4-dark_ide_colorextensions.css @@ -122,25 +122,25 @@ ColorDefinition#org-eclipse-ui-workbench-INACTIVE_TAB_SELECTED_TEXT_COLOR { } ColorDefinition#org-eclipse-ui-workbench-ACTIVE_UNSELECTED_TABS_COLOR_START { - color: #494A4D; + color: #48484c; category: '#org-eclipse-ui-presentation-default'; label: url('platform:/plugin/org.eclipse.ui.themes?message=ACTIVE_UNSELECTED_TABS_COLOR_START'); } ColorDefinition#org-eclipse-ui-workbench-ACTIVE_UNSELECTED_TABS_COLOR_END { - color: #404043; + color: #48484c; category: '#org-eclipse-ui-presentation-default'; label: url('platform:/plugin/org.eclipse.ui.themes?message=ACTIVE_UNSELECTED_TABS_COLOR_END'); } ColorDefinition#org-eclipse-ui-workbench-ACTIVE_TAB_BG_START { - color: #2B2C2D; + color: #48484c; category: '#org-eclipse-ui-presentation-default'; label: url('platform:/plugin/org.eclipse.ui.themes?message=ACTIVE_TAB_BG_START'); } ColorDefinition#org-eclipse-ui-workbench-ACTIVE_TAB_BG_END { - color: #292929; + color: #48484c; category: '#org-eclipse-ui-presentation-default'; label: url('platform:/plugin/org.eclipse.ui.themes?message=ACTIVE_TAB_BG_END'); } @@ -158,25 +158,25 @@ ColorDefinition#org-eclipse-ui-workbench-ACTIVE_TAB_INNER_KEYLINE_COLOR { } ColorDefinition#org-eclipse-ui-workbench-ACTIVE_TAB_OUTLINE_COLOR { - color: #4B4C4F; + color: #48484c; category: '#org-eclipse-ui-presentation-default'; label: url('platform:/plugin/org.eclipse.ui.themes?message=ACTIVE_TAB_OUTLINE_COLOR'); } ColorDefinition#org-eclipse-ui-workbench-ACTIVE_TAB_TEXT_COLOR { - color: #DDDDDD; + color: #bbbbbb; category: '#org-eclipse-ui-presentation-default'; label: url('platform:/plugin/org.eclipse.ui.themes?message=ACTIVE_TAB_TEXT_COLOR'); } ColorDefinition#org-eclipse-ui-workbench-ACTIVE_TAB_UNSELECTED_TEXT_COLOR { - color: #DDDDDD; + color: #bbbbbb; category: '#org-eclipse-ui-presentation-default'; label: url('platform:/plugin/org.eclipse.ui.themes?message=ACTIVE_TAB_UNSELECTED_TEXT_COLOR'); } ColorDefinition#org-eclipse-ui-workbench-ACTIVE_TAB_SELECTED_TEXT_COLOR { - color: #f7f8f8; + color: #ffffff; category: '#org-eclipse-ui-presentation-default'; label: url('platform:/plugin/org.eclipse.ui.themes?message=ACTIVE_TAB_SELECTED_TEXT_COLOR'); } @@ -194,13 +194,13 @@ ColorDefinition#org-eclipse-ui-workbench-ACTIVE_NOFOCUS_TAB_BG_END { } ColorDefinition#org-eclipse-ui-workbench-ACTIVE_NOFOCUS_TAB_TEXT_COLOR { - color: #CCCCCC; + color: #bbbbbb; category: '#org-eclipse-ui-presentation-default'; label: url('platform:/plugin/org.eclipse.ui.themes?message=ACTIVE_NOFOCUS_TAB_TEXT_COLOR'); } ColorDefinition#org-eclipse-ui-workbench-ACTIVE_NOFOCUS_TAB_SELECTED_TEXT_COLOR { - color: #CCCCCC; + color: #ffffff; category: '#org-eclipse-ui-presentation-default'; label: url('platform:/plugin/org.eclipse.ui.themes?message=ACTIVE_NOFOCUS_TAB_SELECTED_TEXT_COLOR'); } diff --git a/bundles/org.eclipse.ui.themes/css/dark/e4-dark_preferencestyle.css b/bundles/org.eclipse.ui.themes/css/dark/e4-dark_preferencestyle.css index e08713009f9..229475b5a11 100644 --- a/bundles/org.eclipse.ui.themes/css/dark/e4-dark_preferencestyle.css +++ b/bundles/org.eclipse.ui.themes/css/dark/e4-dark_preferencestyle.css @@ -15,14 +15,12 @@ *******************************************************************************/ /* ############################## Eclipse UI properties ############################## */ - - IEclipsePreferences#org-eclipse-ui-editors:org-eclipse-ui-themes { /* pseudo attribute added to allow contributions without replacing this node, see Bug 466075 */ preferences: 'AbstractTextEditor.Color.Background.SystemDefault=false' 'AbstractTextEditor.Color.SelectionForeground.SystemDefault=false' 'AbstractTextEditor.Color.SelectionBackground.SystemDefault=false' - 'AbstractTextEditor.Color.Background=47,47,47' + 'AbstractTextEditor.Color.Background=30,31,34' 'AbstractTextEditor.Color.Foreground.SystemDefault=false' 'AbstractTextEditor.Color.SelectionBackground=33,66,131' 'AbstractTextEditor.Color.SelectionForeground=147,161,161' diff --git a/bundles/org.eclipse.ui.themes/css/e4-dark_mac.css b/bundles/org.eclipse.ui.themes/css/e4-dark_mac.css index 17873c94eb7..a0e8c35f4fe 100644 --- a/bundles/org.eclipse.ui.themes/css/e4-dark_mac.css +++ b/bundles/org.eclipse.ui.themes/css/e4-dark_mac.css @@ -53,3 +53,68 @@ Button { color: unset; } +/* Below changes include enhancement to the existing dark theme with ref to other IDEs like IntelliJ, VS Code etc. */ + +/* Inactive view tabs */ +.MPartStack { + swt-draw-custom-tab-content-background: true; + swt-unselected-hot-tab-color-background: #48484c; +} + +CTabFolder{ + swt-selected-tab-highlight: #2b79d7; + swt-selected-highlight-top: false; +} + +CTabFolder.active { + swt-selected-tab-highlight: #2b79d7; + swt-selected-highlight-top: false; +} + +/*text color of selected tab in editor */ +#org-eclipse-ui-editorss CTabItem:selected{ + color: '#FFFFFF'; +} + +#org-eclipse-ui-editorss CTabFolder{ + swt-selected-tab-fill : '#1E1F22'; + swt-selected-tab-highlight: '#2b79d7'; + swt-selected-highlight-top: true; +} + +#org-eclipse-ui-editorss CTabFolder.active { + swt-selected-tab-highlight: '#2b79d7'; + swt-selected-highlight-top: true; +} + +CTabFolder[style~='SWT.DOWN'][style~='SWT.BOTTOM'] { + /* Set the styles for the bottom inner tabs (Bug 430051): */ + swt-tab-renderer: url('bundleclass://org.eclipse.e4.ui.workbench.renderers.swt/org.eclipse.e4.ui.workbench.renderers.swt.CTabRendering'); + swt-selected-tab-fill: #1E1F22; + swt-unselected-tabs-color: #48484c; + swt-unselected-hot-tab-color-background: #2f2f2f; + swt-selected-tab-highlight: #2b79d7; + swt-selected-highlight-top: false; +} + +#DebugBreadcrumbItemComposite, +#DebugBreadcrumbItemDropDownToolBar, +#DebugBreadcrumbItemDetailComposite, +#DebugBreadcrumbItemDetailImageComposite, +#DebugBreadcrumbItemDetailImageLabel, +#DebugBreadcrumbItemDetailTextComposite, +#DebugBreadcrumbItemDetailTextLabel { + background-color: '#1E1F22'; +} + +.MPart Form Composite, +.MPart Form Composite Tree, +.MPartStack.active .MPart Form Composite Tree +{ + background-color: #1E1F22; +} + +.MPart Form AdtFormToolkit-AdtHyperLink{ + background-color: inherit; +} + diff --git a/bundles/org.eclipse.ui.themes/css/e4-dark_win.css b/bundles/org.eclipse.ui.themes/css/e4-dark_win.css index 0b0afa540d0..3e6d803576c 100644 --- a/bundles/org.eclipse.ui.themes/css/e4-dark_win.css +++ b/bundles/org.eclipse.ui.themes/css/e4-dark_win.css @@ -135,3 +135,67 @@ ImageBasedFrame, color: #DDDDDD; } +/* Below changes include enhancement to the existing dark theme with ref to other IDEs like IntelliJ, VS Code etc. */ + +/* Inactive view tabs */ +.MPartStack { + swt-draw-custom-tab-content-background: true; + swt-unselected-hot-tab-color-background: #48484c; +} + +CTabFolder{ + swt-selected-tab-highlight: #2b79d7; + swt-selected-highlight-top: false; +} + +CTabFolder.active { + swt-selected-tab-highlight: #2b79d7; + swt-selected-highlight-top: false; +} + +/*text color of selected tab in editor */ +#org-eclipse-ui-editorss CTabItem:selected{ + color: '#FFFFFF'; +} + +#org-eclipse-ui-editorss CTabFolder{ + swt-selected-tab-fill : '#1E1F22'; + swt-selected-tab-highlight: '#2b79d7'; + swt-selected-highlight-top: true; +} + +#org-eclipse-ui-editorss CTabFolder.active { + swt-selected-tab-highlight: '#2b79d7'; + swt-selected-highlight-top: true; +} + +CTabFolder[style~='SWT.DOWN'][style~='SWT.BOTTOM'] { + /* Set the styles for the bottom inner tabs (Bug 430051): */ + swt-tab-renderer: url('bundleclass://org.eclipse.e4.ui.workbench.renderers.swt/org.eclipse.e4.ui.workbench.renderers.swt.CTabRendering'); + swt-selected-tab-fill: #1E1F22; + swt-unselected-tabs-color: #48484c; + swt-unselected-hot-tab-color-background: #2f2f2f; + swt-selected-tab-highlight: #2b79d7; + swt-selected-highlight-top: false; +} + +#DebugBreadcrumbItemComposite, +#DebugBreadcrumbItemDropDownToolBar, +#DebugBreadcrumbItemDetailComposite, +#DebugBreadcrumbItemDetailImageComposite, +#DebugBreadcrumbItemDetailImageLabel, +#DebugBreadcrumbItemDetailTextComposite, +#DebugBreadcrumbItemDetailTextLabel { + background-color: '#1E1F22'; +} + +.MPart Form Composite, +.MPart Form Composite Tree, +.MPartStack.active .MPart Form Composite Tree +{ + background-color: #1E1F22; +} + +.MPart Form AdtFormToolkit-AdtHyperLink{ + background-color: inherit; +}