diff --git a/demo/less/face.less b/demo/less/face.less
index b9c4fe499..3e22a078b 100644
--- a/demo/less/face.less
+++ b/demo/less/face.less
@@ -3,7 +3,7 @@
.demo-face {
.face-config {
.config-label {
- font-size: 14px;
+ font-size: 1.4rem;
}
.config-item {
}
diff --git a/demo/less/main.less b/demo/less/main.less
index 4e6cb4376..2e6c8ff61 100644
--- a/demo/less/main.less
+++ b/demo/less/main.less
@@ -83,9 +83,7 @@ body {
-moz-transition: all 0.5s ease;
-o-transition: all 0.5s ease;
background: #3f8ce8;
- -webkit-border-radius: 20px;
- -moz-border-radius: 20px;
- border-radius: 20px;
+ border-radius: 2rem;
overflow: hidden;
overflow-x: hidden;
overflow-y: hidden;
@@ -99,7 +97,5 @@ body {
}
.bi-progress-bar-bar {
- -webkit-border-radius: 20px;
- -moz-border-radius: 20px;
- border-radius: 20px;
+ border-radius: 2rem;
}
\ No newline at end of file
diff --git a/demo/less/north.less b/demo/less/north.less
index 0114afd65..12fbdb5b4 100644
--- a/demo/less/north.less
+++ b/demo/less/north.less
@@ -6,7 +6,7 @@
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
color: @color-bi-text;
background-color: #367fa9;
- font-size: 20px;
+ font-size: 2rem;
font-weight: 300;
}
}
\ No newline at end of file
diff --git a/src/case/tree/treeexpander/tree.expander.popup.js b/src/case/tree/treeexpander/tree.expander.popup.js
index c3f53e40c..05b3ba6c5 100644
--- a/src/case/tree/treeexpander/tree.expander.popup.js
+++ b/src/case/tree/treeexpander/tree.expander.popup.js
@@ -25,8 +25,8 @@
});
if (o.showLine) {
- this.popupView.element.css("margin-left", -offset * (o.layer + 1));
- this.element.css("margin-left", offset * (o.layer + 1));
+ this.popupView.element.css("margin-left", -offset * (o.layer + 1) / BI.pixRatio + BI.pixUnit);
+ this.element.css("margin-left", offset * (o.layer + 1) / BI.pixRatio + BI.pixUnit);
}
return {
diff --git a/template/index.html b/template/index.html
index 213e71282..2d98bda7b 100644
--- a/template/index.html
+++ b/template/index.html
@@ -7,6 +7,32 @@
Demo
+
+
@@ -14,4 +40,8 @@
+