fix(module:tree,tree-select): fix the styles of connecting line

close NG-ZORRO#3382
hsuanxyz · Apr 29, 2019 · 514d093 · 514d093
1 parent 3590158
commit 514d093
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 30 deletions.
diff --git a/components/tree-select/style/entry.less b/components/tree-select/style/entry.less
@@ -4,3 +4,4 @@
 @import '../../tree/style/entry.less';
 @import '../../select/style/index.less';
 @import '../../empty/style/index.less';
+@import "./path.less";
diff --git a/components/tree-select/style/path.less b/components/tree-select/style/path.less
@@ -0,0 +1,9 @@
+.ant-tree.ant-select-tree.ant-tree-show-line nz-tree-node:not(:last-child) > li::before {
+  content: ' ';
+  width: 1px;
+  border-left: 1px solid #d9d9d9;
+  height: calc(100% - 16px);
+  position: absolute;
+  left: 12px;
+  margin: 26px 0;
+}
diff --git a/components/tree/style/index.less b/components/tree/style/index.less
@@ -37,7 +37,7 @@
       /* Required to make elements draggable in old WebKit */
       -khtml-user-drag: element;
       -webkit-user-drag: element;
-    }
+    }before
     &.drag-over {
       > span[draggable] {
         color: white;

diff --git a/components/tree/style/patch.less b/components/tree/style/patch.less
@@ -6,34 +6,19 @@
  * found in the LICENSE file at https://github.com/NG-ZORRO/ng-zorro-antd/blob/master/LICENSE
  */
 
-.ant-tree {
-  &.ant-tree-show-line {
-    > nz-tree-node:not(:last-child), .ant-tree-child-tree > nz-tree-node:not(:last-child) {
-      > li:before {
-        content: ' ';
-        width: 1px;
-        border-left: 1px solid @border-color-base;
-        height: 100%;
-        position: absolute;
-        left: 12px;
-        margin: 22px 0;
-      }
-    }
-
-    .ant-tree-child-tree > nz-tree-node:last-child {
-      > li:before {
-        content: ' ';
-        width: 1px;
-        border-left: 0px solid @border-color-base;
-        height: 100%;
-        position: absolute;
-        left: 12px;
-        margin: 22px 0;
-      }
-    }
-  }
+.ant-tree.ant-tree-show-line nz-tree-node:not(:last-child) > li::before {
+  content: ' ';
+  width: 1px;
+  border-left: 1px solid @border-color-base;
+  height: 100%;
+  position: absolute;
+  left: 12px;
+  margin: 22px 0;
+}
 
-  .font-highlight {
-    color: @highlight-color;
-  }
+.font-highlight {
+  color: @highlight-color;
 }
+
+
+