Moved css variables to search in workspace extension and added genera…

…l variables in core. Signed-off-by: jbicker <jan.bicker@typefox.io>
eclipse-theia · Apr 26, 2018 · 8024ad7 · 8024ad7
1 parent 8f03f72
commit 8024ad7
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 12 deletions.
diff --git a/packages/core/src/browser/style/variables-bright.useable.css b/packages/core/src/browser/style/variables-bright.useable.css
@@ -142,15 +142,14 @@ is not optimized for dense, information rich UIs.
   --theia-removed-color0: rgba(230, 0, 0, 0.8);
   --theia-modified-color0: rgba(0, 100, 150, 0.8);
 
-  --theia-search-match-color0: rgba(234, 92, 0, 0.33);
-  --theia-search-match-color1: rgba(234, 92, 0, 0.5);
-  --theia-current-search-match-color: rgb(168, 172, 148, 0.7);
-  --theia-range-highlight: rgba(253, 255, 0, 0.2);
-  --theia-match-replace-color: rgba(155, 185, 85, 0.2);
-
   --theia-highlight-background-color: var(--md-purple-A100);
   --theia-highlight-color: var(--theia-content-font-color0);
 
+  /* Colors to highlight words in widgets like tree or editors */
+
+  --theia-word-highlight-color0: rgba(168, 172, 148, 0.7);
+  --theia-word-highlight-color1: rgba(253, 255, 0, 0.2);
+
   /* Icons */
   --theia-icon-close: url(../icons/close-bright.svg);
   --theia-sprite-y-offset: 0px;

diff --git a/packages/core/src/browser/style/variables-dark.useable.css b/packages/core/src/browser/style/variables-dark.useable.css
@@ -142,15 +142,14 @@ is not optimized for dense, information rich UIs.
   --theia-removed-color0: rgba(230, 0, 0, 0.8);
   --theia-modified-color0: rgba(0, 100, 150, 0.8);
 
-  --theia-search-match-color0: rgba(234, 92, 0, 0.33);
-  --theia-search-match-color1: rgba(234, 92, 0, 0.5);
-  --theia-current-search-match-color: rgba(81,92,106, 0.7);
-  --theia-range-highlight: rgba(255, 255, 255, 0.04);
-  --theia-match-replace-color: rgba(155, 185, 85, 0.2);
-
   --theia-highlight-background-color: var(--md-purple-A400);
   --theia-highlight-color: var(--theia-content-font-color0);
 
+  /* Colors to highlight words in widgets like tree or editors */
+
+  --theia-word-highlight-color0: rgba(81, 92, 106, 0.7);
+  --theia-word-highlight-color1: rgba(255, 255, 255, 0.04);
+
   /* Icons */
   --theia-icon-close: url(../icons/close-dark.svg);
   --theia-sprite-y-offset: -20px;

diff --git a/packages/search-in-workspace/src/browser/styles/index.css b/packages/search-in-workspace/src/browser/styles/index.css
@@ -5,6 +5,16 @@
  * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
  */
 
+ :root {
+
+  --theia-search-match-color0: rgba(234, 92, 0, 0.33);
+  --theia-search-match-color1: rgba(234, 92, 0, 0.5);
+  --theia-match-replace-color: rgba(155, 185, 85, 0.2);
+
+  --theia-current-search-match-color: var(--theia-word-highlight-color0);
+  --theia-range-highlight: var(--theia-word-highlight-color1);
+ }
+
 .t-siw-search-container {
     color: var(--theia-ui-font-color1);
     padding: 5px;