webfront / Clime · 提交

转到一个项目

作者 乔爽
提交 b26587e01e23dc8183649011eed6750cfe2ac5af 1 个父辈 a0b98b49

更新全球认证 字体间距

内嵌 并排对比
正在显示 2 个修改的文件 包含 64 行增加 和 65 行删除
@@ -3,9 +3,8 @@ @@ -3,9 +3,8 @@
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="45116894-83a8-452c-8a78-cd7bfbe48655" name="Default Changelist" comment=""> 4 <list default="true" id="45116894-83a8-452c-8a78-cd7bfbe48655" name="Default Changelist" comment="">
5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> 5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6 - <change beforePath="$PROJECT_DIR$/css/sckj.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/sckj.css" afterDir="false" /> 6 + <change beforePath="$PROJECT_DIR$/css/qqrz.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/qqrz.css" afterDir="false" />
7 <change beforePath="$PROJECT_DIR$/html/cpzx_2.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/cpzx_2.html" afterDir="false" /> 7 <change beforePath="$PROJECT_DIR$/html/cpzx_2.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/cpzx_2.html" afterDir="false" />
8 - <change beforePath="$PROJECT_DIR$/html/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/index.html" afterDir="false" />  
9 </list> 8 </list>
10 <ignored path="$PROJECT_DIR$/.tmp/" /> 9 <ignored path="$PROJECT_DIR$/.tmp/" />
11 <ignored path="$PROJECT_DIR$/temp/" /> 10 <ignored path="$PROJECT_DIR$/temp/" />
@@ -130,29 +129,29 @@ @@ -130,29 +129,29 @@
130 </usages-collector> 129 </usages-collector>
131 <usages-collector id="statistics.file.extensions.open"> 130 <usages-collector id="statistics.file.extensions.open">
132 <counts> 131 <counts>
133 - <entry key="css" value="110" /> 132 + <entry key="css" value="111" />
134 <entry key="html" value="192" /> 133 <entry key="html" value="192" />
135 <entry key="js" value="15" /> 134 <entry key="js" value="15" />
136 </counts> 135 </counts>
137 </usages-collector> 136 </usages-collector>
138 <usages-collector id="statistics.file.types.open"> 137 <usages-collector id="statistics.file.types.open">
139 <counts> 138 <counts>
140 - <entry key="CSS" value="110" /> 139 + <entry key="CSS" value="111" />
141 <entry key="HTML" value="192" /> 140 <entry key="HTML" value="192" />
142 <entry key="JavaScript" value="15" /> 141 <entry key="JavaScript" value="15" />
143 </counts> 142 </counts>
144 </usages-collector> 143 </usages-collector>
145 <usages-collector id="statistics.file.extensions.edit"> 144 <usages-collector id="statistics.file.extensions.edit">
146 <counts> 145 <counts>
147 - <entry key="css" value="4879" />  
148 - <entry key="html" value="15555" /> 146 + <entry key="css" value="4982" />
  147 + <entry key="html" value="15659" />
149 <entry key="js" value="73" /> 148 <entry key="js" value="73" />
150 </counts> 149 </counts>
151 </usages-collector> 150 </usages-collector>
152 <usages-collector id="statistics.file.types.edit"> 151 <usages-collector id="statistics.file.types.edit">
153 <counts> 152 <counts>
154 - <entry key="CSS" value="4880" />  
155 - <entry key="HTML" value="15555" /> 153 + <entry key="CSS" value="4983" />
  154 + <entry key="HTML" value="15659" />
156 <entry key="JavaScript" value="72" /> 155 <entry key="JavaScript" value="72" />
157 </counts> 156 </counts>
158 </usages-collector> 157 </usages-collector>
@@ -218,8 +217,8 @@ @@ -218,8 +217,8 @@
218 <file pinned="false" current-in-tab="false"> 217 <file pinned="false" current-in-tab="false">
219 <entry file="file://$PROJECT_DIR$/css/gsjj.css"> 218 <entry file="file://$PROJECT_DIR$/css/gsjj.css">
220 <provider selected="true" editor-type-id="text-editor"> 219 <provider selected="true" editor-type-id="text-editor">
221 - <state relative-caret-position="29">  
222 - <caret line="542" column="8" lean-forward="true" selection-start-line="542" selection-start-column="8" selection-end-line="542" selection-end-column="8" /> 220 + <state relative-caret-position="27">
  221 + <caret line="257" column="30" lean-forward="true" selection-start-line="257" selection-start-column="30" selection-end-line="257" selection-end-column="30" />
