Merge branch 'master' into linking-anh

10 files changed, 29 insertions, 29 deletions

diff --git a/src/client/views/search/CheckBox.scss b/src/client/views/search/CheckBox.scss
index cc858bec6..2a0085ade 100644
--- a/src/client/views/search/CheckBox.scss
+++ b/src/client/views/search/CheckBox.scss
@@ -1,4 +1,4 @@
-@import "../globalCssVariables";
+@import "../global/globalCssVariables";
 
 .checkboxfilter {
     display: flex;
@@ -13,7 +13,7 @@
         margin-top: 0px;
 
         .check-container:hover~.check-box {
-            background-color: $darker-alt-accent;
+            background-color: $medium-blue;
         }
 
         .check-container {
@@ -40,7 +40,7 @@
             overflow: visible;
             background-color: transparent;
             border-style: solid;
-            border-color: $alt-accent;
+            border-color: $medium-gray;
             border-width: 2px;
             -webkit-transition: all 0.2s ease-in-out;
             -moz-transition: all 0.2s ease-in-out;
diff --git a/src/client/views/search/CollectionFilters.scss b/src/client/views/search/CollectionFilters.scss
index b54cdcbd1..845b16f67 100644
--- a/src/client/views/search/CollectionFilters.scss
+++ b/src/client/views/search/CollectionFilters.scss
@@ -1,4 +1,4 @@
-@import "../globalCssVariables";
+@import "../global/globalCssVariables";
 
 .collection-filters {
     display: flex;
diff --git a/src/client/views/search/IconBar.scss b/src/client/views/search/IconBar.scss
index 013dcd57e..6aaf7918d 100644
--- a/src/client/views/search/IconBar.scss
+++ b/src/client/views/search/IconBar.scss
@@ -1,4 +1,4 @@
-@import "../globalCssVariables";
+@import "../global/globalCssVariables";
 
 .icon-bar {
     display: flex;
diff --git a/src/client/views/search/IconButton.scss b/src/client/views/search/IconButton.scss
index 4ec03c7c9..3cb08d756 100644
--- a/src/client/views/search/IconButton.scss
+++ b/src/client/views/search/IconButton.scss
@@ -1,4 +1,4 @@
-@import "../globalCssVariables";
+@import "../global/globalCssVariables";
 
 .type-outer {
     display: flex;
@@ -9,7 +9,7 @@
     .type-icon {
         height: 30px;
         width: 30px;
-        color: $light-color;
+        color: $white;
         // background-color: rgb(194, 194, 197);
         background-color: gray;
         border-radius: 50%;
@@ -43,7 +43,7 @@
 
     .type-icon:hover {
         transform: scale(1.1);
-        background-color: $darker-alt-accent;
+        background-color: $medium-blue;
         opacity: 1;
 
         +.filter-description {
diff --git a/src/client/views/search/IconButton.tsx b/src/client/views/search/IconButton.tsx
index 349690b20..2dd6b1b79 100644
--- a/src/client/views/search/IconButton.tsx
+++ b/src/client/views/search/IconButton.tsx
@@ -4,7 +4,7 @@ import { action, IReactionDisposer, observable, reaction, runInAction } from 'mo
 import { observer } from 'mobx-react';
 import * as React from 'react';
 import { DocumentType } from "../../documents/DocumentTypes";
-import '../globalCssVariables.scss';
+import '../global/globalCssVariables.scss';
 import { IconBar } from './IconBar';
 import "./IconButton.scss";
 import "./SearchBox.scss";
@@ -104,7 +104,7 @@ export class IconButton extends React.Component<IconButtonProps>{
     hoverStyle = {
         opacity: 1,
         backgroundColor: "rgb(128, 128, 128)"
-        //backgroundColor: "rgb(178, 206, 248)" //$darker-alt-accent
+        //backgroundColor: "rgb(178, 206, 248)" //$medium-blue
     };
 
     render() {
diff --git a/src/client/views/search/NaviconButton.scss b/src/client/views/search/NaviconButton.scss
index c23bab461..8a70b29de 100644
--- a/src/client/views/search/NaviconButton.scss
+++ b/src/client/views/search/NaviconButton.scss
@@ -1,4 +1,4 @@
-@import "../globalCssVariables";
+@import "../global/globalCssVariables";
 
 $height-icon: 15px;
 $width-line: 30px;
@@ -20,7 +20,7 @@ $translateX: 0;
 
     .line {
         display: block;
-        background: $alt-accent;
+        background: $medium-gray;
         width: $width-line;
         height: $height-line;
         position: absolute;
diff --git a/src/client/views/search/SearchBox.scss b/src/client/views/search/SearchBox.scss
index 4f5b7e41a..6a2fe6f19 100644
--- a/src/client/views/search/SearchBox.scss
+++ b/src/client/views/search/SearchBox.scss
@@ -1,4 +1,4 @@
-@import "../globalCssVariables";
+@import "../global/globalCssVariables";
 @import "./NaviconButton.scss";
 
 .searchBox-container {
@@ -20,7 +20,7 @@
         display: flex;
         justify-content: center;
         align-items: center;
-        background-color: black;
+        background-color: $dark-gray;
 
         .searchBox-lozenges {
             position: absolute;
@@ -86,7 +86,7 @@
             &.searchBox-input {
                 margin:5px;
                 border-radius:20px;
-                border:black;    
+                border:$dark-gray;    
                 display: block;
                 width: 130px;
                 -webkit-transition: width 0.4s;
@@ -114,7 +114,7 @@
             }
 
             &.searchBox-close {
-                color: $light-color;
+                color: $white;
                 max-height: $searchpanel-height;
             }
         }
@@ -132,7 +132,7 @@
 
     .no-result {
         width: 500px;
-        background: $light-color-secondary;
+        background: $light-gray;
         padding: 10px;
         height: 50px;
         text-transform: uppercase;
diff --git a/src/client/views/search/SearchBox.tsx b/src/client/views/search/SearchBox.tsx
index 5c168d8a9..6a2325342 100644
--- a/src/client/views/search/SearchBox.tsx
+++ b/src/client/views/search/SearchBox.tsx
@@ -18,7 +18,7 @@ import { SetupDrag } from '../../util/DragManager';
 import { SearchUtil } from '../../util/SearchUtil';
 import { Transform } from '../../util/Transform';
 import { CollectionDockingView } from "../collections/CollectionDockingView";
-import { CollectionSchemaView, ColumnType } from "../collections/CollectionSchemaView";
+import { CollectionSchemaView, ColumnType } from "../collections/collectionSchema/CollectionSchemaView";
 import { CollectionViewType } from '../collections/CollectionView';
 import { ViewBoxBaseComponent } from "../DocComponent";
 import { FieldView, FieldViewProps } from '../nodes/FieldView';
@@ -119,7 +119,7 @@ export class SearchBox extends ViewBoxBaseComponent<FieldViewProps, SearchBoxDoc
 
     getFinalQuery(query: string): string {
         //alters the query so it looks in the correct fields
-        //if this is true, th`en not all of the field boxes are checked
+        //if this is true, then not all of the field boxes are checked
         //TODO: data
         const initialfilters = Cast(this.props.Document._docFilters, listSpec("string"), []);
 
@@ -522,7 +522,7 @@ export class SearchBox extends ViewBoxBaseComponent<FieldViewProps, SearchBoxDoc
                             {`${Doc.CurrentUserEmail}`}
                             <div className="searchBox-logoff" onClick={() => window.location.assign(Utils.prepend("/logout"))}>
                                 Logoff
-                        </div>
+                            </div>
                         </div>
                         <div className="searchBox-lozenge" onClick={() => DocServer.UPDATE_SERVER_CACHE()}>
                             {`UI project`}
@@ -534,10 +534,10 @@ export class SearchBox extends ViewBoxBaseComponent<FieldViewProps, SearchBoxDoc
                             </select>
                             <div className="searchBox-dashboards" onClick={undoBatch(() => CurrentUserUtils.createNewDashboard(Doc.UserDoc()))}>
                                 New
-                        </div>
+                            </div>
                             <div className="searchBox-dashboards" onClick={undoBatch(() => CurrentUserUtils.snapshotDashboard(Doc.UserDoc()))}>
                                 Snapshot
-                        </div>
+                            </div>
                         </div>
                     </div>
                     <div className="searchBox-query" >
diff --git a/src/client/views/search/SelectorContextMenu.scss b/src/client/views/search/SelectorContextMenu.scss
index 48cacc608..a114f679c 100644
--- a/src/client/views/search/SelectorContextMenu.scss
+++ b/src/client/views/search/SelectorContextMenu.scss
@@ -1,7 +1,7 @@
-@import "../globalCssVariables";
+@import "../global/globalCssVariables";
 
 .parents {
-    background: $lighter-alt-accent;
+    background: $light-blue;
     padding: 10px;
     // width: 300px;
 
@@ -10,7 +10,7 @@
     }
 
     .collection {
-        border-color: $darker-alt-accent;
+        border-color: $medium-blue;
         border-bottom-style: solid;
     }
 }
\ No newline at end of file
diff --git a/src/client/views/search/ToggleBar.scss b/src/client/views/search/ToggleBar.scss
index 79f866acb..3a164f133 100644
--- a/src/client/views/search/ToggleBar.scss
+++ b/src/client/views/search/ToggleBar.scss
@@ -1,9 +1,9 @@
-@import "../globalCssVariables";
+@import "../global/globalCssVariables";
 
 .toggle-title {
     display: flex;
     align-items: center;
-    color: $light-color;
+    color: $white;
     text-transform: uppercase;
     flex-direction: row;
     justify-content: space-around;
@@ -25,7 +25,7 @@
     // height: 50px;
     height: 30px;
     width: 100px;
-    background-color: $alt-accent;
+    background-color: $medium-gray;
     border-radius: 10px;
     padding: 5px;
     display: flex;
@@ -36,6 +36,6 @@
         width: 40px;
         height: 100%;
         border-radius: 10px;
-        background-color: $light-color;
+        background-color: $white;
     }
 }
\ No newline at end of file