张亚鹏 / Wechat_project_1 · 提交

转到一个项目

作者 乔爽
提交 80d1076861b6f589aff75179e34e6b621aeae7f5 1 个父辈 a54421d9

update

内嵌 并排对比
正在显示 2 个修改的文件 包含 53 行增加 和 46 行删除
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="140167ac-33fb-4284-bf2f-897ad51069a4" name="Default Changelist" comment="" />
<list default="true" id="140167ac-33fb-4284-bf2f-897ad51069a4" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/css/cplb.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/cplb.css" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
<ignored path="$PROJECT_DIR$/tmp/" />
... ... @@ -62,21 +64,25 @@
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="css" value="2" />
<entry key="html" value="257" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="CSS" value="2" />
<entry key="HTML" value="257" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.open">
<counts>
<entry key="css" value="1" />
<entry key="html" value="1" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.open">
<counts>
<entry key="CSS" value="1" />
<entry key="HTML" value="1" />
</counts>
</usages-collector>
... ... @@ -140,15 +146,6 @@
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/css/cpxq.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3483">
<caret line="129" column="4" selection-start-line="129" selection-start-column="6" selection-end-line="132" selection-end-column="23" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/first.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="324">
... ... @@ -217,6 +214,15 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/css/cplb.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="278">
<caret line="116" column="23" lean-forward="true" selection-start-line="116" selection-start-column="23" selection-end-line="116" selection-end-column="23" />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
... ... @@ -299,6 +305,7 @@
<option value="$PROJECT_DIR$/wtfk.html" />
<option value="$PROJECT_DIR$/last.html" />
<option value="$PROJECT_DIR$/first.html" />
<option value="$PROJECT_DIR$/css/cplb.css" />
</list>
</option>
</component>
... ... @@ -308,9 +315,9 @@
<detection-done>true</detection-done>
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="601" />
<option name="y" value="45" />
<component name="ProjectFrameBounds">
<option name="x" value="671" />
<option name="y" value="44" />
<option name="width" value="1261" />
<option name="height" value="990" />
</component>
... ... @@ -392,15 +399,15 @@
<workItem from="1546669460405" duration="32000" />
<workItem from="1546674819919" duration="1468000" />
<workItem from="1546822545566" duration="373000" />
<workItem from="1546827109123" duration="2682000" />
<workItem from="1546827109123" duration="2911000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="114522000" />
<option name="totallyTimeSpent" value="114751000" />
</component>
<component name="ToolWindowManager">
<frame x="601" y="45" width="1261" height="990" extended-state="1" />
<frame x="671" y="44" width="1261" height="990" extended-state="0" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20523304" />
... ... @@ -491,13 +498,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/cplb.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="395">
<caret line="59" column="29" selection-start-line="59" selection-start-column="22" selection-end-line="59" selection-end-column="29" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/wtfk.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="302">
... ... @@ -560,28 +560,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/cplb.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="257">
<caret line="187" column="26" lean-forward="true" selection-start-line="187" selection-start-column="26" selection-end-line="187" selection-end-column="26" />
<folding>
<element signature="n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#2;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#3;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#4;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#5;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#5;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#6;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#7;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#8;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#9;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#10;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#1;n#div#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/slxz.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="302">
... ... @@ -646,5 +624,34 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/cplb.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="257">
<caret line="187" column="26" lean-forward="true" selection-start-line="187" selection-start-column="26" selection-end-line="187" selection-end-column="26" />
<folding>
<element signature="n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#2;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#3;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#4;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#5;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#5;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#6;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#7;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#8;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#9;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#10;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#1;n#div#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/cplb.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="278">
<caret line="116" column="23" lean-forward="true" selection-start-line="116" selection-start-column="23" selection-end-line="116" selection-end-column="23" />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -116,7 +116,7 @@ input::-webkit-input-placeholder{
font-size: 0.3rem;
margin-top: 0.3rem;
margin-left: 0.31rem ;
margin-bottom: 0.18rem;
margin-bottom: 0.05rem;
}
.main_item_time{
font-size: 0.28rem;
... ...