Merge branch 'master' into lanyi-branch

1 files changed, 20 insertions, 34 deletions

diff --git a/src/client/views/FilterPanel.scss b/src/client/views/FilterPanel.scss
index 508b1ee1f..e32db000f 100644
--- a/src/client/views/FilterPanel.scss
+++ b/src/client/views/FilterPanel.scss
@@ -1,4 +1,3 @@
-
 .filterBox-flyout {
     display: block;
     text-align: left;
@@ -29,7 +28,7 @@
 
 // .filterBox-bottom {
 //     // position: fixed;
-//     // bottom: 0;
+//     // bottom: 0px;
 //     // width: 100%;
 // }
 
@@ -88,7 +87,7 @@
 //     padding-bottom: 20px;
 //     border-bottom: 2px solid black;
 //     position: fixed;
-//     top: 0;
+//     top: 0px;
 //     width: 100%;
 // }
 
@@ -154,8 +153,8 @@
     flex-direction: column;
     width: 100%;
     position: relative;
-    right: 0;
-    top: 0;
+    right: 0px;
+    top: 0px;
     z-index: 1;
     //  background-color:  #9f9f9f;
 
@@ -240,60 +239,52 @@
     transition: all 0.3s ease-out;
     display: flex;
     flex-direction: row;
-    padding: 5px; 
-
+    padding: 5px;
 
-    &:hover{
+    &:hover {
         border-color: #e9e9e9;
-        background-color: #6d6c6c
+        background-color: #6d6c6c;
     }
 
-    .hotKey-icon, .hotKey-close{
+    .hotKey-icon,
+    .hotKey-close {
         background-color: transparent;
         border-radius: 10%;
         padding: 5px;
 
-
-        &:hover{
+        &:hover {
             background-color: #616060;
         }
     }
 
-    .hotKey-close{
+    .hotKey-close {
         right: 30px;
-        position: fixed;  
+        position: fixed;
         padding-top: 10px;
-  
-}
+    }
 
-    .hotkey-title{
+    .hotkey-title {
         top: 6px;
         position: relative;
         cursor: text;
-
     }
 
-    .hotkey-title-input{
+    .hotkey-title-input {
         background-color: transparent;
         border: none;
         border-color: transparent;
         outline: none;
         cursor: text;
-
     }
 }
 
 .hotKeyButtons {
     position: relative;
     width: 100%;
-
 }
 
 .hotKey-icon-button {
-
-        background-color: transparent;
-
-
+    background-color: transparent;
 }
 
 .icon-panel {
@@ -305,24 +296,19 @@
     border-radius: 10%;
     background-color: #323232;
 
-    .icon-panel-button{
+    .icon-panel-button {
         background-color: #323232;
         border-radius: 10%;
 
-
-        &:hover{
-            background-color:#7a7878
+        &:hover {
+            background-color: #7a7878;
         }
     }
-
-
-
 }
 
-
 // .sliderBox-outerDiv {
 //     width: 30%;// width: calc(100% - 14px);   // 14px accounts for handles that are at the max value of the slider that would extend outside the box
-//     height: 40; // height: 100%;
+//     height: 40px; // height: 100%;
 //     border-radius: inherit;
 //     display: flex;
 //     flex-direction: column;