223 </state> 222 </state>
224 </provider> 223 </provider>
225 </entry> 224 </entry>
@@ -282,15 +281,6 @@ @@ -282,15 +281,6 @@
282 </entry> 281 </entry>
283 </file> 282 </file>
284 <file pinned="false" current-in-tab="false"> 283 <file pinned="false" current-in-tab="false">
285 - <entry file="file://$PROJECT_DIR$/css/fwcx_4.css">  
286 - <provider selected="true" editor-type-id="text-editor">  
287 - <state relative-caret-position="17010">  
288 - <caret line="630" column="18" selection-start-line="630" selection-start-column="18" selection-end-line="630" selection-end-column="18" />  
289 - </state>  
290 - </provider>  
291 - </entry>  
292 - </file>  
293 - <file pinned="false" current-in-tab="false">  
294 <entry file="file://$PROJECT_DIR$/js/page.js"> 284 <entry file="file://$PROJECT_DIR$/js/page.js">
295 <provider selected="true" editor-type-id="text-editor"> 285 <provider selected="true" editor-type-id="text-editor">
296 <state> 286 <state>
@@ -343,11 +333,11 @@ @@ -343,11 +333,11 @@
343 </provider> 333 </provider>
344 </entry> 334 </entry>
345 </file> 335 </file>
346 - <file pinned="false" current-in-tab="true"> 336 + <file pinned="false" current-in-tab="false">
347 <entry file="file://$PROJECT_DIR$/css/sckj.css"> 337 <entry file="file://$PROJECT_DIR$/css/sckj.css">
348 <provider selected="true" editor-type-id="text-editor"> 338 <provider selected="true" editor-type-id="text-editor">
349 - <state relative-caret-position="295">  
350 - <caret line="467" column="34" selection-start-line="467" selection-start-column="34" selection-end-line="467" selection-end-column="34" /> 339 + <state relative-caret-position="572">
  340 + <caret line="465" column="22" selection-start-line="465" selection-start-column="22" selection-end-line="465" selection-end-column="22" />
351 </state> 341 </state>
352 </provider> 342 </provider>
353 </entry> 343 </entry>
@@ -364,8 +354,8 @@ @@ -364,8 +354,8 @@
364 <file pinned="false" current-in-tab="false"> 354 <file pinned="false" current-in-tab="false">
365 <entry file="file://$PROJECT_DIR$/html/gsjj.html"> 355 <entry file="file://$PROJECT_DIR$/html/gsjj.html">
366 <provider selected="true" editor-type-id="text-editor"> 356 <provider selected="true" editor-type-id="text-editor">
367 - <state relative-caret-position="184">  
368 - <caret line="302" column="56" lean-forward="true" selection-start-line="302" selection-start-column="56" selection-end-line="302" selection-end-column="56" /> 357 + <state relative-caret-position="134">
  358 + <caret line="237" column="24" lean-forward="true" selection-start-line="237" selection-start-column="24" selection-end-line="237" selection-end-column="24" />
369 <folding> 359 <folding>
370 <element signature="n#div#2;n#div#0;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 360 <element signature="n#div#2;n#div#0;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
371 </folding> 361 </folding>
@@ -373,6 +363,15 @@ @@ -373,6 +363,15 @@
373 </provider> 363 </provider>
374 </entry> 364 </entry>
375 </file> 365 </file>
  366 + <file pinned="false" current-in-tab="true">
  367 + <entry file="file://$PROJECT_DIR$/css/qqrz.css">
  368 + <provider selected="true" editor-type-id="text-editor">
  369 + <state relative-caret-position="355">
  370 + <caret line="112" column="18" selection-start-line="112" selection-start-column="18" selection-end-line="112" selection-end-column="18" />
  371 + </state>
  372 + </provider>
  373 + </entry>
  374 + </file>
