张亚鹏 / Wechat_project_1 · 提交

转到一个项目

作者 乔爽
提交 8ac31de0d5f4c4249a67dbeda8deb5a68877de4b 1 个父辈 1e52bd84

update

内嵌 并排对比
正在显示 1 个修改的文件 包含 33 行增加 和 40 行删除
... ... @@ -3,14 +3,6 @@
<component name="ChangeListManager">
<list default="true" id="140167ac-33fb-4284-bf2f-897ad51069a4" 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/gift.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/gift.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/css/index.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/index.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/css/slxz.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/slxz.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/css/spxq.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/spxq.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/gift.html" beforeDir="false" afterPath="$PROJECT_DIR$/gift.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/index.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/slxz.html" beforeDir="false" afterPath="$PROJECT_DIR$/slxz.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/spxq.html" beforeDir="false" afterPath="$PROJECT_DIR$/spxq.html" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
... ... @@ -107,6 +99,7 @@
<session id="-271560078">
<usages-collector id="statistics.lifecycle.project">
<counts>
<entry key="project.closed" value="1" />
<entry key="project.open.time.0" value="1" />
<entry key="project.opened" value="1" />
</counts>
... ... @@ -126,13 +119,13 @@
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="css" value="875" />
<entry key="html" value="963" />
<entry key="html" value="969" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.types.edit">
<counts>
<entry key="CSS" value="876" />
<entry key="HTML" value="962" />
<entry key="HTML" value="968" />
</counts>
</usages-collector>
</session>
... ... @@ -157,11 +150,11 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/gift.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="335">
<caret line="18" column="27" selection-start-line="18" selection-start-column="20" selection-end-line="18" selection-end-column="27" />
<state relative-caret-position="264">
<caret line="65" column="36" selection-start-line="65" selection-start-column="36" selection-end-line="65" selection-end-column="36" />
<folding>
<element signature="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#0;n#body#0;n#html#0;n#!!top" />
... ... @@ -175,11 +168,11 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/first.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="297">
<caret line="11" column="6" lean-forward="true" selection-start-line="11" selection-start-column="6" selection-end-line="11" selection-end-column="6" />
<state relative-caret-position="216">
<caret line="8" column="38" lean-forward="true" selection-start-line="8" selection-start-column="38" selection-end-line="8" selection-end-column="38" />
</state>
</provider>
</entry>
... ... @@ -348,8 +341,8 @@
<option value="$PROJECT_DIR$/spxq.html" />
<option value="$PROJECT_DIR$/slxz.html" />
<option value="$PROJECT_DIR$/css/slxz.css" />
<option value="$PROJECT_DIR$/gift.html" />
<option value="$PROJECT_DIR$/css/gift.css" />
<option value="$PROJECT_DIR$/gift.html" />
</list>
</option>
</component>
... ... @@ -360,8 +353,8 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="268" />
<option name="y" value="64" />
<option name="x" value="301" />
<option name="y" value="129" />
<option name="width" value="1361" />
<option name="height" value="1040" />
</component>
... ... @@ -463,15 +456,15 @@
<workItem from="1547539924447" duration="726000" />
<workItem from="1547550818174" duration="368000" />
<workItem from="1547598324930" duration="428000" />
<workItem from="1547620624212" duration="14511000" />
<workItem from="1547620624212" duration="14866000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="189207000" />
<option name="totallyTimeSpent" value="189562000" />
</component>
<component name="ToolWindowManager">
<frame x="268" y="64" width="1361" height="1040" extended-state="0" />
<frame x="301" y="129" width="1361" height="1040" extended-state="0" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.18896447" />
... ... @@ -657,22 +650,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/gift.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="335">
<caret line="18" column="27" selection-start-line="18" selection-start-column="20" selection-end-line="18" selection-end-column="27" />
<folding>
<element signature="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#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#2;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#3;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#4;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#5;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/gift.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="162">
... ... @@ -701,8 +678,24 @@
</entry>
<entry file="file://$PROJECT_DIR$/first.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="297">
<caret line="11" column="6" lean-forward="true" selection-start-line="11" selection-start-column="6" selection-end-line="11" selection-end-column="6" />
<state relative-caret-position="216">
<caret line="8" column="38" lean-forward="true" selection-start-line="8" selection-start-column="38" selection-end-line="8" selection-end-column="38" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/gift.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="264">
<caret line="65" column="36" selection-start-line="65" selection-start-column="36" selection-end-line="65" selection-end-column="36" />
<folding>
<element signature="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#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#2;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#3;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#4;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#5;n#div#0;n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
</folding>
</state>
</provider>
</entry>
... ...