feat: resolve conflicts

mumiao · mumiao · commit a99d131923e2 · 2020-11-27T18:11:50.000+08:00
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;
         }
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -152,17 +152,17 @@`
`152`	`152`	`}`
`153`	`153`	`}`
`154`	`154`
`155`		`- .rc-tree-treenode.drag-over>.draggable {`
	`155`	`+ .rc-tree-treenode.drag-over > .draggable {`
`156`	`156`	`@include border-color(#316ac5);`
`157`	`157`	`background-color: #316ac5;`
`158`	`158`	`color: #bbb;`
`159`	`159`	`}`
`160`	`160`
`161`		`- .rc-tree-treenode.drag-over-gap-top>.draggable {`
	`161`	`+ .rc-tree-treenode.drag-over-gap-top > .draggable {`
`162`	`162`	`border-top: 2px rgb(0, 122, 204) solid;`
`163`	`163`	`}`
`164`	`164`
`165`		`- .rc-tree-treenode.drag-over-gap-bottom>.draggable {`
	`165`	`+ .rc-tree-treenode.drag-over-gap-bottom > .draggable {`
`166`	`166`	`border-bottom: 2px rgb(0, 122, 204) solid;`
`167`	`167`	`}`
`168`	`168`
`@@ -192,4 +192,4 @@`
`192`	`192`	`background-color: #316ac5;`
`193`	`193`	`}`
`194`	`194`	`}`
`195`		`-}`
	`195`	`+}`