updates ready for sprint (almost)

2 files changed, 42 insertions, 44 deletions

diff --git a/src/client/views/topbar/TopBar.scss b/src/client/views/topbar/TopBar.scss
index ce6636080..adb968948 100644
--- a/src/client/views/topbar/TopBar.scss
+++ b/src/client/views/topbar/TopBar.scss
@@ -20,11 +20,34 @@
         align-items: center;
         background-color: $dark-gray;
 
+        .topBar-icon {
+            cursor: pointer;
+            font-size: 12px;
+            width: fit-content;
+            display: flex;
+            justify-content: center;
+            gap: 4px;
+            align-items: center;
+            justify-self: center;
+            align-self: center;
+            border-radius: 5px;
+            padding: 5px;
+            transition: linear 0.1s;
+            color: $black;
+            background-color: $light-gray;
+        }
+
+        .topBar-icon:hover {
+            background-color: $light-blue;
+        }
+
+        
         .topbar-center {
             grid-column: 2;
             display: inline-flex;
             justify-content: center;
             align-items: center;
+            gap: 5px;
 
             .topbar-lozenge-dashboard {
                 display: flex;
@@ -48,37 +71,13 @@
             }
         }
 
-        .topBar-icon {
-            color: black;
-            cursor: pointer;
-            font-size: 15px;
-            height: 30;
-            width: 30;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            margin-right: 5px;
-            justify-self: center;
-            align-self: center;
-            border-radius: 100%;
-            transition: linear 0.1s;
-            background-color: #92adb900;
-        }
-
-        .topBar-icon:hover {
-            background-color: rgba(0, 0, 0, 0.15);
-        }
 
         .topbar-right {
             grid-column: 3;
             position: relative;
             display: flex;
             justify-content: flex-end;
-
-            
-
-            
-
+            gap: 5px;
         }
 
         .topbar-left {
@@ -88,6 +87,7 @@
             position: relative;
             display: flex;
             width: 450;
+            gap: 5px;
 
             .topbar-lozenge-user,
             .topbar-lozenge {
@@ -98,10 +98,10 @@
                 font-weight: 400;
                 padding: 4px;
                 align-self: center;
+                margin-left: 7px;
                 margin-right: 7px;
                 display: flex;
                 align-items: center;
-                border: white 1px solid;
 
                 .topbar-dashSelect {
                     border: none;
diff --git a/src/client/views/topbar/TopBar.tsx b/src/client/views/topbar/TopBar.tsx
index 02b597078..6e4d4fe15 100644
--- a/src/client/views/topbar/TopBar.tsx
+++ b/src/client/views/topbar/TopBar.tsx
@@ -27,9 +27,9 @@ export class TopBar extends React.Component {
                     <div className="topbar-left">
                         <div className="topbar-lozenge-user">
                             {`${Doc.CurrentUserEmail}`}
-                            <div className="topbar-logoff" onClick={() => window.location.assign(Utils.prepend("/logout"))}>
-                                Logoff
-                            </div>
+                        </div>
+                        <div className="topbar-icon" onClick={() => window.location.assign(Utils.prepend("/logout"))}>
+                            {"Logoff"}<FontAwesomeIcon icon="sign-out"></FontAwesomeIcon>
                         </div>
                     </div>
                     <div className="topbar-center" >
@@ -39,26 +39,24 @@ export class TopBar extends React.Component {
                                 style={{ color: Colors.WHITE }}>
                                 {myDashboards.map((dash, i) => <option key={dash[Id]} value={i}> {StrCast(dash.title)} </option>)}
                             </select>
-                            <div className="topbar-dashboards">
-                                <div className="topbar-icon" onClick={undoBatch(() => CurrentUserUtils.createNewDashboard(Doc.UserDoc()))}
-                                    style={{ color: Colors.WHITE }}>
-                                    <FontAwesomeIcon icon="plus"></FontAwesomeIcon>{"New"}
-                                </div>
-                                <div className="topbar-icon" onClick={undoBatch(() => CurrentUserUtils.snapshotDashboard(Doc.UserDoc()))}
-                                    style={{ color: Colors.WHITE }}>
-                                    <FontAwesomeIcon icon="camera"></FontAwesomeIcon>{"Snapshot"}
-                                </div>
+                        </div>
+                        <div className="topbar-dashboards">
+                            <div className="topbar-icon" onClick={undoBatch(() => CurrentUserUtils.createNewDashboard(Doc.UserDoc()))}
+                            >
+                                {"New"}<FontAwesomeIcon icon="plus"></FontAwesomeIcon>
                             </div>
+                            {Doc.UserDoc().noviceMode ? (null) : <div className="topbar-icon" onClick={undoBatch(() => CurrentUserUtils.snapshotDashboard(Doc.UserDoc()))}
+                            >
+                                {"Snapshot"}<FontAwesomeIcon icon="camera"></FontAwesomeIcon>
+                            </div>}
                         </div>
                     </div>
                     <div className="topbar-right" >
-                        <div className="topbar-icon"
-                            style={{ color: Colors.WHITE }}>
-                            <FontAwesomeIcon icon="question-circle"></FontAwesomeIcon>
+                        <div className="topbar-icon">
+                            {"Help"}<FontAwesomeIcon icon="question-circle"></FontAwesomeIcon>
                         </div>
-                        <div className="topbar-icon" onClick={() => SettingsManager.Instance.open()}
-                            style={{ color: Colors.WHITE }}>
-                            <FontAwesomeIcon icon="cog"></FontAwesomeIcon>
+                        <div className="topbar-icon" onClick={() => SettingsManager.Instance.open()}>
+                            {"Settings"}<FontAwesomeIcon icon="cog"></FontAwesomeIcon>
                         </div>
 
                     </div>