feat: resolve conflicts

DTStack · Nov 27, 2020 · a99d131 · a99d131
1 parent 304e31a
commit a99d131
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/style/theme.scss b/src/style/theme.scss
@@ -152,17 +152,17 @@
         }
     }
 
-    .rc-tree-treenode.drag-over>.draggable {
+    .rc-tree-treenode.drag-over > .draggable {
         @include border-color(#316ac5);
         background-color: #316ac5;
         color: #bbb;
     }
 
-    .rc-tree-treenode.drag-over-gap-top>.draggable {
+    .rc-tree-treenode.drag-over-gap-top > .draggable {
         border-top: 2px rgb(0, 122, 204) solid;
     }
 
-    .rc-tree-treenode.drag-over-gap-bottom>.draggable {
+    .rc-tree-treenode.drag-over-gap-bottom > .draggable {
         border-bottom: 2px rgb(0, 122, 204) solid;
     }
 
@@ -192,4 +192,4 @@
             background-color: #316ac5;
         }
     }
-}
+}