webfront / shengbao · 提交

转到一个项目

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

update

内嵌 并排对比
正在显示 3 个修改的文件 包含 57 行增加 和 60 行删除
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 - <list default="true" id="1ae5f9a6-acdc-475d-863d-ce05e13f7b72" name="Default Changelist" comment="">  
5 - <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />  
6 - <change beforePath="$PROJECT_DIR$/css/dksm.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/gonggao.css" afterDir="false" />  
7 - <change beforePath="$PROJECT_DIR$/css/first.css" beforeDir="false" />  
8 - <change beforePath="$PROJECT_DIR$/html/dksm.html" beforeDir="false" />  
9 - <change beforePath="$PROJECT_DIR$/html/first.html" beforeDir="false" afterPath="$PROJECT_DIR$/gonggao.html" afterDir="false" />  
10 - <change beforePath="$PROJECT_DIR$/html/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/index.html" afterDir="false" />  
11 - <change beforePath="$PROJECT_DIR$/html/last.html" beforeDir="false" afterPath="$PROJECT_DIR$/last.html" afterDir="false" />  
12 - </list> 4 + <list default="true" id="1ae5f9a6-acdc-475d-863d-ce05e13f7b72" name="Default Changelist" comment="" />
13 <ignored path="$PROJECT_DIR$/.tmp/" /> 5 <ignored path="$PROJECT_DIR$/.tmp/" />
14 <ignored path="$PROJECT_DIR$/temp/" /> 6 <ignored path="$PROJECT_DIR$/temp/" />
15 <ignored path="$PROJECT_DIR$/tmp/" /> 7 <ignored path="$PROJECT_DIR$/tmp/" />
@@ -101,8 +93,8 @@ @@ -101,8 +93,8 @@
101 <file pinned="false" current-in-tab="false"> 93 <file pinned="false" current-in-tab="false">
102 <entry file="file://$PROJECT_DIR$/gonggao.html"> 94 <entry file="file://$PROJECT_DIR$/gonggao.html">
103 <provider selected="true" editor-type-id="text-editor"> 95 <provider selected="true" editor-type-id="text-editor">
104 - <state relative-caret-position="163">  
105 - <caret line="48" column="8" lean-forward="true" selection-start-line="48" selection-start-column="8" selection-end-line="48" selection-end-column="8" /> 96 + <state relative-caret-position="217">
  97 + <caret line="50" column="43" lean-forward="true" selection-start-line="50" selection-start-column="43" selection-end-line="50" selection-end-column="43" />
106 </state> 98 </state>
107 </provider> 99 </provider>
108 </entry> 100 </entry>
@@ -116,7 +108,7 @@ @@ -116,7 +108,7 @@
116 </provider> 108 </provider>
117 </entry> 109 </entry>
118 </file> 110 </file>
119 - <file pinned="false" current-in-tab="true"> 111 + <file pinned="false" current-in-tab="false">
120 <entry file="file://$PROJECT_DIR$/css/index.css"> 112 <entry file="file://$PROJECT_DIR$/css/index.css">
121 <provider selected="true" editor-type-id="text-editor"> 113 <provider selected="true" editor-type-id="text-editor">
122 <state relative-caret-position="189"> 114 <state relative-caret-position="189">
@@ -128,8 +120,8 @@ @@ -128,8 +120,8 @@
128 <file pinned="false" current-in-tab="false"> 120 <file pinned="false" current-in-tab="false">
129 <entry file="file://$PROJECT_DIR$/index.html"> 121 <entry file="file://$PROJECT_DIR$/index.html">
130 <provider selected="true" editor-type-id="text-editor"> 122 <provider selected="true" editor-type-id="text-editor">
131 - <state relative-caret-position="108">  
132 - <caret line="38" column="26" lean-forward="true" selection-start-line="38" selection-start-column="26" selection-end-line="38" selection-end-column="26" /> 123 + <state relative-caret-position="189">
  124 + <caret line="41" column="30" lean-forward="true" selection-start-line="41" selection-start-column="30" selection-end-line="41" selection-end-column="30" />
