소스 검색

Merge branch 'dev2.8' of http://192.168.3.207:10080/qmx/jy into dev2.8

wangshan 6 년 전
부모
커밋
93109281f1

+ 9 - 0
src/jfw/modules/app/src/web/templates/dataExport/dataExport_keyWord.html

@@ -38,6 +38,7 @@
     }
     body{
         background: rgba(245,244,249,1)!important;
+        line-height: unset;
     }
     .keyWord .enter .btn .save {
         float: right;
@@ -56,6 +57,14 @@
     .text-overflow100 .weui-toast {
         font-size: .1rem;
     }
+    .addAdjunctWord{
+        margin-top: 0!important;
+        border-top: 1px solid #e0e0e0;
+    }
+    .addExclusion{
+        margin-top: 0!important;
+        border-top: 1px solid #e0e0e0;
+    }
 </style>
 <body>
     <div class="app-layout-header">

+ 10 - 1
src/web/templates/weixin/dataExport/dataExport_keyWord.html

@@ -27,7 +27,16 @@
         float: right;
     }
     body{
-        background: rgba(245,244,249,1);
+        background: rgba(245,244,249,1)!important;
+        line-height: unset;
+    }
+    .addAdjunctWord{
+        margin-top: 0!important;
+        border-top: 1px solid #e0e0e0;
+    }
+    .addExclusion{
+        margin-top: 0!important;
+        border-top: 1px solid #e0e0e0;
     }
 </style>
 <body>