From 7aba0a9b1b1a3e7d72e24118ecbb05b98165d3b9 Mon Sep 17 00:00:00 2001
From: Melissa Zhang <mzhang19096@gmail.com>
Date: Wed, 23 Dec 2020 14:39:29 -0800
Subject: UI styling changes

---
 src/client/views/collections/TreeView.scss | 27 +++++++++++++++------------
 src/client/views/collections/TreeView.tsx  |  7 ++++---
 2 files changed, 19 insertions(+), 15 deletions(-)

(limited to 'src/client/views/collections')

diff --git a/src/client/views/collections/TreeView.scss b/src/client/views/collections/TreeView.scss
index 45dec2661..3c1e16f6c 100644
--- a/src/client/views/collections/TreeView.scss
+++ b/src/client/views/collections/TreeView.scss
@@ -98,15 +98,20 @@
         width: unset;
     }
 
-    >svg, .styleProvider-treeView-lock, .styleProvider-treeView-hide, .styleProvider-treeView-lock-active, .styleProvider-treeView-hide-active {
+    .right-buttons-container {
+        display: flex;
+        align-items: center;
         margin-left: 0.25rem;
-        margin-right: 0.25rem; 
-    }
 
-    >svg, .styleProvider-treeView-lock, .styleProvider-treeView-hide {
-        display: none;
+        >svg, .styleProvider-treeView-lock, .styleProvider-treeView-hide, .styleProvider-treeView-lock-active, .styleProvider-treeView-hide-active {
+            margin-left: 0.25rem;
+            margin-right: 0.25rem; 
+        }
+    
+        >svg, .styleProvider-treeView-lock, .styleProvider-treeView-hide {
+            display: none;
+        }
     }
-
 }
 
 .treeView-header:hover {
@@ -114,10 +119,6 @@
         display: inherit;
     }
 
-    >svg {
-        display: inherit;
-    }
-
     .treeView-openRight {
         display: inline-block;
         height: 17px;
@@ -131,8 +132,10 @@
         }
     }
 
-    .styleProvider-treeView-lock, .styleProvider-treeView-hide {
-        display: inherit;
+    .right-buttons-container {
+        >svg, .styleProvider-treeView-lock, .styleProvider-treeView-hide {
+            display: inherit;
+        }
     }
 }
 
diff --git a/src/client/views/collections/TreeView.tsx b/src/client/views/collections/TreeView.tsx
index 8d25cc295..bce0ba9e2 100644
--- a/src/client/views/collections/TreeView.tsx
+++ b/src/client/views/collections/TreeView.tsx
@@ -585,9 +585,10 @@ export class TreeView extends React.Component<TreeViewProps> {
                 }} >
                 {view}
             </div >
-            {/* hide and lock buttons */}
-            {this.props.styleProvider?.(this.doc, this.props.treeView.props, StyleProp.Decorations)} 
-            {this.headerElements}
+            <div className={"right-buttons-container"}>
+                {this.props.styleProvider?.(this.doc, this.props.treeView.props, StyleProp.Decorations)} {/* hide and lock buttons */}
+                {this.headerElements}
+            </div>
         </>;
     }
 
-- 
cgit v1.2.3-70-g09d2