133 <folding> 125 <folding>
134 <element signature="n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 126 <element signature="n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
135 <element signature="n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 127 <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 @@ @@ -159,8 +151,8 @@
159 <file pinned="false" current-in-tab="false"> 151 <file pinned="false" current-in-tab="false">
160 <entry file="file://$PROJECT_DIR$/last.html"> 152 <entry file="file://$PROJECT_DIR$/last.html">
161 <provider selected="true" editor-type-id="text-editor"> 153 <provider selected="true" editor-type-id="text-editor">
162 - <state relative-caret-position="-283">  
163 - <caret line="15" column="18" lean-forward="true" selection-start-line="15" selection-start-column="18" selection-end-line="15" selection-end-column="18" /> 154 + <state relative-caret-position="27">
  155 + <caret line="15" selection-start-line="15" selection-end-line="16" />
164 <folding> 156 <folding>
165 <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" /> 157 <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" />
166 <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" /> 158 <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 @@ @@ -187,7 +179,7 @@
187 <provider selected="true" editor-type-id="images" /> 179 <provider selected="true" editor-type-id="images" />
188 </entry> 180 </entry>
189 </file> 181 </file>
190 - <file pinned="false" current-in-tab="false"> 182 + <file pinned="false" current-in-tab="true">
191 <entry file="file://$PROJECT_DIR$/images/bg2_2.png"> 183 <entry file="file://$PROJECT_DIR$/images/bg2_2.png">
192 <provider selected="true" editor-type-id="images" /> 184 <provider selected="true" editor-type-id="images" />
193 </entry> 185 </entry>
@@ -283,10 +275,10 @@ @@ -283,10 +275,10 @@
283 <sorting>DEFINITION_ORDER</sorting> 275 <sorting>DEFINITION_ORDER</sorting>
284 </component> 276 </component>
285 <component name="ProjectFrameBounds"> 277 <component name="ProjectFrameBounds">
286 - <option name="x" value="765" />  
287 - <option name="y" value="155" /> 278 + <option name="x" value="854" />
  279 + <option name="y" value="114" />
288 <option name="width" value="1354" /> 280 <option name="width" value="1354" />
289 - <option name="height" value="847" /> 281 + <option name="height" value="873" />
290 </component> 282 </component>
291 <component name="ProjectView"> 283 <component name="ProjectView">
292 <navigator proportions="" version="1"> 284 <navigator proportions="" version="1">
@@ -305,6 +297,11 @@ @@ -305,6 +297,11 @@
305 <item name="shengbao" type="462c0819:PsiDirectoryNode" /> 297 <item name="shengbao" type="462c0819:PsiDirectoryNode" />
306 <item name="css" type="462c0819:PsiDirectoryNode" /> 298 <item name="css" type="462c0819:PsiDirectoryNode" />
307 </path> 299 </path>
  300 + <path>
  301 + <item name="shengbao" type="b2602c69:ProjectViewProjectNode" />
  302 + <item name="shengbao" type="462c0819:PsiDirectoryNode" />
  303 + <item name="images" type="462c0819:PsiDirectoryNode" />
  304 + </path>
