Merge branch 'master' into schema-view-En-Hua

1 files changed, 7 insertions, 30 deletions

diff --git a/src/client/views/PropertiesView.scss b/src/client/views/PropertiesView.scss
index fa45a065d..321b83f52 100644
--- a/src/client/views/PropertiesView.scss
+++ b/src/client/views/PropertiesView.scss
@@ -1,6 +1,8 @@
+@import "./global/globalCssVariables.scss";
+
 .propertiesView {
     height: 100%;
-    font-family: "Noto Sans";
+    font-family: "Roboto";
     cursor: auto;
 
     overflow-x: hidden;
@@ -28,9 +30,7 @@
                 color: grey;
                 cursor: pointer;
             }
-
         }
-
     }
 
     .propertiesView-name {
@@ -80,7 +80,6 @@
             padding-bottom: 10px;
             padding-top: 8px;
         }
-
     }
 
     .propertiesView-sharing {
@@ -140,8 +139,6 @@
                 }
             }
 
-
-
             .change-buttons {
                 display: flex;
 
@@ -216,7 +213,6 @@
         }
     }
 
-
     .propertiesView-appearance {
         //border-bottom: 1px solid black;
         //padding: 8.5px;
@@ -305,7 +301,7 @@
         .notify-button-icon {
             width: 6px;
             height: 6.5px;
-            margin-left: .5px;
+            margin-left: 0.5px;
         }
 
         &:hover {
@@ -331,7 +327,6 @@
     }
 
     .propertiesView-sharingTable {
-
         // whatever's commented out - add it back in when adding the buttons
 
         // border: 1.5px solid black;
@@ -347,7 +342,6 @@
         width: 92%;
 
         .propertiesView-sharingTable-item {
-
             display: flex;
             // padding: 5px;
             padding: 3px;
@@ -421,7 +415,6 @@
                     cursor: pointer;
                 }
             }
-
         }
 
         .propertiesView-fields-checkbox {
@@ -468,7 +461,6 @@
     }
 
     .propertiesView-contexts {
-
         .propertiesView-contexts-title {
             font-weight: bold;
             font-size: 12.5px;
@@ -499,11 +491,9 @@
             overflow: hidden;
             padding: 10px;
         }
-
     }
 
     .propertiesView-layout {
-
         .propertiesView-layout-title {
             font-weight: bold;
             font-size: 12.5px;
@@ -534,7 +524,6 @@
             overflow: hidden;
             padding: 10px;
         }
-
     }
 
     .propertiesView-presTrails {
@@ -576,7 +565,6 @@
 }
 
 .inking-button {
-
     display: flex;
 
     .inking-button-points {
@@ -635,7 +623,6 @@
 }
 
 .inputBox {
-
     margin-top: 10px;
     display: flex;
     height: 19px;
@@ -658,7 +645,6 @@
     }
 
     .inputBox-button {
-
         .inputBox-button-up {
             background-color: #333333;
             height: 9px;
@@ -690,7 +676,6 @@
                 cursor: pointer;
             }
         }
-
     }
 }
 
@@ -767,7 +752,6 @@
 }
 
 .widthAndDash {
-
     .width {
         .width-top {
             display: flex;
@@ -792,13 +776,11 @@
     }
 
     .arrows {
-
         display: flex;
         margin-bottom: 3px;
         margin-left: 4px;
 
         .arrows-head {
-
             display: flex;
             margin-right: 35px;
 
@@ -827,7 +809,6 @@
     }
 
     .dashed {
-
         display: flex;
         margin-left: 64px;
         margin-bottom: 6px;
@@ -844,19 +825,15 @@
 }
 
 .editable-title {
-    border: none;
     padding: 6px;
     padding-bottom: 2px;
-    background: #eeeeee;
-    border-top: 1px solid;
-    border-left: 1px solid;
+    border: solid 1px $dark-gray;
 
     &:hover {
-        border: 0.75px solid rgb(122, 28, 28);
+        border: 0.75px solid $medium-blue;
     }
 }
 
-
 .properties-flyout {
     grid-column: 2/4;
-}
\ No newline at end of file
+}