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 639ccc32110..e0304a3b7d4 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: #48484c; + color: #494A4D; 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: #48484c; + color: #404043; 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: #48484c; + color: #2B2C2D; 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: #48484c; + color: #292929; 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: #48484c; + color: #4B4C4F; 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: #bbbbbb; + color: #DDDDDD; 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: #bbbbbb; + color: #DDDDDD; 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: #ffffff; + color: #f7f8f8; 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: #bbbbbb; + color: #CCCCCC; 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: #ffffff; + color: #CCCCCC; 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 229475b5a11..e08713009f9 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,12 +15,14 @@ *******************************************************************************/ /* ############################## 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=30,31,34' + 'AbstractTextEditor.Color.Background=47,47,47' '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_linux.css b/bundles/org.eclipse.ui.themes/css/e4-dark_linux.css index 482dbcca2c7..9bc2b981185 100644 --- a/bundles/org.eclipse.ui.themes/css/e4-dark_linux.css +++ b/bundles/org.eclipse.ui.themes/css/e4-dark_linux.css @@ -45,52 +45,3 @@ ImageBasedFrame, #org-eclipse-ui-ProgressBar Canvas { color:'#org-eclipse-ui-workbench-DARK_FOREGROUND'; } - -/* Inactive view tabs */ -.MPartStack { - swt-draw-custom-tab-content-background: true; - swt-unselected-hot-tab-color-background: #161616; -} - -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; -} - -.MPart Form Composite, -.MPart Form Composite Tree, -.MPartStack.active .MPart Form Composite Tree -{ - background-color: #1E1F22; -} \ No newline at end of file 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 e9ec830696d..17873c94eb7 100644 --- a/bundles/org.eclipse.ui.themes/css/e4-dark_mac.css +++ b/bundles/org.eclipse.ui.themes/css/e4-dark_mac.css @@ -53,51 +53,3 @@ Button { color: unset; } -/* Inactive view tabs */ -.MPartStack { - swt-draw-custom-tab-content-background: true; - swt-unselected-hot-tab-color-background: #161616; -} - -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; -} - -.MPart Form Composite, -.MPart Form Composite Tree, -.MPartStack.active .MPart Form Composite Tree -{ - background-color: #1E1F22; -} 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 f0cb7dcfd9f..0b0afa540d0 100644 --- a/bundles/org.eclipse.ui.themes/css/e4-dark_win.css +++ b/bundles/org.eclipse.ui.themes/css/e4-dark_win.css @@ -135,51 +135,3 @@ ImageBasedFrame, color: #DDDDDD; } -/* Inactive view tabs */ -.MPartStack { - swt-draw-custom-tab-content-background: true; - swt-unselected-hot-tab-color-background: #161616; -} - -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; -} - -.MPart Form Composite, -.MPart Form Composite Tree, -.MPartStack.active .MPart Form Composite Tree -{ - background-color: #1E1F22; -} diff --git a/bundles/org.eclipse.ui.themes/css/e4_default_gtk.css b/bundles/org.eclipse.ui.themes/css/e4_default_gtk.css index 156b26601d9..607c0e78846 100644 --- a/bundles/org.eclipse.ui.themes/css/e4_default_gtk.css +++ b/bundles/org.eclipse.ui.themes/css/e4_default_gtk.css @@ -18,85 +18,57 @@ @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: #E1DEDB; } ColorDefinition#org-eclipse-ui-workbench-ACTIVE_UNSELECTED_TABS_COLOR_END { - color: #F8F8F8; + color: #E1DEDB; } ColorDefinition#org-eclipse-ui-workbench-ACTIVE_TAB_OUTER_KEYLINE_COLOR { - color: #E5E5E5; + color: #CDC7C2; } ColorDefinition#org-eclipse-ui-workbench-ACTIVE_TAB_INNER_KEYLINE_COLOR { - color: #f8f8f8; + color: #CDC7C2; } ColorDefinition#org-eclipse-ui-workbench-ACTIVE_TAB_OUTLINE_COLOR { - color: #E5E5E5; + color: #CDC7C2; } ColorDefinition#org-eclipse-ui-workbench-INACTIVE_UNSELECTED_TABS_COLOR_START { - color: #F8F8F8; + color: #EAE8E6; } ColorDefinition#org-eclipse-ui-workbench-INACTIVE_UNSELECTED_TABS_COLOR_END { - color: #F8F8F8; + color: #EAE8E6; } ColorDefinition#org-eclipse-ui-workbench-INACTIVE_TAB_OUTER_KEYLINE_COLOR { - color: #E5E5E5; + color: #D5D0CC; } ColorDefinition#org-eclipse-ui-workbench-INACTIVE_TAB_INNER_KEYLINE_COLOR { - color: #f8f8f8; + color: #D5D0CC; } ColorDefinition#org-eclipse-ui-workbench-INACTIVE_TAB_OUTLINE_COLOR { - color: #E5E5E5; + color: #D5D0CC; } ColorDefinition#org-eclipse-ui-workbench-INACTIVE_TAB_BG_START { - color: #F8F8F8; + color: #F6F5F4; } 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; + color: #F6F5F4; } ColorDefinition#org-eclipse-ui-workbench-INACTIVE_NOFOCUS_TAB_BG_START { - color: #f8f8f8; + color: #EAE8E6; } ColorDefinition#org-eclipse-ui-workbench-INACTIVE_NOFOCUS_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: #EAE8E6; } .MTrimmedWindow { @@ -116,127 +88,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: #F6F5F4; + swt-selected-tab-fill: #F6F5F4; + swt-unselected-tabs-color: #F6F5F4; + swt-outer-keyline-color: #F6F5F4; + swt-inner-keyline-color: #F6F5F4; + swt-tab-outline: #F6F5F4; } CTabFolder Canvas { - background-color: #ffffff; -} - -.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 BusyIndicator, -.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 Canvas, -.View FigureCanvas -{ - background-color: #f8f8f8; -} - -.View TitleRegion{ - background-color:#f8f8f8; -} - -.MPartStack.active .View TitleRegion{ - background-color:#f8f8f8; -} - -.View Button[style~='SWT.CHECK']{ - background-color: inherit; -} - -.View Toolbar ToolItem{ - background-color: #eaeaea; -} - -.View TabbedPropertyList{ - swt-tabBackground-color: #ffffff; -} - -.View Composite PrependingAsteriskFilteredTree, -.View PrependingAsteriskFilteredTree Text, -.View Group Text, -.View Group Combo, -.View Composite Text, -.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'; + background-color: #F8F7F6; } - -/*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; - swt-draw-custom-tab-content-background: true; - swt-unselected-hot-tab-color-background:'#FFFFFF'; -} - -#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; -} - -Composite.MPartSashContainer{ - background-color: #f8f8f8; -} - -Composite.MArea{ - background-color: #ffffff; -} - -.MPart CTabFolder{ - swt-outer-keyline-color: #ffffff; -} \ No newline at end of file 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 db703680deb..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,195 +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: #EAEAEA; + 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: #EAEAEA; + 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); -} - - -.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 BusyIndicator, -.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 Canvas, -.View FigureCanvas -{ - 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 TitleRegion{ - background-color:#f8f8f8; -} - -.MPartStack.active .View TitleRegion{ - background-color:#f8f8f8; -} - -.View Button[style~='SWT.CHECK']{ - background-color: inherit; -} - -.View Toolbar ToolItem{ - background-color: #eaeaea; -} - -.View TabbedPropertyList{ - swt-tabBackground-color: #ffffff; -} - -.View Composite PrependingAsteriskFilteredTree, -.View PrependingAsteriskFilteredTree Text, -.View Group Text, -.View Group Combo, -.View Composite Text, -.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'; + swt-tab-outline: rgb(180, 180, 180); + swt-outer-keyline-color: rgb(180, 180, 180); } -#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; - swt-draw-custom-tab-content-background: true; - swt-unselected-hot-tab-color-background:'#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); } -#org-eclipse-ui-editorss CTabFolder.active { - swt-selected-tab-highlight: '#5983c5'; - swt-selected-highlight-top: true; +CTabFolder { + swt-selected-tabs-background: rgb(255, 255, 255); } -#org-eclipse-e4-ui-compatibility-editor Composite{ - background-color: #ffffff; +CTabFolder CTabItem:selected { + background-color: rgb(230, 230, 230); } -Composite.MPartSashContainer{ - background-color: #f8f8f8; -} - -Composite.MArea{ - background-color: #ffffff; +CTabFolder Canvas { + background-color: rgb(255, 255, 255); } - -.MPart CTabFolder{ - swt-outer-keyline-color: #ffffff; -} \ No newline at end of file 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 716abc820e8..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: #E5E5E5; + 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: #E5E5E5; + 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,127 +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; -} - -.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 BusyIndicator, -.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 Canvas, -.View FigureCanvas -{ - background-color: #f8f8f8; -} - -.View TitleRegion{ - background-color:#f8f8f8; -} - -.MPartStack.active .View TitleRegion{ - background-color:#f8f8f8; -} - -.View Button[style~='SWT.CHECK']{ - background-color: inherit; + background-color: #F8F8F8; } - -.View Toolbar ToolItem{ - background-color: #eaeaea; -} - -.View TabbedPropertyList{ - swt-tabBackground-color: #ffffff; -} - -.View Composite PrependingAsteriskFilteredTree, -.View PrependingAsteriskFilteredTree Text, -.View Group Text, -.View Group Combo, -.View Composite Text, -.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; - swt-draw-custom-tab-content-background: true; - swt-unselected-hot-tab-color-background:'#FFFFFF'; -} - -#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; -} - -Composite.MPartSashContainer{ - background-color: #f8f8f8; -} - -Composite.MArea{ - background-color: #ffffff; -} - -.MPart CTabFolder{ - swt-outer-keyline-color: #ffffff; -} \ No newline at end of file diff --git a/bundles/org.eclipse.ui.themes/css/light/e4-light_tabstyle.css b/bundles/org.eclipse.ui.themes/css/light/e4-light_tabstyle.css index a220c797ad4..6306b6dde74 100644 --- a/bundles/org.eclipse.ui.themes/css/light/e4-light_tabstyle.css +++ b/bundles/org.eclipse.ui.themes/css/light/e4-light_tabstyle.css @@ -30,7 +30,7 @@ padding: 0px; color: '#org-eclipse-ui-workbench-INACTIVE_TAB_TEXT_COLOR'; swt-draw-custom-tab-content-background: true; - swt-unselected-hot-tab-color-background:#EAEAEA; + swt-unselected-hot-tab-color-background:'#org-eclipse-ui-workbench-ACTIVE_TAB_BG_START'; } .MPartStack.active {