Merge branch '21128-toolbar-context-menu'

[arvados-workbench2.git] / src / views-components / search-bar / search-bar-basic-view.tsx

diff --git a/src/views-components/search-bar/search-bar-basic-view.tsx b/src/views-components/search-bar/search-bar-basic-view.tsx
index 76d46b3662573cd78a0541090aaa4b3ec00fbe7a..e880c437bcd22466e4a4bf09fe3015faacdc6d7e 100644 (file)
--- a/src/views-components/search-bar/search-bar-basic-view.tsx
+++ b/src/views-components/search-bar/search-bar-basic-view.tsx
@@ -2,18 +2,17 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import * as React from 'react';
+import React from 'react';
 import { Paper, StyleRulesCallback, withStyles, WithStyles } from '@material-ui/core';
-import { SearchView } from '~/store/search-bar/search-bar-reducer';
 import {
     SearchBarRecentQueries,
     SearchBarRecentQueriesActionProps
-} from '~/views-components/search-bar/search-bar-recent-queries';
+} from 'views-components/search-bar/search-bar-recent-queries';
 import {
     SearchBarSavedQueries,
     SearchBarSavedQueriesDataProps,
     SearchBarSavedQueriesActionProps
-} from '~/views-components/search-bar/search-bar-save-queries';
+} from 'views-components/search-bar/search-bar-save-queries';
 
 type CssRules = 'advanced' | 'label' | 'root';
 
@@ -32,10 +31,12 @@ const styles: StyleRulesCallback<CssRules> = theme => {
             color: theme.palette.primary.main
         },
         label: {
-            fontSize: '0.875rem',
+            fontSize: '0.775rem',
             padding: `${theme.spacing.unit}px ${theme.spacing.unit}px `,
             color: theme.palette.grey["900"],
-            background: theme.palette.grey["200"]
+            background: 'white',
+            textAlign: 'right',
+            fontWeight: 'bold'
         }
     };
 };
@@ -52,18 +53,17 @@ type SearchBarBasicViewProps = SearchBarBasicViewDataProps & SearchBarBasicViewA
 export const SearchBarBasicView = withStyles(styles)(
     ({ classes, onSetView, loadRecentQueries, deleteSavedQuery, savedQueries, onSearch, editSavedQuery, selectedItem }: SearchBarBasicViewProps) =>
         <Paper className={classes.root}>
-            <div className={classes.label}>Recent search queries</div>
+            <div className={classes.label}>{"Recent queries"}</div>
             <SearchBarRecentQueries
                 onSearch={onSearch}
                 loadRecentQueries={loadRecentQueries}
                 selectedItem={selectedItem} />
-            <div className={classes.label}>Saved search queries</div>
+            <div className={classes.label}>{"Saved queries"}</div>
             <SearchBarSavedQueries
                 onSearch={onSearch}
                 savedQueries={savedQueries}
                 editSavedQuery={editSavedQuery}
                 deleteSavedQuery={deleteSavedQuery}
                 selectedItem={selectedItem} />
-            <div className={classes.advanced} onClick={() => onSetView(SearchView.ADVANCED)}>Advanced search</div>
         </Paper>
 );