Merge branch 'master' into lanyi-branch

3 files changed, 6 insertions, 5 deletions

diff --git a/src/client/views/linking/LinkMenuItem.scss b/src/client/views/linking/LinkMenuItem.scss
index 3cd60c87f..cc8c168cf 100644
--- a/src/client/views/linking/LinkMenuItem.scss
+++ b/src/client/views/linking/LinkMenuItem.scss
@@ -114,7 +114,7 @@
     .linkMenu-deleteButton {
         width: 20px;
         height: 20px;
-        margin: 0;
+        margin: 0px;
         margin-right: 4px;
         padding-right: 6px;
         border-radius: 50%;
@@ -134,7 +134,7 @@
         }
 
         &:last-child {
-            margin-right: 0;
+            margin-right: 0px;
         }
 
         &:hover {
diff --git a/src/client/views/linking/LinkPopup.scss b/src/client/views/linking/LinkPopup.scss
index 4bfb4b0b9..f8d724767 100644
--- a/src/client/views/linking/LinkPopup.scss
+++ b/src/client/views/linking/LinkPopup.scss
@@ -1,7 +1,9 @@
 .linkPopup-container {
     background: white;
-    box-shadow: 0 10px 20px rgba(0, 0, 0, 0.19), 0 6px 6px rgba(0, 0, 0, 0.23);
-    top: 0;
+    box-shadow:
+        0 10px 20px rgba(0, 0, 0, 0.19),
+        0 6px 6px rgba(0, 0, 0, 0.23);
+    top: 0px;
     height: 200px;
     width: 200px;
     // padding: 15px;
diff --git a/src/client/views/linking/LinkPopup.tsx b/src/client/views/linking/LinkPopup.tsx
index b654f9bd0..760850241 100644
--- a/src/client/views/linking/LinkPopup.tsx
+++ b/src/client/views/linking/LinkPopup.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable react/require-default-props */
 import { observer } from 'mobx-react';
 import * as React from 'react';
 import { returnEmptyFilter, returnFalse, returnTrue } from '../../../ClientUtils';