merge with master

1 files changed, 40 insertions, 24 deletions

diff --git a/src/client/util/SharingManager.scss b/src/client/util/SharingManager.scss
index 130785672..8da80ef52 100644
--- a/src/client/util/SharingManager.scss
+++ b/src/client/util/SharingManager.scss
@@ -1,6 +1,6 @@
 .sharing-interface {
     width: 600px;
-    height: 360px;
+    // height: 360px;
 
     .overlay {
         transform: translate(-20px, -20px);
@@ -23,33 +23,51 @@
             z-index: 999;
         }
 
-        .share-setup {
-            display: flex;
-            margin-bottom: 20px;
-            align-items: center;
-            height: 36;
+        .share-container {
+            .share-setup {
+                display: flex;
+                margin-bottom: 20px;
+                align-items: center;
+                height: 36;
 
-            .user-search {
-                width: 90%;
+                .user-search {
+                    width: 90%;
 
-                input {
-                    height: 30;
+                    input {
+                        height: 30;
+                    }
+                }
+
+                .permissions-select {
+                    z-index: 1;
+                    margin-left: -100;
+                    border: none;
+                    outline: none;
+                    text-align: justify; // for Edge
+                    text-align-last: end;
                 }
-            }
 
-            .permissions-select {
-                z-index: 1;
-                margin-left: -100;
-                border: none;
-                outline: none;
-                text-align: justify; // for Edge
-                text-align-last: end;
+                .share-button {
+                    height: 105%;
+                    margin-left: 2%;
+                    background-color: black;
+                }
             }
 
-            .share-button {
-                height: 105%;
-                margin-left: 2%;
-                background-color: #979797;
+            .sort-checkboxes {
+                float: left;
+                margin-top: -17px;
+                margin-bottom: 10px;
+                font-size: 10px;
+
+                input {
+                    height: 10px;
+                }
+
+                label {
+                    font-weight: normal;
+                    font-style: italic;
+                }
             }
         }
 
@@ -92,10 +110,8 @@
                     height: 250px;
                     margin: 0 2;
 
-
                     .none {
                         font-style: italic;
-
                     }
                 }
             }