webfront / shengbao · 提交

转到一个项目

作者 乔爽
提交 2103588d1d66dc9742904e645dfda90786029258 1 个父辈 783f38d5

update

内嵌 并排对比
正在显示 3 个修改的文件 包含 57 行增加 和 60 行删除
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="1ae5f9a6-acdc-475d-863d-ce05e13f7b72" 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/dksm.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/gonggao.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/css/first.css" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/html/dksm.html" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/html/first.html" beforeDir="false" afterPath="$PROJECT_DIR$/gonggao.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/html/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/index.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/html/last.html" beforeDir="false" afterPath="$PROJECT_DIR$/last.html" afterDir="false" />
</list>
<list default="true" id="1ae5f9a6-acdc-475d-863d-ce05e13f7b72" name="Default Changelist" comment="" />
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
<ignored path="$PROJECT_DIR$/tmp/" />
... ... @@ -101,8 +93,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/gonggao.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="163">
<caret line="48" column="8" lean-forward="true" selection-start-line="48" selection-start-column="8" selection-end-line="48" selection-end-column="8" />
<state relative-caret-position="217">
<caret line="50" column="43" lean-forward="true" selection-start-line="50" selection-start-column="43" selection-end-line="50" selection-end-column="43" />
</state>
</provider>
</entry>
... ... @@ -116,7 +108,7 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/css/index.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="189">
... ... @@ -128,8 +120,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="108">
<caret line="38" column="26" lean-forward="true" selection-start-line="38" selection-start-column="26" selection-end-line="38" selection-end-column="26" />
<state relative-caret-position="189">
<caret line="41" column="30" lean-forward="true" selection-start-line="41" selection-start-column="30" selection-end-line="41" selection-end-column="30" />
<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#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
... ... @@ -159,8 +151,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/last.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-283">
<caret line="15" column="18" lean-forward="true" selection-start-line="15" selection-start-column="18" selection-end-line="15" selection-end-column="18" />
<state relative-caret-position="27">
<caret line="15" selection-start-line="15" selection-end-line="16" />
<folding>
<element signature="n#div#0;n#div#1;n#div#0;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#0;n#div#0;n#body#0;n#html#0;n#!!top" />
... ... @@ -187,7 +179,7 @@
<provider selected="true" editor-type-id="images" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/images/bg2_2.png">
<provider selected="true" editor-type-id="images" />
</entry>
... ... @@ -283,10 +275,10 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="765" />
<option name="y" value="155" />
<option name="x" value="854" />
<option name="y" value="114" />
<option name="width" value="1354" />
<option name="height" value="847" />
<option name="height" value="873" />
</component>
<component name="ProjectView">
<navigator proportions="" version="1">
... ... @@ -305,6 +297,11 @@
<item name="shengbao" type="462c0819:PsiDirectoryNode" />
<item name="css" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="shengbao" type="b2602c69:ProjectViewProjectNode" />
<item name="shengbao" type="462c0819:PsiDirectoryNode" />
<item name="images" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
... ... @@ -315,7 +312,7 @@
<component name="PropertiesComponent">
<property name="DefaultHtmlFileTemplate" value="HTML File" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../../企业微信/Wechat_project_1" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../../可耐美手机端/clime" />
<property name="list.type.of.created.stylesheet" value="CSS" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
... ... @@ -359,12 +356,12 @@
<workItem from="1547799045567" duration="6022000" />
<workItem from="1547857140175" duration="1455000" />
<workItem from="1547863520730" duration="3049000" />
<workItem from="1547866625675" duration="1366000" />
<workItem from="1547866625675" duration="1925000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="53811000" />
<option name="totallyTimeSpent" value="54370000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -376,7 +373,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="361" y="51" width="1354" height="891" extended-state="0" />
<frame x="446" y="129" width="1354" height="847" extended-state="0" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.1618541" />
... ... @@ -391,7 +388,7 @@
<window_info anchor="bottom" id="TODO" order="6" weight="0.32974428" />
<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.28968254" />
<window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.30758426" />
<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" />
... ... @@ -429,33 +426,6 @@
<entry file="file://$PROJECT_DIR$/images/bg_1.png">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/images/bg2_2.png">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/last.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-283">
<caret line="15" column="18" lean-forward="true" selection-start-line="15" selection-start-column="18" selection-end-line="15" selection-end-column="18" />
<folding>
<element signature="n#div#0;n#div#1;n#div#0;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#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#0;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#0;n#div#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#select#0;n#div#1;n#div#0;n#div#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#2;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#2;n#div#0;n#div#1;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#body#0;n#html#0;n#!!top" />
<element signature="n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#0;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/gonggao.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="216">
... ... @@ -470,17 +440,17 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/gonggao.html">
<entry file="file://$PROJECT_DIR$/css/index.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="163">
<caret line="48" column="8" lean-forward="true" selection-start-line="48" selection-start-column="8" selection-end-line="48" selection-end-column="8" />
<state relative-caret-position="189">
<caret line="7" column="11" lean-forward="true" selection-start-line="7" selection-start-column="11" selection-end-line="7" selection-end-column="11" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="108">
<caret line="38" column="26" lean-forward="true" selection-start-line="38" selection-start-column="26" selection-end-line="38" selection-end-column="26" />
<state relative-caret-position="189">
<caret line="41" column="30" lean-forward="true" selection-start-line="41" selection-start-column="30" selection-end-line="41" selection-end-column="30" />
<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#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
... ... @@ -501,12 +471,39 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/css/index.css">
<entry file="file://$PROJECT_DIR$/last.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="189">
<caret line="7" column="11" lean-forward="true" selection-start-line="7" selection-start-column="11" selection-end-line="7" selection-end-column="11" />
<state relative-caret-position="27">
<caret line="15" selection-start-line="15" selection-end-line="16" />
<folding>
<element signature="n#div#0;n#div#1;n#div#0;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#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#0;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#0;n#div#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#select#0;n#div#1;n#div#0;n#div#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#2;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#2;n#div#0;n#div#1;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#body#0;n#html#0;n#!!top" />
<element signature="n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#0;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#0;n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
<element signature="n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/gonggao.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="217">
<caret line="50" column="43" lean-forward="true" selection-start-line="50" selection-start-column="43" selection-end-line="50" selection-end-column="43" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/images/bg2_2.png">
<provider selected="true" editor-type-id="images" />
</entry>
</component>
</project>
\ No newline at end of file
... ...