Bug 562200: Move .MTrimmedWindow.topLevel in shared file

Change-Id: I37ebb1213c094626465e6af850762998062324f2
Signed-off-by: Philippe DUL <philippe.dul@thalesgroup.com>

6 files changed, 26 insertions, 59 deletions

diff --git a/bundles/org.eclipse.ui.themes/css/common/e4_globalstyle.css b/bundles/org.eclipse.ui.themes/css/common/e4_globalstyle.css
new file mode 100644
index 00000000000..e89237a59e8
--- /dev/null
+++ b/bundles/org.eclipse.ui.themes/css/common/e4_globalstyle.css
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2020 IBM Corporation and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+ 
+.MTrimmedWindow.topLevel {
+	margin-top: 0px;
+	margin-bottom: 0px;
+	margin-left: 1px;
+	margin-right: 1px;
+}
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 9516310dcf7..9e29ad6460c 100644
--- a/bundles/org.eclipse.ui.themes/css/e4-dark_linux.css
+++ b/bundles/org.eclipse.ui.themes/css/e4-dark_linux.css
@@ -13,20 +13,13 @@
  *     Lars Vogel - initial API and implementation
  *******************************************************************************/
 
+@import url("platform:/plugin/org.eclipse.ui.themes/css/common/e4_globalstyle.css");
 @import url("platform:/plugin/org.eclipse.ui.themes/css/dark/e4-dark_ide_colorextensions.css");
 @import url("platform:/plugin/org.eclipse.ui.themes/css/dark/e4-dark_globalstyle.css"); /* Remove this to have ONLY the main IDE shell dark */
 @import url("platform:/plugin/org.eclipse.ui.themes/css/dark/e4-dark_partstyle.css");
 @import url("platform:/plugin/org.eclipse.ui.themes/css/dark/e4-dark_tabstyle.css");
 @import url("platform:/plugin/org.eclipse.ui.themes/css/dark/e4-dark-drag-styling.css");
 