376 </leaf> 375 </leaf>
377 </component> 376 </component>
378 <component name="FileTemplateManagerImpl"> 377 <component name="FileTemplateManagerImpl">
@@ -385,7 +384,6 @@ @@ -385,7 +384,6 @@
385 </component> 384 </component>
386 <component name="FindInProjectRecents"> 385 <component name="FindInProjectRecents">
387 <findStrings> 386 <findStrings>
388 - <find>加盟流程</find>  
389 <find>mid_common_item</find> 387 <find>mid_common_item</find>
390 <find>icon-sanjiaoright</find> 388 <find>icon-sanjiaoright</find>
391 <find>items</find> 389 <find>items</find>
@@ -412,9 +410,10 @@ @@ -412,9 +410,10 @@
412 <find>content_item</find> 410 <find>content_item</find>
413 <find>margin-lef2</find> 411 <find>margin-lef2</find>
414 <find>mid_list</find> 412 <find>mid_list</find>
415 - <find>video</find>  
416 <find>颜色简称</find> 413 <find>颜色简称</find>
417 <find>查看详情</find> 414 <find>查看详情</find>
  415 + <find>mid_company_video</find>
  416 + <find>video</find>
418 </findStrings> 417 </findStrings>
419 <replaceStrings> 418 <replaceStrings>
420 <replace>div</replace> 419 <replace>div</replace>
@@ -438,10 +437,8 @@ @@ -438,10 +437,8 @@
438 <option value="$PROJECT_DIR$/css/page.css" /> 437 <option value="$PROJECT_DIR$/css/page.css" />
439 <option value="$PROJECT_DIR$/css/common.css" /> 438 <option value="$PROJECT_DIR$/css/common.css" />
440 <option value="$PROJECT_DIR$/css/index.css" /> 439 <option value="$PROJECT_DIR$/css/index.css" />
441 - <option value="$PROJECT_DIR$/css/gsjj.css" />  
442 <option value="$PROJECT_DIR$/css/jm_3.css" /> 440 <option value="$PROJECT_DIR$/css/jm_3.css" />
443 <option value="$PROJECT_DIR$/html/qqrz.html" /> 441 <option value="$PROJECT_DIR$/html/qqrz.html" />
444 - <option value="$PROJECT_DIR$/css/qqrz.css" />  
445 <option value="$PROJECT_DIR$/css/fwcx_4.css" /> 442 <option value="$PROJECT_DIR$/css/fwcx_4.css" />
446 <option value="$PROJECT_DIR$/css/fwcx_4_1result.css" /> 443 <option value="$PROJECT_DIR$/css/fwcx_4_1result.css" />
447 <option value="$PROJECT_DIR$/css/fwcx_4_2result.css" /> 444 <option value="$PROJECT_DIR$/css/fwcx_4_2result.css" />
@@ -474,12 +471,14 @@ @@ -474,12 +471,14 @@
474 <option value="$PROJECT_DIR$/css/sckj_3.css" /> 471 <option value="$PROJECT_DIR$/css/sckj_3.css" />
475 <option value="$PROJECT_DIR$/html/sckj_3.html" /> 472 <option value="$PROJECT_DIR$/html/sckj_3.html" />
476 <option value="$PROJECT_DIR$/html/sckj_2.html" /> 473 <option value="$PROJECT_DIR$/html/sckj_2.html" />
477 - <option value="$PROJECT_DIR$/html/gsjj.html" />  
478 <option value="$PROJECT_DIR$/html/sckj_test.html" /> 474 <option value="$PROJECT_DIR$/html/sckj_test.html" />
479 <option value="$PROJECT_DIR$/html/sckj.html" /> 475 <option value="$PROJECT_DIR$/html/sckj.html" />
480 <option value="$PROJECT_DIR$/html/cpzx_2.html" /> 476 <option value="$PROJECT_DIR$/html/cpzx_2.html" />
481 <option value="$PROJECT_DIR$/html/index.html" /> 477 <option value="$PROJECT_DIR$/html/index.html" />
482 <option value="$PROJECT_DIR$/css/sckj.css" /> 478 <option value="$PROJECT_DIR$/css/sckj.css" />
  479 + <option value="$PROJECT_DIR$/css/gsjj.css" />
  480 + <option value="$PROJECT_DIR$/html/gsjj.html" />
  481 + <option value="$PROJECT_DIR$/css/qqrz.css" />
