From 4319f3657dc6af8f7297f55bda495191023044f8 Mon Sep 17 00:00:00 2001 From: Madhumitha M V Date: Thu, 18 Jul 2024 15:42:50 +0530 Subject: [PATCH 1/4] Improvement to the existing Light Theme As part of Eclipse modernization project, we have enhanced the look and feel of Eclipse IDE. This change includes improvements to the background color of Views and working of tabs. This has been done with reference to the other IDEs like VS Code, Intellij etc. --- .../css/e4_default_mac.css | 201 ++++++++++++++---- .../css/e4_default_win.css | 197 +++++++++++++++-- 2 files changed, 345 insertions(+), 53 deletions(-) diff --git a/bundles/org.eclipse.ui.themes/css/e4_default_mac.css b/bundles/org.eclipse.ui.themes/css/e4_default_mac.css index 90871c176a5..0fbc3fdd69b 100644 --- a/bundles/org.eclipse.ui.themes/css/e4_default_mac.css +++ b/bundles/org.eclipse.ui.themes/css/e4_default_mac.css @@ -18,88 +18,217 @@ @import url("platform:/plugin/org.eclipse.ui.themes/css/e4_basestyle.css"); ColorDefinition#org-eclipse-ui-workbench-ACTIVE_UNSELECTED_TABS_COLOR_START { - color: rgb(255, 255, 255); + color: #F8F8F8; } ColorDefinition#org-eclipse-ui-workbench-ACTIVE_UNSELECTED_TABS_COLOR_END { - color: rgb(255, 255, 255); + color: #F8F8F8; } ColorDefinition#org-eclipse-ui-workbench-INACTIVE_UNSELECTED_TABS_COLOR_START { - color: rgb(255, 255, 255); + color: #F8F8F8; } ColorDefinition#org-eclipse-ui-workbench-INACTIVE_UNSELECTED_TABS_COLOR_END { - color: rgb(255, 255, 255); + color: #F8F8F8; } ColorDefinition#org-eclipse-ui-workbench-ACTIVE_TAB_OUTER_KEYLINE_COLOR { - color: rgb(230, 230, 230); + color: #EAEAEA; +} + +ColorDefinition#org-eclipse-ui-workbench-ACTIVE_TAB_OUTLINE_COLOR { + color: #f8f8f8; } ColorDefinition#org-eclipse-ui-workbench-ACTIVE_TAB_BG_START { - color: rgb(230, 230, 230); + color: #f8f8f8; } ColorDefinition#org-eclipse-ui-workbench-ACTIVE_TAB_BG_END { - color: rgb(255, 255, 255); + color: #f8f8f8; +} + +ColorDefinition#org-eclipse-ui-workbench-INACTIVE_TAB_OUTER_KEYLINE_COLOR { + color: #EAEAEA; +} + +ColorDefinition#org-eclipse-ui-workbench-INACTIVE_TAB_OUTLINE_COLOR { + color: #f8f8f8; } ColorDefinition#org-eclipse-ui-workbench-INACTIVE_TAB_BG_START { - color: rgb(240, 240, 240); + color: #F8F8F8; } ColorDefinition#org-eclipse-ui-workbench-INACTIVE_TAB_BG_END { - color: rgb(255, 255, 255); + color: #F8F8F8; +} + +ColorDefinition#org-eclipse-ui-workbench-ACTIVE_NOFOCUS_TAB_BG_START { + color: #F8F8F8; +} + +ColorDefinition#org-eclipse-ui-workbench-ACTIVE_NOFOCUS_TAB_BG_END { + color: #F8F8F8; +} + +ColorDefinition#org-eclipse-ui-workbench-ACTIVE_NOFOCUS_TAB_TEXT_COLOR { + color: #404040; +} + +ColorDefinition#org-eclipse-ui-workbench-ACTIVE_TAB_TEXT_COLOR { + color: #404040; +} + +ColorDefinition#org-eclipse-ui-workbench-INACTIVE_TAB_TEXT_COLOR { + color: #404040; } .MTrimmedWindow { - background-color: rgb(255, 255, 255); + background-color: '#f8f8f8'; } .MTrimBar { - background-color: rgb(255, 255, 255); + background-color: '#f8f8f8'; } .MTrimBar#org-eclipse-ui-main-toolbar { - background-color: rgb(255, 255, 255); + background-color: '#f8f8f8'; +} + +CTabFolder Canvas { + background-color: rgb(255, 255, 255); +} + +/* Below changes were added to enhance the appearance of Light theme with ref to other IDEs like VS Code,IntelliJ etc. */ + +.MTrimBar#org-eclipse-ui-trim-status { + background-color: '#f8f8f8'; + } -.MPartStack { - swt-simple: false; - swt-unselected-tabs-color: rgb(255, 255, 255); - swt-outer-keyline-color: rgb(230, 230, 230); - swt-inner-keyline-color: rgb(200, 200, 200); - swt-tab-outline: rgb(230, 230, 230); +.View Composite, +.View Composite Tree, +.View Composite Label, +.View ToolBar, +.View Group, +.View Group Label, +.View Section, +.View Text[style~='SWT.READ_ONLY'], +.View SashForm, +.View OleFrame, +.View Browser, +.View WebSite, +.View StyledText[style~='SWT.READ_ONLY'], +.View Link, +.View FormText, +.View Hyperlink, +.View AtcProblemsViewWelcomePage StyledText +{ + background-color: #f8f8f8; } -.MPartStack.active > Composite { - swt-selected-tab-fill: '#org-eclipse-ui-workbench-ACTIVE_TAB_BG_START' '#org-eclipse-ui-workbench-ACTIVE_TAB_BG_END' 100% 5%; - background-color: rgb(255, 255, 255); +.View ToolItem, +.View Button{ + background-color: inherit; +} + +.View Section ToolItem{ + background-color: #EAEAEA; +} + +.View Composite PrependingAsteriskFilteredTree, +.View PrependingAsteriskFilteredTree Text, +.View LoggingViewFilteredTree, +.View LoggingViewFilteredTree Text, +.View Group Text, +.View Group Combo, +.View Composite Text, +.View OSLPackageSetTableComposite Label, +.View Button[style~='SWT.PUSH']{ + background-color: #ffffff; +} + +.MPartStack{ + swt-selected-tab-highlight: #5983c5; + swt-selected-highlight-top: false; } .MPartStack.active { - swt-tab-outline: rgb(180, 180, 180); - swt-outer-keyline-color: rgb(180, 180, 180); + swt-selected-tab-highlight: #5983c5; + swt-selected-highlight-top: false; } -CTabFolder.MArea { - background-color: rgb(255, 255, 255); - swt-selected-tab-fill: rgb(255, 255, 255); - swt-unselected-tabs-color: rgb(255, 255, 255); - swt-outer-keyline-color: rgb(230, 230, 230); - swt-inner-keyline-color: rgb(230, 230, 230); - swt-tab-outline: rgb(230, 230, 230); +/* text color of unselected tabs in editor*/ +#org-eclipse-ui-editorss CTabItem{ + color: '#6A6A6A'; + background-color: '#f8f8f8'; } -CTabFolder { - swt-selected-tabs-background: rgb(255, 255, 255); +/*text color and background color of selected tab in editor */ +#org-eclipse-ui-editorss CTabItem:selected{ + color: '#3b3b3b'; + background-color: '#FFFFFF'; } -CTabFolder CTabItem:selected { - background-color: rgb(230, 230, 230); +#org-eclipse-ui-editorss CTabFolder{ + swt-selected-tab-fill : '#ffffff'; + swt-selected-tab-highlight: '#5983c5'; + swt-selected-highlight-top: true; + swt-tab-outline:#eaeaea; + swt-tab-outer-keyline: #eaeaea; } -CTabFolder Canvas { - background-color: rgb(255, 255, 255); +#org-eclipse-ui-editorss CTabFolder.active { + swt-selected-tab-highlight: '#5983c5'; + swt-selected-highlight-top: true; +} + +#org-eclipse-e4-ui-compatibility-editor Composite{ + background-color: #ffffff; +} + +#DebugBreadcrumbItemComposite, +#DebugBreadcrumbItemDropDownToolBar, +#DebugBreadcrumbItemDetailComposite, +#DebugBreadcrumbItemDetailImageComposite, +#DebugBreadcrumbItemDetailImageLabel, +#DebugBreadcrumbItemDetailTextComposite, +#DebugBreadcrumbItemDetailTextLabel { + background-color: '#FFFFFF'; +} + +Composite.MPartSashContainer{ + background-color: #f8f8f8; +} + +Composite.MArea{ + background-color: #ffffff; +} + +.MPart CTabFolder{ + swt-outer-keyline-color: #ffffff; +} + +.MPart Form Composite, +.MPart Form Section, +.MPart Form Label, +.MPart Form Text, +.MPart Form Button, +.MPart Form Sash, +.MPart Form AdtFormToolkit-AdtHyperLink +{ + background-color: '#FFFFFF'; +} + +.MPartStack.active .MPart Form Composite, +.MPartStack.active .MPart Form Section, +.MPartStack.active .MPart Form Label, +.MPartStack.active .MPart Form Text, +.MPartStack.active .MPart Form Button, +.MPartStack.active .MPart Form Sash, +.MPartStack.active .MPart Form AdtFormToolkit-AdtHyperLink +{ + background-color: '#FFFFFF'; } diff --git a/bundles/org.eclipse.ui.themes/css/e4_default_win.css b/bundles/org.eclipse.ui.themes/css/e4_default_win.css index 6e66f99f665..e41ac0d3dcc 100644 --- a/bundles/org.eclipse.ui.themes/css/e4_default_win.css +++ b/bundles/org.eclipse.ui.themes/css/e4_default_win.css @@ -19,43 +19,71 @@ @import url("platform:/plugin/org.eclipse.ui.themes/css/e4_basestyle.css"); ColorDefinition#org-eclipse-ui-workbench-ACTIVE_UNSELECTED_TABS_COLOR_START { - color: #F2F2F2; + color: #F8F8F8; } ColorDefinition#org-eclipse-ui-workbench-ACTIVE_UNSELECTED_TABS_COLOR_END { - color: #F0F0F0; + color: #F8F8F8; } ColorDefinition#org-eclipse-ui-workbench-ACTIVE_TAB_OUTER_KEYLINE_COLOR { - color: #DADADA; + color: #E5E5E5; } ColorDefinition#org-eclipse-ui-workbench-ACTIVE_TAB_OUTLINE_COLOR { - color: #DADADA; + color: #f8f8f8; } ColorDefinition#org-eclipse-ui-workbench-INACTIVE_UNSELECTED_TABS_COLOR_START { - color: #E8E8E8; + color: #F8F8F8; } ColorDefinition#org-eclipse-ui-workbench-INACTIVE_UNSELECTED_TABS_COLOR_END { - color: #E4E4E4; + color: #F8F8F8; } ColorDefinition#org-eclipse-ui-workbench-INACTIVE_TAB_OUTER_KEYLINE_COLOR { - color: #DADADA; + color: #E5E5E5; } ColorDefinition#org-eclipse-ui-workbench-INACTIVE_TAB_OUTLINE_COLOR { - color: #DADADA; + color: #f8f8f8; } ColorDefinition#org-eclipse-ui-workbench-INACTIVE_TAB_BG_START { - color: #F2F2F2; + color: #F8F8F8; } ColorDefinition#org-eclipse-ui-workbench-INACTIVE_TAB_BG_END { - color: #F0F0F0; + color: #F8F8F8; +} + +ColorDefinition#org-eclipse-ui-workbench-ACTIVE_TAB_BG_START{ + color: #f8f8f8; +} + +ColorDefinition#org-eclipse-ui-workbench-ACTIVE_TAB_BG_END { + color: #f8f8f8; +} + +ColorDefinition#org-eclipse-ui-workbench-ACTIVE_NOFOCUS_TAB_BG_START { + color: #F8F8F8; +} + +ColorDefinition#org-eclipse-ui-workbench-ACTIVE_NOFOCUS_TAB_BG_END { + color: #F8F8F8; +} + +ColorDefinition#org-eclipse-ui-workbench-ACTIVE_NOFOCUS_TAB_TEXT_COLOR { + color: #3b3b3b; +} + +ColorDefinition#org-eclipse-ui-workbench-ACTIVE_TAB_TEXT_COLOR { + color: #3b3b3b; +} + +ColorDefinition#org-eclipse-ui-workbench-INACTIVE_TAB_TEXT_COLOR { + color: #3b3b3b; } .MPartStack { @@ -63,14 +91,149 @@ ColorDefinition#org-eclipse-ui-workbench-INACTIVE_TAB_BG_END { } CTabFolder.MArea { - background-color: #F0F0F0; - swt-selected-tab-fill: #F0F0F0; - swt-unselected-tabs-color: #F0F0F0; - swt-outer-keyline-color: #F0F0F0; - swt-inner-keyline-color: #F0F0F0; - swt-tab-outline: #F0F0F0; + background-color: #f8f8f8; + swt-selected-tab-fill: #f8f8f8; + swt-unselected-tabs-color: #f8f8f8; + swt-outer-keyline-color: #f8f8f8; + swt-inner-keyline-color: #f8f8f8; + swt-tab-outline: #ffffff; } CTabFolder Canvas { - background-color: #F8F8F8; + background-color: #ffffff; +} + +/* Below changes were added to enhance the appearance of Light theme with ref to other IDEs like VS Code,IntelliJ etc. */ + +.MTrimBar#org-eclipse-ui-main-toolbar { + background-color: '#f8f8f8'; +} + +.MTrimBar#org-eclipse-ui-trim-status { + background-color: '#f8f8f8'; +} + +.View Composite, +.View Composite Tree, +.View Composite Label, +.View ToolBar, +.View Group, +.View Group Label, +.View Section, +.View Text[style~='SWT.READ_ONLY'], +.View SashForm, +.View OleFrame, +.View Browser, +.View WebSite, +.View StyledText[style~='SWT.READ_ONLY'], +.View Link, +.View FormText, +.View Hyperlink, +.View AtcProblemsViewWelcomePage StyledText +{ + background-color: #f8f8f8; +} + +.View ToolItem, +.View Button{ + background-color: inherit; +} + +.View Section ToolItem{ + background-color: #EAEAEA; +} + +.View Composite PrependingAsteriskFilteredTree, +.View PrependingAsteriskFilteredTree Text, +.View LoggingViewFilteredTree, +.View LoggingViewFilteredTree Text, +.View Group Text, +.View Group Combo, +.View Composite Text, +.View OSLPackageSetTableComposite Label, +.View Button[style~='SWT.PUSH']{ + background-color: #ffffff; +} + +.MPartStack{ + swt-selected-tab-highlight: #2160bb; + swt-selected-highlight-top: false; +} + +.MPartStack.active { + swt-selected-tab-highlight: #2160bb; + swt-selected-highlight-top: false; +} + +/* text color and background color of unselected tabs in editor*/ +#org-eclipse-ui-editorss CTabItem{ + color: '#6A6A6A'; + background-color: '#f8f8f8'; +} + +/*text color and background color of selected tab in editor */ +#org-eclipse-ui-editorss CTabItem:selected{ + color: '#3b3b3b'; + background-color: '#FFFFFF'; +} + +#org-eclipse-ui-editorss CTabFolder{ + swt-selected-tab-fill : '#ffffff'; + swt-selected-tab-highlight: '#2160bb'; + swt-selected-highlight-top: true; + swt-tab-outline:#e5e5e5; + swt-tab-outer-keyline: #e5e5e5; +} + +#org-eclipse-ui-editorss CTabFolder.active { + swt-selected-tab-highlight: '#2160bb'; + swt-selected-highlight-top: true; +} + +#org-eclipse-e4-ui-compatibility-editor Composite{ + background-color: #ffffff; +} + +#DebugBreadcrumbItemComposite, +#DebugBreadcrumbItemDropDownToolBar, +#DebugBreadcrumbItemDetailComposite, +#DebugBreadcrumbItemDetailImageComposite, +#DebugBreadcrumbItemDetailImageLabel, +#DebugBreadcrumbItemDetailTextComposite, +#DebugBreadcrumbItemDetailTextLabel { + background-color: '#FFFFFF'; +} + +Composite.MPartSashContainer{ + background-color: #f8f8f8; +} + +Composite.MArea{ + background-color: #ffffff; +} + +.MPart CTabFolder{ + swt-outer-keyline-color: #ffffff; +} + +.MPart Form Composite, +.MPart Form Section, +.MPart Form Label, +.MPart Form Text, +.MPart Form Button, +.MPart Form Sash, +.MPart Form AdtFormToolkit-AdtHyperLink +{ + background-color: '#FFFFFF'; +} + +.MPartStack.active .MPart Form Composite, +.MPartStack.active .MPart Form Section, +.MPartStack.active .MPart Form Label, +.MPartStack.active .MPart Form Text, +.MPartStack.active .MPart Form Button, +.MPartStack.active .MPart Form Sash, +.MPartStack.active .MPart Form AdtFormToolkit-AdtHyperLink +{ + background-color: '#FFFFFF'; } From c509c76b48d7913618d3056f158abb603c7a0f73 Mon Sep 17 00:00:00 2001 From: Madhumitha M V Date: Thu, 18 Jul 2024 22:49:01 +0530 Subject: [PATCH 2/4] Improvement to the existing dark theme Current dark theme has many issues with the background color and contrasts. As a first step to improve dark theme, we have changed the background color of the editor, making it the darkest when compared to other views. Also, the working of tabs are made simple wrt to the background colors and gradients. These changes were made by referring other IDEs like VS Code and IntelliJ. Now, eclipse dark theme also looks modern. --- .../css/dark/e4-dark_ide_colorextensions.css | 20 +++--- .../css/dark/e4-dark_preferencestyle.css | 15 ++++- .../org.eclipse.ui.themes/css/e4-dark_mac.css | 65 +++++++++++++++++++ .../org.eclipse.ui.themes/css/e4-dark_win.css | 64 ++++++++++++++++++ 4 files changed, 153 insertions(+), 11 deletions(-) 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..f6f4e985e24 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 @@ -16,13 +16,26 @@ /* ############################## Eclipse UI properties ############################## */ +IEclipsePreferences#org-eclipse-ui-workbench:com-sap-adt-tools-abapsource-ui { + preferences: + 'com.sap.adt.tools.abapsource.ui.keyword=86,165,228' + 'com.sap.adt.tools.abapsource.ui.literal=30,181,64' + 'com.sap.adt.tools.abapsource.ui.literal.number=91,233,254' + 'com.sap.adt.tools.abapsource.ui.comment=128,128,128' /* same as in JDT */ + 'com.sap.adt.tools.abapsource.ui.error=208,0,3' + 'com.sap.adt.tools.abapsource.ui.default=204,204,204' /* identifiers: same as normal font color e.g. in project explorer */ + 'com.sap.adt.tools.abapsource.ui.sqlScriptBackground= 95,98,98' /* just some lighter black */ + 'com.sap.adt.tools.abapsource.ui.abapMethodBackground=20,20,20' /* same as eclipse default text editor background */ + 'com.sap.adt.tools.abapsource.ui.enhancementPopupSelectedCodeBackground=41,41,41' +} + 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; +} From a90ece5a6f00393da2c2c5cc56c3312240f89694 Mon Sep 17 00:00:00 2001 From: Madhumitha M V Date: Fri, 19 Jul 2024 10:42:44 +0530 Subject: [PATCH 3/4] Removed ADT specific changes --- .../css/dark/e4-dark_preferencestyle.css | 15 --------------- 1 file changed, 15 deletions(-) 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 f6f4e985e24..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,21 +15,6 @@ *******************************************************************************/ /* ############################## Eclipse UI properties ############################## */ - -IEclipsePreferences#org-eclipse-ui-workbench:com-sap-adt-tools-abapsource-ui { - preferences: - 'com.sap.adt.tools.abapsource.ui.keyword=86,165,228' - 'com.sap.adt.tools.abapsource.ui.literal=30,181,64' - 'com.sap.adt.tools.abapsource.ui.literal.number=91,233,254' - 'com.sap.adt.tools.abapsource.ui.comment=128,128,128' /* same as in JDT */ - 'com.sap.adt.tools.abapsource.ui.error=208,0,3' - 'com.sap.adt.tools.abapsource.ui.default=204,204,204' /* identifiers: same as normal font color e.g. in project explorer */ - 'com.sap.adt.tools.abapsource.ui.sqlScriptBackground= 95,98,98' /* just some lighter black */ - 'com.sap.adt.tools.abapsource.ui.abapMethodBackground=20,20,20' /* same as eclipse default text editor background */ - 'com.sap.adt.tools.abapsource.ui.enhancementPopupSelectedCodeBackground=41,41,41' -} - - 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' From 9e05fd50387adfeddc270847f01ff37659cf352b Mon Sep 17 00:00:00 2001 From: Madhumitha M V Date: Fri, 19 Jul 2024 16:14:49 +0530 Subject: [PATCH 4/4] Reverting Light Theme changes --- .../css/e4_default_mac.css | 201 ++++-------------- .../css/e4_default_win.css | 197 ++--------------- 2 files changed, 53 insertions(+), 345 deletions(-) diff --git a/bundles/org.eclipse.ui.themes/css/e4_default_mac.css b/bundles/org.eclipse.ui.themes/css/e4_default_mac.css index 0fbc3fdd69b..90871c176a5 100644 --- a/bundles/org.eclipse.ui.themes/css/e4_default_mac.css +++ b/bundles/org.eclipse.ui.themes/css/e4_default_mac.css @@ -18,217 +18,88 @@ @import url("platform:/plugin/org.eclipse.ui.themes/css/e4_basestyle.css"); ColorDefinition#org-eclipse-ui-workbench-ACTIVE_UNSELECTED_TABS_COLOR_START { - color: #F8F8F8; + color: rgb(255, 255, 255); } ColorDefinition#org-eclipse-ui-workbench-ACTIVE_UNSELECTED_TABS_COLOR_END { - color: #F8F8F8; + color: rgb(255, 255, 255); } ColorDefinition#org-eclipse-ui-workbench-INACTIVE_UNSELECTED_TABS_COLOR_START { - color: #F8F8F8; + color: rgb(255, 255, 255); } ColorDefinition#org-eclipse-ui-workbench-INACTIVE_UNSELECTED_TABS_COLOR_END { - color: #F8F8F8; + color: rgb(255, 255, 255); } ColorDefinition#org-eclipse-ui-workbench-ACTIVE_TAB_OUTER_KEYLINE_COLOR { - color: #EAEAEA; -} - -ColorDefinition#org-eclipse-ui-workbench-ACTIVE_TAB_OUTLINE_COLOR { - color: #f8f8f8; + color: rgb(230, 230, 230); } ColorDefinition#org-eclipse-ui-workbench-ACTIVE_TAB_BG_START { - color: #f8f8f8; + color: rgb(230, 230, 230); } ColorDefinition#org-eclipse-ui-workbench-ACTIVE_TAB_BG_END { - color: #f8f8f8; -} - -ColorDefinition#org-eclipse-ui-workbench-INACTIVE_TAB_OUTER_KEYLINE_COLOR { - color: #EAEAEA; -} - -ColorDefinition#org-eclipse-ui-workbench-INACTIVE_TAB_OUTLINE_COLOR { - color: #f8f8f8; + color: rgb(255, 255, 255); } ColorDefinition#org-eclipse-ui-workbench-INACTIVE_TAB_BG_START { - color: #F8F8F8; + color: rgb(240, 240, 240); } ColorDefinition#org-eclipse-ui-workbench-INACTIVE_TAB_BG_END { - color: #F8F8F8; -} - -ColorDefinition#org-eclipse-ui-workbench-ACTIVE_NOFOCUS_TAB_BG_START { - color: #F8F8F8; -} - -ColorDefinition#org-eclipse-ui-workbench-ACTIVE_NOFOCUS_TAB_BG_END { - color: #F8F8F8; -} - -ColorDefinition#org-eclipse-ui-workbench-ACTIVE_NOFOCUS_TAB_TEXT_COLOR { - color: #404040; -} - -ColorDefinition#org-eclipse-ui-workbench-ACTIVE_TAB_TEXT_COLOR { - color: #404040; -} - -ColorDefinition#org-eclipse-ui-workbench-INACTIVE_TAB_TEXT_COLOR { - color: #404040; + color: rgb(255, 255, 255); } .MTrimmedWindow { - background-color: '#f8f8f8'; + background-color: rgb(255, 255, 255); } .MTrimBar { - background-color: '#f8f8f8'; + background-color: rgb(255, 255, 255); } .MTrimBar#org-eclipse-ui-main-toolbar { - background-color: '#f8f8f8'; -} - -CTabFolder Canvas { - background-color: rgb(255, 255, 255); -} - -/* Below changes were added to enhance the appearance of Light theme with ref to other IDEs like VS Code,IntelliJ etc. */ - -.MTrimBar#org-eclipse-ui-trim-status { - background-color: '#f8f8f8'; - + background-color: rgb(255, 255, 255); } -.View Composite, -.View Composite Tree, -.View Composite Label, -.View ToolBar, -.View Group, -.View Group Label, -.View Section, -.View Text[style~='SWT.READ_ONLY'], -.View SashForm, -.View OleFrame, -.View Browser, -.View WebSite, -.View StyledText[style~='SWT.READ_ONLY'], -.View Link, -.View FormText, -.View Hyperlink, -.View AtcProblemsViewWelcomePage StyledText -{ - background-color: #f8f8f8; +.MPartStack { + swt-simple: false; + swt-unselected-tabs-color: rgb(255, 255, 255); + swt-outer-keyline-color: rgb(230, 230, 230); + swt-inner-keyline-color: rgb(200, 200, 200); + swt-tab-outline: rgb(230, 230, 230); } -.View ToolItem, -.View Button{ - background-color: inherit; -} - -.View Section ToolItem{ - background-color: #EAEAEA; -} - -.View Composite PrependingAsteriskFilteredTree, -.View PrependingAsteriskFilteredTree Text, -.View LoggingViewFilteredTree, -.View LoggingViewFilteredTree Text, -.View Group Text, -.View Group Combo, -.View Composite Text, -.View OSLPackageSetTableComposite Label, -.View Button[style~='SWT.PUSH']{ - background-color: #ffffff; -} - -.MPartStack{ - swt-selected-tab-highlight: #5983c5; - swt-selected-highlight-top: false; +.MPartStack.active > Composite { + swt-selected-tab-fill: '#org-eclipse-ui-workbench-ACTIVE_TAB_BG_START' '#org-eclipse-ui-workbench-ACTIVE_TAB_BG_END' 100% 5%; + background-color: rgb(255, 255, 255); } .MPartStack.active { - swt-selected-tab-highlight: #5983c5; - swt-selected-highlight-top: false; -} - -/* text color of unselected tabs in editor*/ -#org-eclipse-ui-editorss CTabItem{ - color: '#6A6A6A'; - background-color: '#f8f8f8'; -} - -/*text color and background color of selected tab in editor */ -#org-eclipse-ui-editorss CTabItem:selected{ - color: '#3b3b3b'; - background-color: '#FFFFFF'; -} - -#org-eclipse-ui-editorss CTabFolder{ - swt-selected-tab-fill : '#ffffff'; - swt-selected-tab-highlight: '#5983c5'; - swt-selected-highlight-top: true; - swt-tab-outline:#eaeaea; - swt-tab-outer-keyline: #eaeaea; -} - -#org-eclipse-ui-editorss CTabFolder.active { - swt-selected-tab-highlight: '#5983c5'; - swt-selected-highlight-top: true; + swt-tab-outline: rgb(180, 180, 180); + swt-outer-keyline-color: rgb(180, 180, 180); } -#org-eclipse-e4-ui-compatibility-editor Composite{ - background-color: #ffffff; +CTabFolder.MArea { + background-color: rgb(255, 255, 255); + swt-selected-tab-fill: rgb(255, 255, 255); + swt-unselected-tabs-color: rgb(255, 255, 255); + swt-outer-keyline-color: rgb(230, 230, 230); + swt-inner-keyline-color: rgb(230, 230, 230); + swt-tab-outline: rgb(230, 230, 230); } -#DebugBreadcrumbItemComposite, -#DebugBreadcrumbItemDropDownToolBar, -#DebugBreadcrumbItemDetailComposite, -#DebugBreadcrumbItemDetailImageComposite, -#DebugBreadcrumbItemDetailImageLabel, -#DebugBreadcrumbItemDetailTextComposite, -#DebugBreadcrumbItemDetailTextLabel { - background-color: '#FFFFFF'; +CTabFolder { + swt-selected-tabs-background: rgb(255, 255, 255); } -Composite.MPartSashContainer{ - background-color: #f8f8f8; +CTabFolder CTabItem:selected { + background-color: rgb(230, 230, 230); } -Composite.MArea{ - background-color: #ffffff; -} - -.MPart CTabFolder{ - swt-outer-keyline-color: #ffffff; -} - -.MPart Form Composite, -.MPart Form Section, -.MPart Form Label, -.MPart Form Text, -.MPart Form Button, -.MPart Form Sash, -.MPart Form AdtFormToolkit-AdtHyperLink -{ - background-color: '#FFFFFF'; -} - -.MPartStack.active .MPart Form Composite, -.MPartStack.active .MPart Form Section, -.MPartStack.active .MPart Form Label, -.MPartStack.active .MPart Form Text, -.MPartStack.active .MPart Form Button, -.MPartStack.active .MPart Form Sash, -.MPartStack.active .MPart Form AdtFormToolkit-AdtHyperLink -{ - background-color: '#FFFFFF'; +CTabFolder Canvas { + background-color: rgb(255, 255, 255); } diff --git a/bundles/org.eclipse.ui.themes/css/e4_default_win.css b/bundles/org.eclipse.ui.themes/css/e4_default_win.css index e41ac0d3dcc..6e66f99f665 100644 --- a/bundles/org.eclipse.ui.themes/css/e4_default_win.css +++ b/bundles/org.eclipse.ui.themes/css/e4_default_win.css @@ -19,71 +19,43 @@ @import url("platform:/plugin/org.eclipse.ui.themes/css/e4_basestyle.css"); ColorDefinition#org-eclipse-ui-workbench-ACTIVE_UNSELECTED_TABS_COLOR_START { - color: #F8F8F8; + color: #F2F2F2; } ColorDefinition#org-eclipse-ui-workbench-ACTIVE_UNSELECTED_TABS_COLOR_END { - color: #F8F8F8; + color: #F0F0F0; } ColorDefinition#org-eclipse-ui-workbench-ACTIVE_TAB_OUTER_KEYLINE_COLOR { - color: #E5E5E5; + color: #DADADA; } ColorDefinition#org-eclipse-ui-workbench-ACTIVE_TAB_OUTLINE_COLOR { - color: #f8f8f8; + color: #DADADA; } ColorDefinition#org-eclipse-ui-workbench-INACTIVE_UNSELECTED_TABS_COLOR_START { - color: #F8F8F8; + color: #E8E8E8; } ColorDefinition#org-eclipse-ui-workbench-INACTIVE_UNSELECTED_TABS_COLOR_END { - color: #F8F8F8; + color: #E4E4E4; } ColorDefinition#org-eclipse-ui-workbench-INACTIVE_TAB_OUTER_KEYLINE_COLOR { - color: #E5E5E5; + color: #DADADA; } ColorDefinition#org-eclipse-ui-workbench-INACTIVE_TAB_OUTLINE_COLOR { - color: #f8f8f8; + color: #DADADA; } ColorDefinition#org-eclipse-ui-workbench-INACTIVE_TAB_BG_START { - color: #F8F8F8; + color: #F2F2F2; } ColorDefinition#org-eclipse-ui-workbench-INACTIVE_TAB_BG_END { - color: #F8F8F8; -} - -ColorDefinition#org-eclipse-ui-workbench-ACTIVE_TAB_BG_START{ - color: #f8f8f8; -} - -ColorDefinition#org-eclipse-ui-workbench-ACTIVE_TAB_BG_END { - color: #f8f8f8; -} - -ColorDefinition#org-eclipse-ui-workbench-ACTIVE_NOFOCUS_TAB_BG_START { - color: #F8F8F8; -} - -ColorDefinition#org-eclipse-ui-workbench-ACTIVE_NOFOCUS_TAB_BG_END { - color: #F8F8F8; -} - -ColorDefinition#org-eclipse-ui-workbench-ACTIVE_NOFOCUS_TAB_TEXT_COLOR { - color: #3b3b3b; -} - -ColorDefinition#org-eclipse-ui-workbench-ACTIVE_TAB_TEXT_COLOR { - color: #3b3b3b; -} - -ColorDefinition#org-eclipse-ui-workbench-INACTIVE_TAB_TEXT_COLOR { - color: #3b3b3b; + color: #F0F0F0; } .MPartStack { @@ -91,149 +63,14 @@ ColorDefinition#org-eclipse-ui-workbench-INACTIVE_TAB_TEXT_COLOR { } CTabFolder.MArea { - background-color: #f8f8f8; - swt-selected-tab-fill: #f8f8f8; - swt-unselected-tabs-color: #f8f8f8; - swt-outer-keyline-color: #f8f8f8; - swt-inner-keyline-color: #f8f8f8; - swt-tab-outline: #ffffff; + background-color: #F0F0F0; + swt-selected-tab-fill: #F0F0F0; + swt-unselected-tabs-color: #F0F0F0; + swt-outer-keyline-color: #F0F0F0; + swt-inner-keyline-color: #F0F0F0; + swt-tab-outline: #F0F0F0; } CTabFolder Canvas { - background-color: #ffffff; -} - -/* Below changes were added to enhance the appearance of Light theme with ref to other IDEs like VS Code,IntelliJ etc. */ - -.MTrimBar#org-eclipse-ui-main-toolbar { - background-color: '#f8f8f8'; -} - -.MTrimBar#org-eclipse-ui-trim-status { - background-color: '#f8f8f8'; -} - -.View Composite, -.View Composite Tree, -.View Composite Label, -.View ToolBar, -.View Group, -.View Group Label, -.View Section, -.View Text[style~='SWT.READ_ONLY'], -.View SashForm, -.View OleFrame, -.View Browser, -.View WebSite, -.View StyledText[style~='SWT.READ_ONLY'], -.View Link, -.View FormText, -.View Hyperlink, -.View AtcProblemsViewWelcomePage StyledText -{ - background-color: #f8f8f8; -} - -.View ToolItem, -.View Button{ - background-color: inherit; -} - -.View Section ToolItem{ - background-color: #EAEAEA; -} - -.View Composite PrependingAsteriskFilteredTree, -.View PrependingAsteriskFilteredTree Text, -.View LoggingViewFilteredTree, -.View LoggingViewFilteredTree Text, -.View Group Text, -.View Group Combo, -.View Composite Text, -.View OSLPackageSetTableComposite Label, -.View Button[style~='SWT.PUSH']{ - background-color: #ffffff; -} - -.MPartStack{ - swt-selected-tab-highlight: #2160bb; - swt-selected-highlight-top: false; -} - -.MPartStack.active { - swt-selected-tab-highlight: #2160bb; - swt-selected-highlight-top: false; -} - -/* text color and background color of unselected tabs in editor*/ -#org-eclipse-ui-editorss CTabItem{ - color: '#6A6A6A'; - background-color: '#f8f8f8'; -} - -/*text color and background color of selected tab in editor */ -#org-eclipse-ui-editorss CTabItem:selected{ - color: '#3b3b3b'; - background-color: '#FFFFFF'; -} - -#org-eclipse-ui-editorss CTabFolder{ - swt-selected-tab-fill : '#ffffff'; - swt-selected-tab-highlight: '#2160bb'; - swt-selected-highlight-top: true; - swt-tab-outline:#e5e5e5; - swt-tab-outer-keyline: #e5e5e5; -} - -#org-eclipse-ui-editorss CTabFolder.active { - swt-selected-tab-highlight: '#2160bb'; - swt-selected-highlight-top: true; -} - -#org-eclipse-e4-ui-compatibility-editor Composite{ - background-color: #ffffff; -} - -#DebugBreadcrumbItemComposite, -#DebugBreadcrumbItemDropDownToolBar, -#DebugBreadcrumbItemDetailComposite, -#DebugBreadcrumbItemDetailImageComposite, -#DebugBreadcrumbItemDetailImageLabel, -#DebugBreadcrumbItemDetailTextComposite, -#DebugBreadcrumbItemDetailTextLabel { - background-color: '#FFFFFF'; -} - -Composite.MPartSashContainer{ - background-color: #f8f8f8; -} - -Composite.MArea{ - background-color: #ffffff; -} - -.MPart CTabFolder{ - swt-outer-keyline-color: #ffffff; -} - -.MPart Form Composite, -.MPart Form Section, -.MPart Form Label, -.MPart Form Text, -.MPart Form Button, -.MPart Form Sash, -.MPart Form AdtFormToolkit-AdtHyperLink -{ - background-color: '#FFFFFF'; -} - -.MPartStack.active .MPart Form Composite, -.MPartStack.active .MPart Form Section, -.MPartStack.active .MPart Form Label, -.MPartStack.active .MPart Form Text, -.MPartStack.active .MPart Form Button, -.MPartStack.active .MPart Form Sash, -.MPartStack.active .MPart Form AdtFormToolkit-AdtHyperLink -{ - background-color: '#FFFFFF'; + background-color: #F8F8F8; }