fixup! CHE-4927 fix light theme styles

eclipse-che · Jan 24, 2018 · dc4fc16 · dc4fc16
1 parent fae4f44
commit dc4fc16
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 249 deletions.
diff --git a/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/theme/Theme.java b/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/theme/Theme.java
@@ -1704,49 +1704,6 @@ public interface Theme {
 
   String projectExplorerPlaceholderRowColor();
 
-  /**
-   * ******************************************************************************************
-   *
-   * <p>Category
-   *
-   * <p>******************************************************************************************
-   */
-  String workspaceStatusBackgroundColor();
-
-  String workspaceStatusDelimiterColor();
-
-  String workspaceStatusMachineOutputsHyperlink();
-
-  String workspaceStatusWaitingWorkspaceSection();
-
-  String workspaceStatusWorkspaceStartedSection();
-
-  String workspaceStatusWorkspaceStoppedSection();
-
-  String workspaceStatusWorkspaceFailedSection();
-
-  String workspaceStatusMachineStateStarting();
-
-  String workspaceStatusMachineStateRunning();
-
-  String workspaceStatusMachineStateStopped();
-
-  String workspaceStatusMachineStateFailed();
-
-  String workspaceStatusInstallerStateStarting();
-
-  String workspaceStatusInstallerStateRunning();
-
-  String workspaceStatusInstallerStateFailed();
-
-  String workspaceStatusInstallerStatusStarting();
-
-  String workspaceStatusInstallerStatusRunning();
-
-  String workspaceStatusInstallerStatusFailed();
-
-  String workspaceStatusErrorMessage();
-
   /**
    * ******************************************************************************************
    *

diff --git a/...rc/main/java/org/eclipse/che/ide/processes/loading/WorkspaceLoadingTrackerViewImpl.ui.xml b/...rc/main/java/org/eclipse/che/ide/processes/loading/WorkspaceLoadingTrackerViewImpl.ui.xml
@@ -19,29 +19,32 @@
     <ui:with field="resources" type="org.eclipse.che.ide.Resources" />
 
     <ui:style  src="org/eclipse/che/ide/api/ui/style.css">
+        @def workspaceStatusDelimiterColor rgba(160, 169, 183, 0.2);
+        @def workspaceStatusMachineOutputsHyperlink #4973c1;
 
-        @eval workspaceStatusBackgroundColor org.eclipse.che.ide.api.theme.Style.theme.workspaceStatusBackgroundColor();
-        @eval workspaceStatusDelimiterColor org.eclipse.che.ide.api.theme.Style.theme.workspaceStatusDelimiterColor();
-        @eval workspaceStatusMachineOutputsHyperlink org.eclipse.che.ide.api.theme.Style.theme.workspaceStatusMachineOutputsHyperlink();
-        @eval workspaceStatusWaitingWorkspaceSection org.eclipse.che.ide.api.theme.Style.theme.workspaceStatusWaitingWorkspaceSection();
-        @eval workspaceStatusWorkspaceStartedSection org.eclipse.che.ide.api.theme.Style.theme.workspaceStatusWorkspaceStartedSection();
-        @eval workspaceStatusWorkspaceStoppedSection org.eclipse.che.ide.api.theme.Style.theme.workspaceStatusWorkspaceStoppedSection();
-        @eval workspaceStatusWorkspaceFailedSection org.eclipse.che.ide.api.theme.Style.theme.workspaceStatusWorkspaceFailedSection();
-        @eval workspaceStatusMachineStateStarting org.eclipse.che.ide.api.theme.Style.theme.workspaceStatusMachineStateStarting();
-        @eval workspaceStatusMachineStateRunning org.eclipse.che.ide.api.theme.Style.theme.workspaceStatusMachineStateRunning();
-        @eval workspaceStatusMachineStateStopped org.eclipse.che.ide.api.theme.Style.theme.workspaceStatusMachineStateStopped();
-        @eval workspaceStatusMachineStateFailed org.eclipse.che.ide.api.theme.Style.theme.workspaceStatusMachineStateFailed();
-        @eval workspaceStatusInstallerStateStarting org.eclipse.che.ide.api.theme.Style.theme.workspaceStatusInstallerStateStarting();
-        @eval workspaceStatusInstallerStateRunning org.eclipse.che.ide.api.theme.Style.theme.workspaceStatusInstallerStateRunning();
-        @eval workspaceStatusInstallerStateFailed org.eclipse.che.ide.api.theme.Style.theme.workspaceStatusInstallerStateFailed();
-        @eval workspaceStatusInstallerStatusStarting org.eclipse.che.ide.api.theme.Style.theme.workspaceStatusInstallerStatusStarting();
-        @eval workspaceStatusInstallerStatusRunning org.eclipse.che.ide.api.theme.Style.theme.workspaceStatusInstallerStatusRunning();
-        @eval workspaceStatusInstallerStatusFailed org.eclipse.che.ide.api.theme.Style.theme.workspaceStatusInstallerStatusFailed();
-        @eval workspaceStatusErrorMessage org.eclipse.che.ide.api.theme.Style.theme.workspaceStatusErrorMessage();
+        @def workspaceStatusWaitingWorkspaceSection #f0c530;
+        @def workspaceStatusWorkspaceStartedSection #3aa461;
+        @def workspaceStatusWorkspaceStoppedSection #f0c530;
+        @def workspaceStatusWorkspaceFailedSection red;
+
+        @def workspaceStatusMachineStateStarting #4973c1;
+        @def workspaceStatusMachineStateRunning #3aa461;
+        @def workspaceStatusMachineStateStopped #adadad;
+        @def workspaceStatusMachineStateFailed red;
+
+        @def workspaceStatusInstallerStateStarting #4973c1;
+        @def workspaceStatusInstallerStateRunning #4973c1;
+        @def workspaceStatusInstallerStateFailed red;
+
+        @def workspaceStatusInstallerStatusStarting #4973c1;
+        @def workspaceStatusInstallerStatusRunning #3aa461;
+        @def workspaceStatusInstallerStatusFailed red;
+
+        @def workspaceStatusErrorMessage red;
 
         .panel {
             overflow: auto;
-            background-color: workspaceStatusBackgroundColor;
+            background-color: outputBackgroundColor;
             user-select: text;
             position: relative;
         }

diff --git a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/theme/DarkTheme.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/theme/DarkTheme.java
@@ -1891,98 +1891,8 @@ public String projectExplorerPlaceholderRowColor() {
     return "#333846";
   }
 
-   @Override
-    public String workspaceStatusBackgroundColor() {
-      return "#191c28";
-    }
-
-    @Override
-    public String workspaceStatusDelimiterColor() {
-      return "rgba(160, 169, 183, 0.2)";
-    }
-
-    @Override
-    public String workspaceStatusMachineOutputsHyperlink() {
-      return "#4973c1";
-    }
-
-    @Override
-    public String workspaceStatusWaitingWorkspaceSection() {
-      return "#f0c530";
-    }
-
-    @Override
-    public String workspaceStatusWorkspaceStartedSection() {
-      return "#3aa461";
-    }
-
-    @Override
-    public String workspaceStatusWorkspaceStoppedSection() {
-      return "#f0c530";
-    }
-
-    @Override
-    public String workspaceStatusWorkspaceFailedSection() {
-      return "red";
-    }
-
-    @Override
-    public String workspaceStatusMachineStateStarting() {
-      return "#4973c1";
-    }
-
-    @Override
-    public String workspaceStatusMachineStateRunning() {
-      return "#3aa461";
-    }
-
-    @Override
-    public String workspaceStatusMachineStateStopped() {
-      return "#adadad";
-    }
-
-    @Override
-    public String workspaceStatusMachineStateFailed() {
-      return "red";
-    }
-
-    @Override
-    public String workspaceStatusInstallerStateStarting() {
-      return "#4973c1";
-    }
-
-    @Override
-    public String workspaceStatusInstallerStateRunning() {
-      return "#4973c1";
-    }
-
-    @Override
-    public String workspaceStatusInstallerStateFailed() {
-      return "red";
-    }
-
-    @Override
-    public String workspaceStatusInstallerStatusStarting() {
-      return "#4973c1";
-    }
-
-    @Override
-    public String workspaceStatusInstallerStatusRunning() {
-      return "#3aa461";
-    }
-
-    @Override
-    public String workspaceStatusInstallerStatusFailed() {
-      return "red";
-    }
-
-    @Override
-    public String workspaceStatusErrorMessage() {
-      return "red";
-    }
-
-    @Override
-    public String noToolbarPanelColor() {
-      return "#1b1e2b";
-    }
+  @Override
+  public String noToolbarPanelColor() {
+    return "#1b1e2b";
+  }
 }
diff --git a/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/theme/LightTheme.java b/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/theme/LightTheme.java
@@ -1862,98 +1862,9 @@ public String projectExplorerPlaceholderIconColor() {
   public String projectExplorerPlaceholderRowColor() {
     return "#bfbfbf";
   }
+
   @Override
-    public String workspaceStatusBackgroundColor() {
-      return "white";
-    }
-
-    @Override
-    public String workspaceStatusDelimiterColor() {
-      return "rgba(160, 169, 183, 0.2)";
-    }
-
-    @Override
-    public String workspaceStatusMachineOutputsHyperlink() {
-      return "#4973c1";
-    }
-
-    @Override
-    public String workspaceStatusWaitingWorkspaceSection() {
-      return "#f0c530";
-    }
-
-    @Override
-    public String workspaceStatusWorkspaceStartedSection() {
-      return "#3aa461";
-    }
-
-    @Override
-    public String workspaceStatusWorkspaceStoppedSection() {
-      return "#f0c530";
-    }
-
-    @Override
-    public String workspaceStatusWorkspaceFailedSection() {
-      return "red";
-    }
-
-    @Override
-    public String workspaceStatusMachineStateStarting() {
-      return "#4973c1";
-    }
-
-    @Override
-    public String workspaceStatusMachineStateRunning() {
-      return "#3aa461";
-    }
-
-    @Override
-    public String workspaceStatusMachineStateStopped() {
-      return "#adadad";
-    }
-
-    @Override
-    public String workspaceStatusMachineStateFailed() {
-      return "red";
-    }
-
-    @Override
-    public String workspaceStatusInstallerStateStarting() {
-      return "#4973c1";
-    }
-
-    @Override
-    public String workspaceStatusInstallerStateRunning() {
-      return "#4973c1";
-    }
-
-    @Override
-    public String workspaceStatusInstallerStateFailed() {
-      return "red";
-    }
-
-    @Override
-    public String workspaceStatusInstallerStatusStarting() {
-      return "#4973c1";
-    }
-
-    @Override
-    public String workspaceStatusInstallerStatusRunning() {
-      return "#3aa461";
-    }
-
-    @Override
-    public String workspaceStatusInstallerStatusFailed() {
-      return "red";
-    }
-
-    @Override
-    public String workspaceStatusErrorMessage() {
-      return "red";
-    }
-
-    @Override
-    public String noToolbarPanelColor() {
-      return "#c8c8c8";
-    }
+  public String noToolbarPanelColor() {
+    return "#c8c8c8";
+  }
 }