Merge branch 'master' into geireann_dash_components

1 files changed, 52 insertions, 38 deletions

diff --git a/src/client/views/DashboardView.scss b/src/client/views/DashboardView.scss
index b95312ea0..6be2133ef 100644
--- a/src/client/views/DashboardView.scss
+++ b/src/client/views/DashboardView.scss
@@ -1,12 +1,15 @@
-@import "./global/globalCssVariables";
-
+@import './global/globalCssVariables';
 
 .dashboard-view {
-      padding: 50px;
-      display: flex;
-      flex-direction: row;
-      width: 100%;
-      position: absolute;
+    padding: 50px;
+    display: flex;
+    flex-direction: row;
+    width: 100%;
+    position: absolute;
+    height: 100%;
+    width:100%;
+    padding-right: 0px;
+    overflow: auto;
 
       .left-menu {
             display: flex;
@@ -17,24 +20,25 @@
             gap: 5px;
       }
 
-      .all-dashboards {
-            display: flex;
-            flex-direction: row;
-            flex-wrap: wrap;
-            overflow-y: scroll;
-      }
+    .all-dashboards {
+        display: flex;
+        flex-direction: row;
+        flex-wrap: wrap;
+        overflow-y: auto;
+        width: 100%;
+    }
 }
 
 .text-button {
     cursor: pointer;
-      padding: 3px 0;
-      &:hover {
-            font-weight: 500;
-      }
+    padding: 3px 0;
+    &:hover {
+        font-weight: 500;
+    }
 
-      &.selected {
-            font-weight: 700;
-      }
+    &.selected {
+        font-weight: 700;
+    }
 }
 
 .new-dashboard-button {
@@ -86,27 +90,37 @@
       margin: 0 0px 30px 30px;
       overflow: hidden;
 
-      &:hover{
+    &:hover {
         outline: solid 2px $light-blue;
-      }
+    }
 
-      .title {
-            margin: 10px;
-            font-weight: 500;
-      }
+    .title {
+        margin: 10px;
+        font-weight: 500;
+    }
 
-      img {
-            width: auto;
-            height: 80%;
-      }
+    img {
+        width: auto;
+        height: 80%;
+    }
 
-      .info {
-            display: flex;
-            flex-direction: row;
-            justify-content: space-between;
-            align-items: center;
-            padding: 0px 10px;
-      }
+    .info {
+        display: flex;
+        flex-direction: row;
+        justify-content: space-between;
+        align-items: center;
+        padding: 0px 10px;
+    }
+    .dashboard-status,
+    .dashboard-status-shared {
+        font-size: 9;
+        left: 10%;
+        position: relative;
+        top: -5;
+    }
+    .dashboard-status-shared {
+        background: 'lightgreen';
+    }
 
       .more {
             z-index: 100;
@@ -158,4 +172,4 @@
         flex-direction: row;
         justify-content: flex-end;
     }
-}
\ No newline at end of file
+}