Revert "Bug 435574 - [Themes] Dark theme overrides text editor background color"
This reverts commit 6e4f37735f061e2bc80a90f8aa4aa0655943f502.
Change-Id: I635a0e99789d218c98bb645b397e0ade968ed9eb
diff --git a/bundles/org.eclipse.ui.themes/css/dark/e4-dark_basestyle.css b/bundles/org.eclipse.ui.themes/css/dark/e4-dark_basestyle.css
index 5836e23..ce736c8 100644
--- a/bundles/org.eclipse.ui.themes/css/dark/e4-dark_basestyle.css
+++ b/bundles/org.eclipse.ui.themes/css/dark/e4-dark_basestyle.css
@@ -8,7 +8,6 @@
* Contributors:
* IBM Corporation - initial API and implementation
* Andrea Guarinoni - initial API and implementation
- * Lars Vogel <Lars.Vogel@gmail.com> - Bug 435574
*******************************************************************************/
/* New ColorDefinitions for the E4 dark theme */
@@ -166,3 +165,14 @@
label: 'Active (no focus), selected part foreground';
}
+/* Editor definitions: */
+
+ColorDefinition#org-eclipse-ui-workbench-INACTIVE_CODE_EDITOR_BG_COLOR {
+ color: #262626;
+ label: 'Inactive, code editor background color';
+}
+
+ColorDefinition#org-eclipse-ui-workbench-ACTIVE_CODE_EDITOR_BG_COLOR {
+ color: #202020;
+ label: 'Active, code editor background color';
+}
diff --git a/bundles/org.eclipse.ui.themes/css/dark/e4-dark_partstyle.css b/bundles/org.eclipse.ui.themes/css/dark/e4-dark_partstyle.css
index 521c347..240cdc0 100644
--- a/bundles/org.eclipse.ui.themes/css/dark/e4-dark_partstyle.css
+++ b/bundles/org.eclipse.ui.themes/css/dark/e4-dark_partstyle.css
@@ -7,8 +7,7 @@
*
* Contributors:
* Andrea Guarinoni <andrea.guarinoni.dev@outlook.com> - initial API and implementation
- * Lars Vogel <Lars.Vogel@gmail.com> - initial API and implementation
- * Lars Vogel <Lars.Vogel@gmail.com> - Bug 435574
+ * Lars Vogel - initial API and implementation
*******************************************************************************/
@@ -268,14 +267,16 @@
#org-eclipse-e4-ui-compatibility-editor Canvas > *,
/* Workaround for CDT folding column SWT-BUG (styles aren't inherited) */
#org-eclipse-e4-ui-compatibility-editor Canvas > * > * {
- background-color: #262626;
+ /*background-color: #262626;*/
+ background-color: '#org-eclipse-ui-workbench-INACTIVE_CODE_EDITOR_BG_COLOR';
/* SWT-BUG: background-color rule for LineNumberRulerColumn is ignored */
}
.MPartStack.active #org-eclipse-e4-ui-compatibility-editor Canvas,
.MPartStack.active #org-eclipse-e4-ui-compatibility-editor Canvas > *,
/* Workaround for CDT folding column SWT-BUG (styles aren't inherited) */
.MPartStack.active #org-eclipse-e4-ui-compatibility-editor Canvas > * > * {
- background-color: #202020;
+ /*background-color: #202020;*/
+ background-color: '#org-eclipse-ui-workbench-ACTIVE_CODE_EDITOR_BG_COLOR';
/* SWT-BUG: background-color rule for LineNumberRulerColumn is ignored */
}
#org-eclipse-e4-ui-compatibility-editor CTabItem {
