Merge branch 'master' into secondpropertiesmenu-emily

1 files changed, 72 insertions, 404 deletions

diff --git a/src/client/views/PropertiesView.scss b/src/client/views/PropertiesView.scss
index 023e08e6a..060b506e3 100644
--- a/src/client/views/PropertiesView.scss
+++ b/src/client/views/PropertiesView.scss
@@ -6,139 +6,31 @@
     font-family: 'Roboto';
     font-size: 12px;
     cursor: auto;
+    border-left: $standard-border;
 
     .slider-text {
         font-size: 8px;
     }
 
-    overflow-x: hidden;
-    overflow-y: auto;
-
-    .propertiesView-propAndInfoGrouping{
-        display: flex;
-    }
-
     .propertiesView-title {
-        text-align: left;
-        padding-top: 12px;
-        // padding-bottom: 12px;
-        padding-left: 10px;
-        display: flex;
-        font-size: 25px;
+        padding: 10px;
+        font-size: 24px;
         font-weight: bold;
-        // justify-content: center;
-
-        .propertiesView-title-icon {
-            width: 20px;
-            height: 20px;
-            padding-left: 38px;
-            margin-top: -5px;
-            align-items: flex-end;
-            margin-left: auto;
-            margin-right: 10px;
-
-            &:hover {
-                color: grey;
-                cursor: pointer;
-            }
-        }
     }
 
-    .propertiesView-info{
-        margin-top: 20;
-        margin-right: 10;
-        float: right;
-        font-size: 20;
-    }
-
-    .propertiesView-name {
-       // border-bottom: 1px solid black;
-        padding: 8.5px;
-        font-size: 12.5px;
-
-        &:hover {
-            cursor: text;
-        }
-    }
+    overflow-x: hidden;
+    overflow-y: auto;
 
-    .propertiesView-type{
-        padding: 8.5px;
-        font-size: 12.5px;
+    .propertiesView-name,
+    .propertiesView-type {
+        padding: 5px 10px;
     }
 
-    .propertiesView-settings {
-        //border-bottom: 1px solid black;
-        //padding: 8.5px;
-        font-size: 12.5px;
-        font-weight: bold;
-
-        .propertiesView-settings-title {
-            font-weight: bold;
-            font-size: 12.5px;
-            padding: 4px;
-            display: flex;
-            color: white;
-            padding-left: 8px;
-            background-color: rgb(51, 51, 51);
-
-            &:hover {
-                cursor: pointer;
-            }
-
-            .propertiesView-settings-title-icon {
-                float: right;
-                justify-items: right;
-                align-items: flex-end;
-                margin-left: auto;
-                margin-right: 9px;
-
-                &:hover {
-                    cursor: pointer;
-                }
-            }
-        }
-
-        .propertiesView-settings-content {
-            margin-left: 12px;
-            padding-bottom: 10px;
-            padding-top: 8px;
-        }
-    }
 
     .propertiesView-sharing {
         //border-bottom: 1px solid black;
         //padding: 8.5px;
 
-        .propertiesView-sharing-title {
-            font-weight: bold;
-            font-size: 12.5px;
-            padding: 4px;
-            display: flex;
-            color: white;
-            padding-left: 8px;
-            background-color: rgb(51, 51, 51);
-
-            &:hover {
-                cursor: pointer;
-            }
-
-            .propertiesView-sharing-title-icon {
-                float: right;
-                justify-items: right;
-                align-items: flex-end;
-                margin-left: auto;
-                margin-right: 9px;
-
-                &:hover {
-                    cursor: pointer;
-                }
-            }
-        }
-
-        .propertiesView-sharing-content {
-            font-size: 10px;
-            padding: 10px;
-            margin-left: 5px;
 
             .propertiesView-buttonContainer {
                 float: right;
@@ -152,12 +44,12 @@
                 }
 
                 .propertiesView-acls-checkbox {
-                    margin-top: -20px;
+                    margin-top: -15px;
+                    margin-bottom: -10px;
 
                     .propertiesView-acls-checkbox-text {
-                        font-size: 7px;
-                        margin-top: -10px;
-                        margin-left: 6px;
+                        display: inline;
+                        font-size: 9px;
                     }
                 }
             }
@@ -174,6 +66,58 @@
                     width: 100%;
                 }
             }