308 </expand> 305 </expand>
309 <select /> 306 <select />
310 </subPane> 307 </subPane>
@@ -315,7 +312,7 @@ @@ -315,7 +312,7 @@
315 <component name="PropertiesComponent"> 312 <component name="PropertiesComponent">
316 <property name="DefaultHtmlFileTemplate" value="HTML File" /> 313 <property name="DefaultHtmlFileTemplate" value="HTML File" />
317 <property name="WebServerToolWindowFactoryState" value="false" /> 314 <property name="WebServerToolWindowFactoryState" value="false" />
318 - <property name="last_opened_file_path" value="$PROJECT_DIR$/../../企业微信/Wechat_project_1" /> 315 + <property name="last_opened_file_path" value="$PROJECT_DIR$/../../可耐美手机端/clime" />
319 <property name="list.type.of.created.stylesheet" value="CSS" /> 316 <property name="list.type.of.created.stylesheet" value="CSS" />
320 <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" /> 317 <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
321 <property name="nodejs_npm_path_reset_for_default_project" value="true" /> 318 <property name="nodejs_npm_path_reset_for_default_project" value="true" />
@@ -359,12 +356,12 @@ @@ -359,12 +356,12 @@
359 <workItem from="1547799045567" duration="6022000" /> 356 <workItem from="1547799045567" duration="6022000" />
360 <workItem from="1547857140175" duration="1455000" /> 357 <workItem from="1547857140175" duration="1455000" />
361 <workItem from="1547863520730" duration="3049000" /> 358 <workItem from="1547863520730" duration="3049000" />
362 - <workItem from="1547866625675" duration="1366000" /> 359 + <workItem from="1547866625675" duration="1925000" />
363 </task> 360 </task>
364 <servers /> 361 <servers />
365 </component> 362 </component>
366 <component name="TimeTrackingManager"> 363 <component name="TimeTrackingManager">
367 - <option name="totallyTimeSpent" value="53811000" /> 364 + <option name="totallyTimeSpent" value="54370000" />
368 </component> 365 </component>
369 <component name="TodoView"> 366 <component name="TodoView">
370 <todo-panel id="selected-file"> 367 <todo-panel id="selected-file">
@@ -376,7 +373,7 @@ @@ -376,7 +373,7 @@
376 </todo-panel> 373 </todo-panel>
377 </component> 374 </component>
378 <component name="ToolWindowManager"> 375 <component name="ToolWindowManager">
379 - <frame x="361" y="51" width="1354" height="891" extended-state="0" /> 376 + <frame x="446" y="129" width="1354" height="847" extended-state="0" />
380 <editor active="true" /> 377 <editor active="true" />
381 <layout> 378 <layout>
382 <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.1618541" /> 379 <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.1618541" />
@@ -391,7 +388,7 @@ @@ -391,7 +388,7 @@
391 <window_info anchor="bottom" id="TODO" order="6" weight="0.32974428" /> 388 <window_info anchor="bottom" id="TODO" order="6" weight="0.32974428" />
392 <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> 389 <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
393 <window_info anchor="bottom" id="Version Control" order="8" /> 390 <window_info anchor="bottom" id="Version Control" order="8" />
394 - <window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.28968254" /> 391 + <window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.30758426" />
395 <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" /> 392 <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
396 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> 393 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
397 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> 394 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@@ -429,33 +426,6 @@ @@ -429,33 +426,6 @@
429 <entry file="file://$PROJECT_DIR$/images/bg_1.png"> 426 <entry file="file://$PROJECT_DIR$/images/bg_1.png">
430 <provider selected="true" editor-type-id="images" /> 427 <provider selected="true" editor-type-id="images" />
431 </entry> 428 </entry>
432 - <entry file="file://$PROJECT_DIR$/images/bg2_2.png">  
433 - <provider selected="true" editor-type-id="images" />  
434 - </entry>  
435 - <entry file="file://$PROJECT_DIR$/last.html">  
436 - <provider selected="true" editor-type-id="text-editor">  
437 - <state relative-caret-position="-283">  
438 - <caret line="15" column="18" lean-forward="true" selection-start-line="15" selection-start-column="18" selection-end-line="15" selection-end-column="18" />  
439 - <folding>  
440 - <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" />  
441 - <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" />  
442 - <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" />  
443 - <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" />  
444 - <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" />  
445 - <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" />  
446 - <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" />  
447 - <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" />  
448 - <element signature="n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
449 - <element signature="n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
450 - <element signature="n#div#0;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
451 - <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" />  
452 - <element signature="n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
453 - <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" />  
454 - <element signature="n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />  
455 - </folding>  
456 - </state>  
457 - </provider>  
458 - </entry>  
459 <entry file="file://$PROJECT_DIR$/css/gonggao.css"> 429 <entry file="file://$PROJECT_DIR$/css/gonggao.css">
460 <provider selected="true" editor-type-id="text-editor"> 430 <provider selected="true" editor-type-id="text-editor">
461 <state relative-caret-position="216"> 431 <state relative-caret-position="216">
@@ -470,17 +440,17 @@ @@ -470,17 +440,17 @@
470 </state> 440 </state>
471 </provider> 441 </provider>
472 </entry> 442 </entry>
473 - <entry file="file://$PROJECT_DIR$/gonggao.html"> 443 + <entry file="file://$PROJECT_DIR$/css/index.css">
474 <provider selected="true" editor-type-id="text-editor"> 444 <provider selected="true" editor-type-id="text-editor">
475 - <state relative-caret-position="163">  
476 - <caret line="48" column="8" lean-forward="true" selection-start-line="48" selection-start-column="8" selection-end-line="48" selection-end-column="8" /> 445 + <state relative-caret-position="189">
  446 + <caret line="7" column="11" lean-forward="true" selection-start-line="7" selection-start-column="11" selection-end-line="7" selection-end-column="11" />
