Browse Source

Merge remote-tracking branch 'origin/dev/byll' into dev/new1

zhouna 6 years ago
parent
commit
2fd497e9e1

+ 1 - 1
src/common/components/SearchOption/index.less

@@ -11,7 +11,7 @@
     box-shadow: 0 6px 20px 0 #989DA3;
     margin-bottom: 80px;
     .autoList {
-        max-height: 266px;
+        max-height: 225px;
         min-height: 80px;
         overflow-y: auto;
     }

+ 4 - 2
src/components/AddAssistCheck/Textarea/index.less

@@ -1,11 +1,13 @@
 .divTextarea {
   overflow-y: auto;
+  overflow-x: hidden;
+  max-height: 100px;
   border-bottom: 1px dashed #333;
   box-sizing: border-box;
-  min-height: 18px;
+  min-height: 20px;
   width: 100%;
   outline: none;
-  line-height: 17px;
+  line-height: 20px;
   resize: none;
   font-family: inherit;
 }

+ 4 - 4
src/components/AddAssistCheck/index.less

@@ -19,8 +19,8 @@
   cursor: pointer;
 }
 .searchLi {
-    height: 44px;
-    line-height: 44px;
+    height: 36px;
+    line-height: 36px;
     padding: 0 30px;
     padding-top: 0;
     box-sizing: border-box;
@@ -96,8 +96,8 @@
         }
         span {
             display: inline-block;
-            height: 18px;
-            line-height: 18px;
+            height: 20px;
+            line-height: 20px;
             // border-bottom: 1px solid #333;
             box-sizing: border-box;
             // margin-right: 8px;

+ 2 - 2
src/components/AddInspect/index.less

@@ -87,8 +87,8 @@
     display: none;
 }
 .searchLi {
-    height: 44px;
-    line-height: 44px;
+    height: 36px;
+    line-height: 36px;
     padding: 0 30px;
     padding-top: 0;
     box-sizing: border-box;