diff --git a/frontend/src/assets/toolbar/google-logo.png b/frontend/src/assets/toolbar/google-logo.png new file mode 100644 index 00000000..09fd0a61 Binary files /dev/null and b/frontend/src/assets/toolbar/google-logo.png differ diff --git a/frontend/src/components/enrichment/PathwayList.vue b/frontend/src/components/enrichment/PathwayList.vue index 88ec8ed9..75a2b78a 100644 --- a/frontend/src/components/enrichment/PathwayList.vue +++ b/frontend/src/components/enrichment/PathwayList.vue @@ -279,7 +279,7 @@ export default { transform: translateY(-50%); margin-left: 0.28%; border-radius: 10px; - z-index: 999; + z-index: 997; cursor: default; font-family: 'ABeeZee', sans-serif; @@ -451,7 +451,7 @@ export default { text-decoration:none; } - .results { + .list-section .results { height: 90%; overflow: scroll; } diff --git a/frontend/src/components/interface/SearchField.vue b/frontend/src/components/interface/SearchField.vue new file mode 100644 index 00000000..89a2005f --- /dev/null +++ b/frontend/src/components/interface/SearchField.vue @@ -0,0 +1,189 @@ + + + + + diff --git a/frontend/src/style.css b/frontend/src/style.css index 4d2fff7e..2db14466 100644 --- a/frontend/src/style.css +++ b/frontend/src/style.css @@ -561,25 +561,6 @@ html,body{ margin-top: 100px; } -.toolbar-search{ - display: block; - border-radius: 20px; - -} - -.toolbar-search input[type=text]{ - font-family: 'Roboto Mono', monospace; - background-color: rgba(0, 0, 0, 0.9); - border: none; - border-radius: 20px; - color: #fff; - height: 20px; - line-height: 20px; - border-style: outset; - border-width: 1px; - text-align: center; -} - .minimize { display: block; position:absolute; @@ -1063,25 +1044,6 @@ padding: 0px; padding-bottom:15px; } -.search-field { - z-index: 999; - padding: 5px; - border-radius: 20px; -} - -#search .results { - display: none; - background-color: rgba(0, 0, 0, 0.9); - color: white; - border-radius: 20px; - text-align: center; - margin: 6px; - max-height: 75px; - overflow-y: scroll; - overflow-x: hidden; -} - - .tool-pane .results { height: 200px; display: block; @@ -1288,18 +1250,6 @@ padding: 0px; } } -#search .results b { -padding-left: 2px; -} - -#search .results a { -padding: 1px 2px; -display: block; -cursor: pointer; -text-decoration: none; -color: white; -} - #attributeselect { margin: 20px 0 13px 0 ; -webkit-touch-callout: none; diff --git a/frontend/src/views/ProteinView.vue b/frontend/src/views/ProteinView.vue index bf3cd942..70e44b67 100644 --- a/frontend/src/views/ProteinView.vue +++ b/frontend/src/views/ProteinView.vue @@ -48,12 +48,10 @@
- + :active_node='active_node' @active_node_changed = 'active_node = $event' + >
@@ -74,7 +72,7 @@ import MainVis from '@/components/visualization/MainVis.vue' import PaneSystem from '@/components/pane/PaneSystem.vue' import PathwayMenu from '@/components/enrichment/PathwayMenu.vue' -// import ModularityClass from '../components/interface/ModularityClass.vue' +import SearchField from '../components/interface/SearchField.vue' // import ToggleLabel from '../components/interface/ToggleLabel.vue' // import ConnectedGraph from '../components/interface/ConnectedGraph.vue' import MainToolBar from '../components/toolbar/MainToolBar.vue' @@ -85,7 +83,7 @@ export default { MainVis, PaneSystem, PathwayMenu, - // ModularityClass, + SearchField, MainToolBar, // ToggleLabel, // ConnectedGraph