477 </state> 447 </state>
478 </provider> 448 </provider>
479 </entry> 449 </entry>
480 <entry file="file://$PROJECT_DIR$/index.html"> 450 <entry file="file://$PROJECT_DIR$/index.html">
481 <provider selected="true" editor-type-id="text-editor"> 451 <provider selected="true" editor-type-id="text-editor">
482 - <state relative-caret-position="108">  
483 - <caret line="38" column="26" lean-forward="true" selection-start-line="38" selection-start-column="26" selection-end-line="38" selection-end-column="26" /> 452 + <state relative-caret-position="189">
  453 + <caret line="41" column="30" lean-forward="true" selection-start-line="41" selection-start-column="30" selection-end-line="41" selection-end-column="30" />
484 <folding> 454 <folding>
485 <element signature="n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 455 <element signature="n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
486 <element signature="n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" /> 456 <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 @@ @@ -501,12 +471,39 @@
501 </state> 471 </state>
502 </provider> 472 </provider>
503 </entry> 473 </entry>
504 - <entry file="file://$PROJECT_DIR$/css/index.css"> 474 + <entry file="file://$PROJECT_DIR$/last.html">
505 <provider selected="true" editor-type-id="text-editor"> 475 <provider selected="true" editor-type-id="text-editor">
506 - <state relative-caret-position="189">  
507 - <caret line="7" column="11" lean-forward="true" selection-start-line="7" selection-start-column="11" selection-end-line="7" selection-end-column="11" /> 476 + <state relative-caret-position="27">
  477 + <caret line="15" selection-start-line="15" selection-end-line="16" />
  478 + <folding>
  479 + <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" />
  480 + <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" />
  481 + <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" />
  482 + <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" />
  483 + <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" />
  484 + <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" />
  485 + <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" />
  486 + <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" />
  487 + <element signature="n#div#2;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  488 + <element signature="n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  489 + <element signature="n#div#0;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  490 + <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" />
  491 + <element signature="n#div#1;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  492 + <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" />
  493 + <element signature="n#div#2;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" />
  494 + </folding>
508 </state> 495 </state>
509 </provider> 496 </provider>
510 </entry> 497 </entry>
  498 + <entry file="file://$PROJECT_DIR$/gonggao.html">
  499 + <provider selected="true" editor-type-id="text-editor">
  500 + <state relative-caret-position="217">
  501 + <caret line="50" column="43" lean-forward="true" selection-start-line="50" selection-start-column="43" selection-end-line="50" selection-end-column="43" />
  502 + </state>
  503 + </provider>
  504 + </entry>
  505 + <entry file="file://$PROJECT_DIR$/images/bg2_2.png">
  506 + <provider selected="true" editor-type-id="images" />
  507 + </entry>
511 </component> 508 </component>
512 </project> 509 </project>