webfront / Clime · 提交

转到一个项目

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

更新全球认证 字体间距

内嵌 并排对比
正在显示 2 个修改的文件 包含 64 行增加 和 65 行删除
... ... @@ -3,9 +3,8 @@
<component name="ChangeListManager">
<list default="true" id="45116894-83a8-452c-8a78-cd7bfbe48655" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/css/sckj.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/sckj.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/css/qqrz.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/qqrz.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/html/cpzx_2.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/cpzx_2.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/html/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/html/index.html" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
... ... @@ -130,29 +129,29 @@
</usages-collector>
<usages-collector id="statistics.file.extensions.open">
<counts>
<entry key="css" value="110" />
<entry key="css" value="111" />
<entry key="html" value="192" />
<entry key="js" value="15" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.open">
<counts>
<entry key="CSS" value="110" />
<entry key="CSS" value="111" />
<entry key="HTML" value="192" />
<entry key="JavaScript" value="15" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="css" value="4879" />
<entry key="html" value="15555" />
<entry key="css" value="4982" />
<entry key="html" value="15659" />
<entry key="js" value="73" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="CSS" value="4880" />
<entry key="HTML" value="15555" />
<entry key="CSS" value="4983" />
<entry key="HTML" value="15659" />
<entry key="JavaScript" value="72" />
</counts>
</usages-collector>
... ... @@ -218,8 +217,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/css/gsjj.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="29">
<caret line="542" column="8" lean-forward="true" selection-start-line="542" selection-start-column="8" selection-end-line="542" selection-end-column="8" />
<state relative-caret-position="27">
<caret line="257" column="30" lean-forward="true" selection-start-line="257" selection-start-column="30" selection-end-line="257" selection-end-column="30" />
</state>
</provider>
</entry>
... ... @@ -282,15 +281,6 @@
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/css/fwcx_4.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="17010">
<caret line="630" column="18" selection-start-line="630" selection-start-column="18" selection-end-line="630" selection-end-column="18" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/js/page.js">
<provider selected="true" editor-type-id="text-editor">
<state>
... ... @@ -343,11 +333,11 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/css/sckj.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="295">
<caret line="467" column="34" selection-start-line="467" selection-start-column="34" selection-end-line="467" selection-end-column="34" />
<state relative-caret-position="572">
<caret line="465" column="22" selection-start-line="465" selection-start-column="22" selection-end-line="465" selection-end-column="22" />
</state>
</provider>
</entry>
... ... @@ -364,8 +354,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/html/gsjj.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="184">
<caret line="302" column="56" lean-forward="true" selection-start-line="302" selection-start-column="56" selection-end-line="302" selection-end-column="56" />
<state relative-caret-position="134">
<caret line="237" column="24" lean-forward="true" selection-start-line="237" selection-start-column="24" selection-end-line="237" selection-end-column="24" />
<folding>
<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" />
</folding>
... ... @@ -373,6 +363,15 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/css/qqrz.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="355">
<caret line="112" column="18" selection-start-line="112" selection-start-column="18" selection-end-line="112" selection-end-column="18" />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
... ... @@ -385,7 +384,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>加盟流程</find>
<find>mid_common_item</find>
<find>icon-sanjiaoright</find>
<find>items</find>
... ... @@ -412,9 +410,10 @@
<find>content_item</find>
<find>margin-lef2</find>
<find>mid_list</find>
<find>video</find>
<find>颜色简称</find>
<find>查看详情</find>
<find>mid_company_video</find>
<find>video</find>
</findStrings>
<replaceStrings>
<replace>div</replace>
... ... @@ -438,10 +437,8 @@
<option value="$PROJECT_DIR$/css/page.css" />
<option value="$PROJECT_DIR$/css/common.css" />
<option value="$PROJECT_DIR$/css/index.css" />
<option value="$PROJECT_DIR$/css/gsjj.css" />
<option value="$PROJECT_DIR$/css/jm_3.css" />
<option value="$PROJECT_DIR$/html/qqrz.html" />
<option value="$PROJECT_DIR$/css/qqrz.css" />
<option value="$PROJECT_DIR$/css/fwcx_4.css" />
<option value="$PROJECT_DIR$/css/fwcx_4_1result.css" />
<option value="$PROJECT_DIR$/css/fwcx_4_2result.css" />
... ... @@ -474,12 +471,14 @@
<option value="$PROJECT_DIR$/css/sckj_3.css" />
<option value="$PROJECT_DIR$/html/sckj_3.html" />
<option value="$PROJECT_DIR$/html/sckj_2.html" />
<option value="$PROJECT_DIR$/html/gsjj.html" />
<option value="$PROJECT_DIR$/html/sckj_test.html" />
<option value="$PROJECT_DIR$/html/sckj.html" />
<option value="$PROJECT_DIR$/html/cpzx_2.html" />
<option value="$PROJECT_DIR$/html/index.html" />
<option value="$PROJECT_DIR$/css/sckj.css" />
<option value="$PROJECT_DIR$/css/gsjj.css" />
<option value="$PROJECT_DIR$/html/gsjj.html" />
<option value="$PROJECT_DIR$/css/qqrz.css" />
</list>
</option>
</component>
... ... @@ -490,10 +489,10 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="814" />
<option name="y" value="82" />
<option name="width" value="1523" />
<option name="height" value="1081" />
<option name="x" value="678" />
<option name="y" value="46" />
<option name="width" value="1703" />
<option name="height" value="1100" />
</component>
<component name="ProjectView">
<navigator proportions="" version="1">
... ... @@ -611,18 +610,18 @@
<workItem from="1550120762200" duration="12308000" />
<workItem from="1550190894158" duration="6430000" />
<workItem from="1550199667635" duration="279000" />
<workItem from="1550215751397" duration="1473000" />
<workItem from="1550215751397" duration="6149000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="414054000" />
<option name="totallyTimeSpent" value="418730000" />
</component>
<component name="ToolWindowManager">
<frame x="814" y="82" width="1523" height="1081" extended-state="0" />
<frame x="678" y="46" width="1703" height="1100" extended-state="0" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.4993464" visible="true" weight="0.15420875" />
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.4993464" visible="true" weight="0.13753754" />
<window_info id="Structure" order="1" sideWeight="0.5006536" side_tool="true" weight="0.16211294" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
... ... @@ -634,7 +633,7 @@
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="8" />
<window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.26744187" />
<window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.26217616" />
<window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
... ... @@ -662,13 +661,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/qqrz.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="227">
<caret line="198" column="20" lean-forward="true" selection-start-line="198" selection-start-column="20" selection-end-line="198" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/fwcx_4_1result.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="299">
... ... @@ -970,23 +962,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/gsjj.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="29">
<caret line="542" column="8" lean-forward="true" selection-start-line="542" selection-start-column="8" selection-end-line="542" selection-end-column="8" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/gsjj.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="184">
<caret line="302" column="56" lean-forward="true" selection-start-line="302" selection-start-column="56" selection-end-line="302" selection-end-column="56" />
<folding>
<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" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/sckj.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="270">
... ... @@ -1095,8 +1070,32 @@
</entry>
<entry file="file://$PROJECT_DIR$/css/sckj.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="295">
<caret line="467" column="34" selection-start-line="467" selection-start-column="34" selection-end-line="467" selection-end-column="34" />
<state relative-caret-position="572">
<caret line="465" column="22" selection-start-line="465" selection-start-column="22" selection-end-line="465" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/gsjj.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="27">
<caret line="257" column="30" lean-forward="true" selection-start-line="257" selection-start-column="30" selection-end-line="257" selection-end-column="30" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/html/gsjj.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="134">
<caret line="237" column="24" lean-forward="true" selection-start-line="237" selection-start-column="24" selection-end-line="237" selection-end-column="24" />
<folding>
<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" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/qqrz.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="355">
<caret line="112" column="18" selection-start-line="112" selection-start-column="18" selection-end-line="112" selection-end-column="18" />
</state>
</provider>
</entry>
... ...
... ... @@ -110,7 +110,7 @@
font-weight: 500;
line-height: 0.36rem;
color: #3F4249;
margin: 0 0.39rem
margin: 0.1rem 0.39rem
}
.mid_box_text{
font-size: 0.26rem;
... ...