From d3a7e378e26466b911733f76addfe9fc61a689df Mon Sep 17 00:00:00 2001
From: geireann <geireann.lindfield@gmail.com>
Date: Sat, 31 Jul 2021 18:17:35 -0400
Subject: fixed linking issues with dragging & updating linking UI

---
 src/client/views/topbar/TopBar.scss | 3 ++-
 src/client/views/topbar/TopBar.tsx  | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/src/client/views/topbar/TopBar.scss b/src/client/views/topbar/TopBar.scss
index ebdf030e7..ac6ec9b30 100644
--- a/src/client/views/topbar/TopBar.scss
+++ b/src/client/views/topbar/TopBar.scss
@@ -23,6 +23,7 @@
         .topBar-icon {
             cursor: pointer;
             font-size: 12px;
+            font-family: 'Roboto';
             width: fit-content;
             display: flex;
             justify-content: center;
@@ -91,7 +92,7 @@
             gap: 5px;
 
             .topBar-icon:hover {
-                background-color: $logout-red;
+                background-color: $close-red;
             }
 
             .topbar-lozenge-user,
diff --git a/src/client/views/topbar/TopBar.tsx b/src/client/views/topbar/TopBar.tsx
index bd9935333..05edb975c 100644
--- a/src/client/views/topbar/TopBar.tsx
+++ b/src/client/views/topbar/TopBar.tsx
@@ -12,7 +12,6 @@ import { Borders, Colors } from "../global/globalEnums";
 import "./TopBar.scss";
 
 /**
- * REACT TYPE: FUNCTIONAL
  * ABOUT: This is the topbar in Dash, which included the current Dashboard as well as access to information on the user
  * and settings and help buttons. Future scope for this bar is to include the collaborators that are on the same Dashboard. 
  */
-- 
cgit v1.2.3-70-g09d2


From b1361eec6d3f554d4927931c339b5c169b9a54a7 Mon Sep 17 00:00:00 2001
From: geireann <geireann.lindfield@gmail.com>
Date: Sat, 31 Jul 2021 22:23:55 -0400
Subject: mini css changes

---
 src/client/views/DocumentButtonBar.scss | 1 -
 src/client/views/topbar/TopBar.scss     | 9 ++++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

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

diff --git a/src/client/views/DocumentButtonBar.scss b/src/client/views/DocumentButtonBar.scss
index 171e7134f..a112f4745 100644
--- a/src/client/views/DocumentButtonBar.scss
+++ b/src/client/views/DocumentButtonBar.scss
@@ -46,7 +46,6 @@ $linkGap : 3px;
 .documentButtonBar {
     display: flex;
     flex-direction: row;
-    gap: 3px;
 }
 
 .documentButtonBar-button {
diff --git a/src/client/views/topbar/TopBar.scss b/src/client/views/topbar/TopBar.scss
index ac6ec9b30..164cc29cd 100644
--- a/src/client/views/topbar/TopBar.scss
+++ b/src/client/views/topbar/TopBar.scss
@@ -50,12 +50,15 @@
             align-items: center;
             gap: 5px;
 
+            .topbar-dashboards {
+                display: flex;
+                flex-direction: row;
+            }
+
             .topbar-lozenge-dashboard {
                 display: flex;
 
-                .topbar-dashboards {
-                    display: inline-flex;
-                }
+                    
 
                 .topbar-dashSelect {
                     border: none;
-- 
cgit v1.2.3-70-g09d2