-
-.MTrimmedWindow.topLevel {
-	margin-top: 0px;
-	margin-bottom: 0px;
-	margin-left: 1px;
-	margin-right: 1px;
-}
-
 .MToolControl.TrimStack {
     /*frame-image:  url(./gtkTSFrame.png);*/
     handle-image:  url(./dragHandle.png);
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 93716288ccd..5e10e639844 100644
--- a/bundles/org.eclipse.ui.themes/css/e4-dark_mac.css
+++ b/bundles/org.eclipse.ui.themes/css/e4-dark_mac.css
@@ -12,27 +12,13 @@
  *     Andrea Guarinoni <andrea.guarinoni.dev@outlook.com> - initial API and implementation
  *******************************************************************************/
 
-/*******************************************************************************
- * The following bugs are referred to in this style sheet
- * 2.) Bug 430052 - Imported rules cannot be overridden
- *******************************************************************************/
-
-
-/* @import url("platform:/plugin/org.eclipse.ui.themes/css/e4-dark.css"); Bug 430052 */
+@import url("platform:/plugin/org.eclipse.ui.themes/css/common/e4_globalstyle.css");
 @import url("platform:/plugin/org.eclipse.ui.themes/css/dark/e4-dark_ide_colorextensions.css");
 @import url("platform:/plugin/org.eclipse.ui.themes/css/dark/e4-dark_globalstyle.css"); /* Remove this to have ONLY the main IDE shell dark */
 @import url("platform:/plugin/org.eclipse.ui.themes/css/dark/e4-dark_partstyle.css");
 @import url("platform:/plugin/org.eclipse.ui.themes/css/dark/e4-dark_tabstyle.css");
 @import url("platform:/plugin/org.eclipse.ui.themes/css/dark/e4-dark-drag-styling.css");
 
-
-.MTrimmedWindow.topLevel {
-	margin-top: 0px;
-	margin-bottom: 0px;
-	margin-left: 1px;
-	margin-right: 1px;
-}
-
 .MToolControl.TrimStack {
     /*frame-image:  url(./gtkTSFrame.png);*/
     handle-image:  url(./dragHandle.png);
diff --git a/bundles/org.eclipse.ui.themes/css/e4-dark_mac1013.css b/bundles/org.eclipse.ui.themes/css/e4-dark_mac1013.css
index 23899528f99..7300874ae83 100644
--- a/bundles/org.eclipse.ui.themes/css/e4-dark_mac1013.css
+++ b/bundles/org.eclipse.ui.themes/css/e4-dark_mac1013.css
@@ -12,26 +12,13 @@
  *     Andrea Guarinoni <andrea.guarinoni.dev@outlook.com> - initial API and implementation
  *******************************************************************************/
 
-/*******************************************************************************
- * The following bugs are referred to in this style sheet
- * 2.) Bug 430052 - Imported rules cannot be overridden
- *******************************************************************************/
-
-
-/* @import url("platform:/plugin/org.eclipse.ui.themes/css/e4-dark.css"); Bug 430052 */
+@import url("platform:/plugin/org.eclipse.ui.themes/css/common/e4_globalstyle.css");
 @import url("platform:/plugin/org.eclipse.ui.themes/css/dark/e4-dark_ide_colorextensions.css");
 @import url("platform:/plugin/org.eclipse.ui.themes/css/dark/e4-dark_globalstyle.css"); /* Remove this to have ONLY the main IDE shell dark */
 @import url("platform:/plugin/org.eclipse.ui.themes/css/dark/e4-dark_partstyle.css");
 @import url("platform:/plugin/org.eclipse.ui.themes/css/dark/e4-dark_tabstyle.css");
 @import url("platform:/plugin/org.eclipse.ui.themes/css/dark/e4-dark-drag-styling.css");
 
-.MTrimmedWindow.topLevel {
-	margin-top: 0px;
-	margin-bottom: 0px;
-	margin-left: 1px;
-	margin-right: 1px;
-}
-
 .MToolControl.TrimStack {
     /*frame-image:  url(./gtkTSFrame.png);*/
     handle-image:  url(./dragHandle.png);
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 e5fef704250..27aff2adbfd 100644
--- a/bundles/org.eclipse.ui.themes/css/e4-dark_win.css
+++ b/bundles/org.eclipse.ui.themes/css/e4-dark_win.css
@@ -15,13 +15,7 @@
  *     Fabio Zadrozny <fabiofz@gmail.com> - Bug 434201, 434309, 430278
  *******************************************************************************/
 
-/*******************************************************************************
- * The following bugs are referred to in this style sheet
- * 1.) Bug 430052 - Imported rules cannot be overridden
- *******************************************************************************/
-
-
-/* @import url("platform:/plugin/org.eclipse.ui.themes/css/e4-dark.css"); Bug 430052 */
+@import url("platform:/plugin/org.eclipse.ui.themes/css/common/e4_globalstyle.css");
 @import url("platform:/plugin/org.eclipse.ui.themes/css/dark/e4-dark_ide_colorextensions.css");
 @import url("platform:/plugin/org.eclipse.ui.themes/css/dark/e4-dark_globalstyle.css"); /* Remove this to have ONLY the main IDE shell dark */
 @import url("platform:/plugin/org.eclipse.ui.themes/css/dark/e4-dark_partstyle.css");
@@ -64,14 +58,6 @@ Table {
 	swt-hot-border-color: #545454;
 }
 
-
-.MTrimmedWindow.topLevel {
-	margin-top: 0px;
-	margin-bottom: 0px;
-	margin-left: 1px;
-	margin-right: 1px;
-}
-
 .MToolControl.TrimStack {
     /*frame-image:  url(./gtkTSFrame.png);*/
     handle-image:  url(./dragHandle.png);
diff --git a/bundles/org.eclipse.ui.themes/css/e4_basestyle.css b/bundles/org.eclipse.ui.themes/css/e4_basestyle.css
index 14eb67c5af0..73b80b7b382 100644
--- a/bundles/org.eclipse.ui.themes/css/e4_basestyle.css
+++ b/bundles/org.eclipse.ui.themes/css/e4_basestyle.css
@@ -13,6 +13,8 @@
  *     Lars Vogel <Lars.Vogel@gmail.com> - Bug 420836
  *******************************************************************************/
 
+@import url("platform:/plugin/org.eclipse.ui.themes/css/common/e4_globalstyle.css");
+
 /* New ColorDefinitions for the E4 default theme */ 
 ThemesExtension { color-definition: 
 	'#org-eclipse-ui-workbench-INACTIVE_UNSELECTED_TABS_COLOR_START', 
@@ -117,13 +119,6 @@ ColorDefinition#org-eclipse-ui-workbench-ACTIVE_NOFOCUS_TAB_TEXT_COLOR {
 	color: #101010;
 }
 
-.MTrimmedWindow.topLevel {
-	margin-top: 0px;
-	margin-bottom: 0px;
-	margin-left: 1px;
-	margin-right: 1px;
-}
-
 .MPart.busy {
 	font-style: italic;
 }