6d1abd58 by 焦小希

Merge branch '3ddc' of http://yun.pashanhoo.com:9090/xian-java/fontweb-dc into 3ddc

2 parents 65b96fd6 223a6124
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
63 <!-- <input id="searchtxt" type="text" placeholder="地名、地址、道路" onfocus="this.placeholder=''" onblur="this.placeholder='地名、地址、道路'" 63 <!-- <input id="searchtxt" type="text" placeholder="地名、地址、道路" onfocus="this.placeholder=''" onblur="this.placeholder='地名、地址、道路'"
64 /> --> 64 /> -->
65 <!-- FIXME: ZYS --> 65 <!-- FIXME: ZYS -->
66 <input id="searchtxt" type="text" placeholder="地名、地址、道路" /> 66 <input id="searchtxt" type="text" placeholder="地名、地址、道路" style="color: #0e0e0e"/>
67 <!-- END --> 67 <!-- END -->
68 </div> 68 </div>
69 <div class="jimu-widget-Search-searchbtn"> 69 <div class="jimu-widget-Search-searchbtn">
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
104 <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief"> 104 <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
105 <ul class="layui-tab-title"> 105 <ul class="layui-tab-title">
106 <li class="layui-this">策划生成</li> 106 <li class="layui-this">策划生成</li>
107 <li>行政审批</li> 107 <!-- <li>行政审批</li>-->
108 <!-- <li>批后监管</li>--> 108 <!-- <li>批后监管</li>-->
109 </ul> 109 </ul>
110 <div class="layui-tab-content"> 110 <div class="layui-tab-content">
......
...@@ -76,6 +76,7 @@ body, ...@@ -76,6 +76,7 @@ body,
76 background: none; 76 background: none;
77 margin-left: -26px; 77 margin-left: -26px;
78 padding-left: 8px; 78 padding-left: 8px;
79 color: #151313;
79 } 80 }
80 .jimu-widget-searchtxt input::-webkit-input-placeholder{ 81 .jimu-widget-searchtxt input::-webkit-input-placeholder{
81 color: black; 82 color: black;
...@@ -280,6 +281,7 @@ body, ...@@ -280,6 +281,7 @@ body,
280 .layui-tab-brief>.layui-tab-title .layui-this { 281 .layui-tab-brief>.layui-tab-title .layui-this {
281 color: #1890FF; 282 color: #1890FF;
282 font-weight: 600; 283 font-weight: 600;
284 text-align: left;
283 } 285 }
284 286
285 .layui-tab-brief>.layui-tab-title .layui-this::after { 287 .layui-tab-brief>.layui-tab-title .layui-this::after {
...@@ -294,9 +296,11 @@ body, ...@@ -294,9 +296,11 @@ body,
294 .container-right-title-content { 296 .container-right-title-content {
295 display: flex; 297 display: flex;
296 width: 100%; 298 width: 100%;
297 padding: 24px 8px 24px 8px; 299 padding: 24px 20px;
298 border-bottom: 1px solid rgba(0, 0, 0, 0.06); 300 border-bottom: 1px solid rgba(0, 0, 0, 0.06);
299 box-sizing: border-box; 301 box-sizing: border-box;
302 align-items: center;
303 justify-content:space-between;
300 } 304 }
301 305
302 .container-right-title-content-item { 306 .container-right-title-content-item {
...@@ -708,7 +712,7 @@ body, ...@@ -708,7 +712,7 @@ body,
708 712
709 713
710 .container-right .layui-tab-title li{ 714 .container-right .layui-tab-title li{
711 width: 50% !important; 715 width: 100% !important;
712 } 716 }
713 717
714 .selected-border { 718 .selected-border {
......