Przeglądaj źródła

Merge branch 'dynamicScale0609' into testNew

wyq 4 lat temu
rodzic
commit
541bb8646c
2 zmienionych plików z 3 dodań i 4 usunięć
  1. 2 3
      src/css/staticInfo.less
  2. 1 1
      src/js/staticInfo.js

+ 2 - 3
src/css/staticInfo.less

@@ -414,8 +414,6 @@
   font-size: 14px;
   font-weight: 500;
   color: #333333;
-  line-height: 72px;
-  margin-bottom: 40px;
   text-align: center;
   display: none;
   margin: 0 6.5%;
@@ -441,6 +439,7 @@
   
 }
 .result_title{
+  max-width: 85%;
   overflow: hidden;
   text-overflow:ellipsis;
   white-space: nowrap;
@@ -493,7 +492,7 @@
 .scale{
   .infos-box{
     border: 1px solid #E6E6E6;
-    margin: 0 71px 0 38px;
+    margin: 0 71px 20px 38px;
     .infoWrapper {
       padding: 0 75px;
     }

+ 1 - 1
src/js/staticInfo.js

@@ -167,7 +167,7 @@ function renderContentscale(list, contentWrapClassName, name) {
   str = '<div class="scalebot">'
   str += '<p class="score"></p>'
   str += '<button class="but">结果</button></div>'
-  str += '<div class="result"><div class="result_box"><p class="hel">?</p><span>结果:</span><p id="result_title" class="result_title"></p><textarea id="inputs"></textarea></div></div>'
+  str += '<div class="result"><div class="result_box"><p class="hel">?</p><span>结果</span><p id="result_title" class="result_title"></p><textarea id="inputs"></textarea></div></div>'
   str += `<div class="foot"><div class="foot_box"><div class="printing"><img src=${printing} class="slideImg"/>打印</div><div class="copy">确认并复制结果</div></div></div>`
   $(`.${contentWrapClassName} .infos .infos-box`).append(str);
   // str = `<div class="foot"><div class="foot_box"><div class="printing"><img src=${printing} class="slideImg"/>打印</div><div class="copy">确认并复制结果</div></div></div>`