merged with master

1 files changed, 17 insertions, 20 deletions

diff --git a/src/client/views/ContextMenu.scss b/src/client/views/ContextMenu.scss
index 232362c5c..4aaf2d03b 100644
--- a/src/client/views/ContextMenu.scss
+++ b/src/client/views/ContextMenu.scss
@@ -38,7 +38,12 @@
     background: whitesmoke;
 }
 
-.contextMenu-item {
+.contextMenuItem-Selected {
+    background: lightgoldenrodyellow;
+    border-style: none;
+}
+
+.contextMenuItem {
     // width: 11vw; //10vw
     height: 25px; //2vh
     display: flex; //comment out to allow search icon to be inline with search text
@@ -59,7 +64,7 @@
     text-transform: uppercase;
     padding-right: 30px;
 
-    .contextMenu-item-background {
+    .contextMenuItem-background {
         width: 100%;
         height: 100%;
         position: absolute;
@@ -69,13 +74,7 @@
         filter: opacity(0);
     }
 
-    &:hover {
-        .contextMenu-item-background {
-            filter: opacity(0.2) !important;
-        }
-    }
-
-    .contextMenu-item-icon-background {
+    .contextMenuItem-icon {
         pointer-events: all;
         background-color: transparent;
         width: 35px;
@@ -103,6 +102,8 @@
     letter-spacing: 1px;
     text-transform: uppercase;
     padding-right: 30px;
+    align-items: center;
+    align-self: center;
 }
 
 .contextMenu-item:hover {
@@ -115,11 +116,6 @@
     cursor: pointer;
 }
 
-.contextMenu-itemSelected {
-    background: lightgoldenrodyellow;
-    border-style: none;
-}
-
 .contextMenu-group {
     // width: 11vw; //10vw
     height: 30px; //2vh
@@ -145,23 +141,24 @@
     padding-left: 5px;
 }
 
-.contextMenu-inlineMenu {
-    // border-top: solid 1px; //TODO:glr clean
-}
-
 .contextMenu-description {
     margin-left: 5px;
     text-align: left;
     display: inline; //need this?
 }
 
-.search-icon {
+.contextMenu-search {
     margin: 10px;
+    display: flex;
+    .contextMenu-searchIcon {
+        margin-right: 5px;
+    }
 }
 
-.search {
+.contextMenu-searchInput {
     margin-left: 10px;
     padding-left: 10px;
     border: solid black 1px;
     border-radius: 5px;
+    width: 100%;
 }