483 </list> 482 </list>
484 </option> 483 </option>
485 </component> 484 </component>
@@ -490,10 +489,10 @@ @@ -490,10 +489,10 @@
490 <sorting>DEFINITION_ORDER</sorting> 489 <sorting>DEFINITION_ORDER</sorting>
491 </component> 490 </component>
492 <component name="ProjectFrameBounds"> 491 <component name="ProjectFrameBounds">
493 - <option name="x" value="814" />  
494 - <option name="y" value="82" />  
495 - <option name="width" value="1523" />  
496 - <option name="height" value="1081" /> 492 + <option name="x" value="678" />
  493 + <option name="y" value="46" />
  494 + <option name="width" value="1703" />
  495 + <option name="height" value="1100" />
497 </component> 496 </component>
498 <component name="ProjectView"> 497 <component name="ProjectView">
499 <navigator proportions="" version="1"> 498 <navigator proportions="" version="1">
@@ -611,18 +610,18 @@ @@ -611,18 +610,18 @@
611 <workItem from="1550120762200" duration="12308000" /> 610 <workItem from="1550120762200" duration="12308000" />
612 <workItem from="1550190894158" duration="6430000" /> 611 <workItem from="1550190894158" duration="6430000" />
613 <workItem from="1550199667635" duration="279000" /> 612 <workItem from="1550199667635" duration="279000" />
614 - <workItem from="1550215751397" duration="1473000" /> 613 + <workItem from="1550215751397" duration="6149000" />
615 </task> 614 </task>
616 <servers /> 615 <servers />
617 </component> 616 </component>
618 <component name="TimeTrackingManager"> 617 <component name="TimeTrackingManager">
619 - <option name="totallyTimeSpent" value="414054000" /> 618 + <option name="totallyTimeSpent" value="418730000" />
620 </component> 619 </component>
621 <component name="ToolWindowManager"> 620 <component name="ToolWindowManager">
622 - <frame x="814" y="82" width="1523" height="1081" extended-state="0" /> 621 + <frame x="678" y="46" width="1703" height="1100" extended-state="0" />
623 <editor active="true" /> 622 <editor active="true" />
624 <layout> 623 <layout>
625 - <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.4993464" visible="true" weight="0.15420875" /> 624 + <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.4993464" visible="true" weight="0.13753754" />
626 <window_info id="Structure" order="1" sideWeight="0.5006536" side_tool="true" weight="0.16211294" /> 625 <window_info id="Structure" order="1" sideWeight="0.5006536" side_tool="true" weight="0.16211294" />
627 <window_info id="Favorites" order="2" side_tool="true" /> 626 <window_info id="Favorites" order="2" side_tool="true" />
628 <window_info anchor="bottom" id="Message" order="0" /> 627 <window_info anchor="bottom" id="Message" order="0" />
@@ -634,7 +633,7 @@ @@ -634,7 +633,7 @@
634 <window_info anchor="bottom" id="TODO" order="6" /> 633 <window_info anchor="bottom" id="TODO" order="6" />
635 <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> 634 <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
636 <window_info anchor="bottom" id="Version Control" order="8" /> 635 <window_info anchor="bottom" id="Version Control" order="8" />
637 - <window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.26744187" /> 636 + <window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.26217616" />
638 <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" /> 637 <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
639 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> 638 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
640 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> 639 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@@ -662,13 +661,6 @@ @@ -662,13 +661,6 @@
662 </state> 661 </state>
663 </provider> 662 </provider>
664 </entry> 663 </entry>
665 - <entry file="file://$PROJECT_DIR$/css/qqrz.css">  
666 - <provider selected="true" editor-type-id="text-editor">  
667 - <state relative-caret-position="227">  
668 - <caret line="198" column="20" lean-forward="true" selection-start-line="198" selection-start-column="20" selection-end-line="198" selection-end-column="20" />  
669 - </state>  
670 - </provider>  
671 - </entry>  
672 <entry file="file://$PROJECT_DIR$/css/fwcx_4_1result.css"> 664 <entry file="file://$PROJECT_DIR$/css/fwcx_4_1result.css">
673 <provider selected="true" editor-type-id="text-editor"> 665 <provider selected="true" editor-type-id="text-editor">
674 <state relative-caret-position="299"> 666 <state relative-caret-position="299">
@@ -970,23 +962,6 @@ @@ -970,23 +962,6 @@
970 </state> 962 </state>
971 </provider> 963 </provider>
972 </entry> 964 </entry>
973 - <entry file="file://$PROJECT_DIR$/css/gsjj.css">  
974 - <provider selected="true" editor-type-id="text-editor">  
975 - <state relative-caret-position="29">  
976 - <caret line="542" column="8" lean-forward="true" selection-start-line="542" selection-start-column="8" selection-end-line="542" selection-end-column="8" />  
977 - </state>  
978 - </provider>  
979 - </entry>  
980 - <entry file="file://$PROJECT_DIR$/html/gsjj.html">  
981 - <provider selected="true" editor-type-id="text-editor">  
982 - <state relative-caret-position="184">  
983 - <caret line="302" column="56" lean-forward="true" selection-start-line="302" selection-start-column="56" selection-end-line="302" selection-end-column="56" />  
984 - <folding>  
985 - <element signature="n#div#2;n#div#0;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
986 - </folding>  
987 - </state>  
988 - </provider>  
989 - </entry>  
990 <entry file="file://$PROJECT_DIR$/html/sckj.html"> 965 <entry file="file://$PROJECT_DIR$/html/sckj.html">
991 <provider selected="true" editor-type-id="text-editor"> 966 <provider selected="true" editor-type-id="text-editor">
992 <state relative-caret-position="270"> 967 <state relative-caret-position="270">
@@ -1095,8 +1070,32 @@ @@ -1095,8 +1070,32 @@
1095 </entry> 1070 </entry>
1096 <entry file="file://$PROJECT_DIR$/css/sckj.css"> 1071 <entry file="file://$PROJECT_DIR$/css/sckj.css">
1097 <provider selected="true" editor-type-id="text-editor"> 1072 <provider selected="true" editor-type-id="text-editor">
1098 - <state relative-caret-position="295">  
1099 - <caret line="467" column="34" selection-start-line="467" selection-start-column="34" selection-end-line="467" selection-end-column="34" /> 1073 + <state relative-caret-position="572">
  1074 + <caret line="465" column="22" selection-start-line="465" selection-start-column="22" selection-end-line="465" selection-end-column="22" />
  1075 + </state>
  1076 + </provider>
  1077 + </entry>
  1078 + <entry file="file://$PROJECT_DIR$/css/gsjj.css">
  1079 + <provider selected="true" editor-type-id="text-editor">
  1080 + <state relative-caret-position="27">
  1081 + <caret line="257" column="30" lean-forward="true" selection-start-line="257" selection-start-column="30" selection-end-line="257" selection-end-column="30" />
  1082 + </state>
  1083 + </provider>
  1084 + </entry>
  1085 + <entry file="file://$PROJECT_DIR$/html/gsjj.html">
  1086 + <provider selected="true" editor-type-id="text-editor">
  1087 + <state relative-caret-position="134">
  1088 + <caret line="237" column="24" lean-forward="true" selection-start-line="237" selection-start-column="24" selection-end-line="237" selection-end-column="24" />
  1089 + <folding>
  1090 + <element signature="n#div#2;n#div#0;n#div#4;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  1091 + </folding>
  1092 + </state>
  1093 + </provider>
  1094 + </entry>
  1095 + <entry file="file://$PROJECT_DIR$/css/qqrz.css">
  1096 + <provider selected="true" editor-type-id="text-editor">
  1097 + <state relative-caret-position="355">
  1098 + <caret line="112" column="18" selection-start-line="112" selection-start-column="18" selection-end-line="112" selection-end-column="18" />
1100 </state> 1099 </state>
1101 </provider> 1100 </provider>
1102 </entry> 1101 </entry>
@@ -110,7 +110,7 @@ @@ -110,7 +110,7 @@
110 font-weight: 500; 110 font-weight: 500;
111 line-height: 0.36rem; 111 line-height: 0.36rem;
112 color: #3F4249; 112 color: #3F4249;
113 - margin: 0 0.39rem 113 + margin: 0.1rem 0.39rem
114 } 114 }
115 .mid_box_text{ 115 .mid_box_text{
116 font-size: 0.26rem; 116 font-size: 0.26rem;