+    }
+
+    .propertiesView-shareDropDown{
+        margin-right: 10px;
+        min-width: 65px;
+        
+        & .propertiesView-shareDropDownNone{
+            height: 16px;
+            padding: 0px;
+            padding-left: 3px;
+            background: grey;
+            color: rgb(71, 71, 71);
+            border-radius: 6px;
+            border: 1px solid rgb(71, 71, 71);
+        }
+        & .propertiesView-shareDropDownEdit,
+        .propertiesView-shareDropDownAdmin{
+            height: 16px;
+            padding: 0px;
+            padding-left: 3px;
+            background: rgb(254, 254, 199);
+            color: rgb(75, 75, 5);
+            border-radius: 6px;
+            border: 1px solid rgb(75, 75, 5);
+        }
+        & .propertiesView-shareDropDownAugment{
+            height: 16px;
+            padding: 0px;
+            padding-left: 3px;
+            background: rgb(208, 255, 208);
+            color:rgb(19, 80, 19);
+            border-radius: 6px;
+            border: 1px solid rgb(19, 80, 19);
+
+        }
+        & .propertiesView-shareDropDownView{
+            height: 16px;
+            padding: 0px;
+            padding-left: 3px;
+            background: rgb(213, 213, 255);
+            color: rgb(25, 25, 101);
+            border-radius: 6px;
+            border: 1px solid rgb(25, 25, 101);
+        }
+        & .propertiesView-shareDropDownNot-Shared{
+            height: 16px;
+            padding: 0px;
+            padding-left: 3px;
+            background: rgb(255, 207, 207);
+            color: rgb(138, 47, 47);
+            border-radius: 6px;
+            border: 1px solid rgb(138, 47, 47);
         }
     }
 
@@ -181,33 +125,7 @@
         //border-bottom: 1px solid black;
         //padding: 8.5px;
 
-        .propertiesView-filters-title {
-            font-weight: bold;
-            font-size: 12.5px;
-            padding: 4px;
-            display: flex;
-            color: white;
-            padding-left: 8px;
-            background-color: rgb(51, 51, 51);
-
-            &:hover {
-                cursor: pointer;
-            }
-
-            .propertiesView-filters-title-icon {
-                float: right;
-                justify-items: right;
-                align-items: flex-end;
-                margin-left: auto;
-                margin-right: 9px;
-
-                &:hover {
-                    cursor: pointer;
-                }
-            }
-        }
-
-        .propertiesView-filters-content {
+        .propertiesView-content {
             font-size: 10px;
             padding: 10px;
             margin-left: 5px;
@@ -236,85 +154,10 @@
         }
     }
 
-    .propertiesView-appearance {
-        //border-bottom: 1px solid black;
-        //padding: 8.5px;
-
-        .propertiesView-appearance-title {
-            font-weight: bold;
-            font-size: 12.5px;
-            padding: 4px;
-            display: flex;
-            color: white;
-            padding-left: 8px;
-            background-color: rgb(51, 51, 51);
-
-            &:hover {
-                cursor: pointer;
-            }
-
-            .propertiesView-appearance-title-icon {
-                float: right;
-                justify-items: right;
-                align-items: flex-end;
-                margin-left: auto;
-                margin-right: 9px;
-
-                &:hover {
-                    cursor: pointer;
-                }
-            }
-        }
-
-        .propertiesView-appearance-content {
-            font-size: 10px;
-            padding: 10px;
-            margin-left: 5px;
-        }
-    }
-
-    .propertiesView-transform {
-        //border-bottom: 1px solid black;
-        //padding: 8.5px;
-
-        .propertiesView-transform-title {
-            font-weight: bold;
-            font-size: 12.5px;
-            padding: 4px;
-            display: flex;
-            color: white;
-            padding-left: 8px;
-            background-color: rgb(51, 51, 51);
-
-            &:hover {
-                cursor: pointer;
-            }
-
-            .propertiesView-transform-title-icon {
-                float: right;
-                justify-items: right;
-                align-items: flex-end;
-                margin-left: auto;
-                margin-right: 9px;
-
-                &:hover {
-                    cursor: pointer;
-                }
-            }
-        }
-
-        .propertiesView-transform-content {
-            font-size: 10px;
-            padding: 10px;
-            margin-left: 5px;
-        }
-    }
-
     .notify-button {
         padding: 2px;
         width: 12px;
         height: 12px;
-        background-color: black;
         border-radius: 10px;
         padding-left: 2px;
         padding-right: 2px;
@@ -334,13 +177,13 @@
     }
 
     .expansion-button {
-        margin-left: -20;
+        margin-left: -15px;
+        margin-right: 20px;
 
         .expansion-button-icon {
             width: 11px;
             height: 11px;
             color: black;
-            margin-left: 27px;
 
             &:hover {
                 color: rgb(131, 131, 131);
@@ -357,18 +200,13 @@
         padding: 5px; // remove when adding buttons
         border-radius: 6px; // remove when adding buttons
         margin-right: 10px; // remove when adding buttons
-        // width: 100%;
-        // display: inline-table;
         background-color: #ececec;
-        max-height: 130px;
-        overflow-y: auto;
-        width: 92%;
+        width: 97%;
 
         .propertiesView-sharingTable-item {
             display: flex;
-            // padding: 5px;
             padding: 3px;
-            align-items: center;
+            align-items: right;
             border-bottom: 0.5px solid grey;
 
             &:hover .propertiesView-sharingTable-item-name {
@@ -389,19 +227,9 @@
             .propertiesView-sharingTable-item-permission {
                 display: flex;
                 align-items: flex-end;
+                text-align: right;
                 margin-left: auto;
-
-                .permissions-select {
-                    border: none;
-                    background-color: inherit;
-                    width: 87px;
-                    text-align: justify; // for Edge
-                    text-align-last: end;
-
-                    &:hover {
-                        cursor: pointer;
-                    }
-                }
+                margin-right: -12px;
             }
 
             &:last-child {
@@ -410,67 +238,6 @@
         }
     }
 
-    .propertiesView-fields {
-        //border-bottom: 1px solid black;
-        //padding: 8.5px;
-
-        .propertiesView-fields-title {
-            font-weight: bold;
-            font-size: 12.5px;
-            padding: 4px;
-            display: flex;
-            color: white;
-            padding-left: 8px;
-            background-color: rgb(51, 51, 51);
-
-            &:hover {
-                cursor: pointer;
-            }
-
-            .propertiesView-fields-title-icon {
-                float: right;
-                justify-items: right;
-                align-items: flex-end;
-                margin-left: auto;
-                margin-right: 9px;
-
-                &:hover {
-                    cursor: pointer;
-                }
-            }
-        }
-
-        .propertiesView-fields-checkbox {
-            float: right;
-            height: 20px;
-            margin-top: -4px;
-            //margin-top: -9px;
-            display: flex;
-            flex-direction: column;
-            align-items: center;
-            color:black;
-           // justify-content: center;
-
-            .propertiesView-fields-checkbox-text {
-                font-size: 7px;
-                text-align: center;
-                margin-right: 6px;
-                 margin-top: -10px;
-                // margin-left: 6px;
-            }
-        }
-
-        .propertiesView-fields-content {
-            font-size: 10px;
-            margin-left: 2px;
-            padding: 10px;
-
-            &:hover {
-                cursor: pointer;
-            }
-        }
-    }
-
     .propertiesView-field {
         display: flex;
         font-size: 7px;
@@ -491,109 +258,14 @@
         }
     }
 
-    .propertiesView-contexts {
-        .propertiesView-contexts-title {
-            font-weight: bold;
-            font-size: 12.5px;
-            padding: 4px;
-            display: flex;
-            color: white;
-            padding-left: 8px;
-            background-color: rgb(51, 51, 51);
-
-            &:hover {
-                cursor: pointer;
-            }
-
-            .propertiesView-contexts-title-icon {
-                float: right;
-                justify-items: right;
-                align-items: flex-end;
-                margin-left: auto;
-                margin-right: 9px;
-
-                &:hover {
-                    cursor: pointer;
-                }
-            }
-        }
-
-        .propertiesView-contexts-content {
-            overflow: hidden;
-            padding: 10px;
-        }
-    }
-
-    .propertiesView-layout {
-        .propertiesView-layout-title {
-            font-weight: bold;
-            font-size: 12.5px;
-            padding: 4px;
-            display: flex;
-            color: white;
-            padding-left: 8px;
-            background-color: rgb(51, 51, 51);
-
-            &:hover {
-                cursor: pointer;
-            }
-
-            .propertiesView-layout-title-icon {
-                float: right;
-                justify-items: right;
-                align-items: flex-end;
-                margin-left: auto;
-                margin-right: 9px;
-
-                &:hover {
-                    cursor: pointer;
-                }
-            }
-        }
-
-        .propertiesView-layout-content {
-            overflow: hidden;
-            padding: 10px;
-        }
     }
 
     .propertiesView-presTrails {
         //border-bottom: 1px solid black;
         //padding: 8.5px;
 
-        .propertiesView-presTrails-title {
-            font-weight: bold;
-            font-size: 12.5px;
-            padding: 4px;
-            display: flex;
-            color: white;
-            padding-left: 8px;
-            background-color: rgb(51, 51, 51);
-
-            &:hover {
-                cursor: pointer;
-            }
-
-            .propertiesView-presTrails-title-icon {
-                float: right;
-                justify-items: right;
-                align-items: flex-end;
-                margin-left: auto;
-                margin-right: 9px;
-
-                &:hover {
-                    cursor: pointer;
-                }
-            }
-        }
-
-        .propertiesView-presTrails-content {
-            font-size: 10px;
-            padding: 10px;
-            margin-left: 5px;
-        }
+      
     }
-}
 
 .inking-button {
     display: flex;
@@ -900,10 +572,6 @@
     padding: 5%;
 }
 
-.propertiesView-section {
-    padding-left: 20px;
-}
-
 .propertiesView-input {
     padding: 4px 8px;