| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312 | 
							- <?xml version="1.0" encoding="UTF-8"?>
 
- <project version="4">
 
-   <component name="ChangeListManager">
 
-     <list default="true" id="0739358d-fdeb-45f8-ab5c-b13eadea29c5" name="Default" comment="" />
 
-     <ignored path="$PROJECT_DIR$/.tmp/" />
 
-     <ignored path="$PROJECT_DIR$/temp/" />
 
-     <ignored path="$PROJECT_DIR$/tmp/" />
 
-     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
 
-     <option name="TRACKING_ENABLED" value="true" />
 
-     <option name="SHOW_DIALOG" value="false" />
 
-     <option name="HIGHLIGHT_CONFLICTS" value="true" />
 
-     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
 
-     <option name="LAST_RESOLUTION" value="IGNORE" />
 
-   </component>
 
-   <component name="FileEditorManager">
 
-     <leaf>
 
-       <file leaf-file-name="licheng.html" pinned="false" current-in-tab="false">
 
-         <entry file="file://$PROJECT_DIR$/licheng.html">
 
-           <provider selected="true" editor-type-id="text-editor">
 
-             <state relative-caret-position="405">
 
-               <caret line="135" column="141" lean-forward="true" selection-start-line="135" selection-start-column="141" selection-end-line="135" selection-end-column="141" />
 
-               <folding>
 
-                 <element signature="n#style#0;n#span#0;n#p#1;n#div#0;n#li#3;n#ul#1;n#div#0;n#div#6;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
 
-                 <element signature="n#style#0;n#span#1;n#p#1;n#div#0;n#li#3;n#ul#1;n#div#0;n#div#6;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
 
-                 <element signature="n#style#0;n#span#0;n#p#0;n#div#0;n#li#1;n#ul#2;n#div#0;n#div#6;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
 
-                 <element signature="n#style#0;n#span#1;n#p#0;n#div#0;n#li#1;n#ul#2;n#div#0;n#div#6;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
 
-                 <element signature="e#10958#10964#1" expanded="true" />
 
-                 <element signature="e#11100#11106#1" expanded="true" />
 
-               </folding>
 
-             </state>
 
-           </provider>
 
-         </entry>
 
-       </file>
 
-       <file leaf-file-name="do.html" pinned="false" current-in-tab="false">
 
-         <entry file="file://$PROJECT_DIR$/do.html">
 
-           <provider selected="true" editor-type-id="text-editor">
 
-             <state relative-caret-position="240">
 
-               <caret line="253" column="36" lean-forward="false" selection-start-line="253" selection-start-column="36" selection-end-line="253" selection-end-column="36" />
 
-               <folding />
 
-             </state>
 
-           </provider>
 
-         </entry>
 
-       </file>
 
-       <file leaf-file-name="do-damai.html" pinned="false" current-in-tab="false">
 
-         <entry file="file://$PROJECT_DIR$/do-damai.html">
 
-           <provider selected="true" editor-type-id="text-editor">
 
-             <state relative-caret-position="226">
 
-               <caret line="180" column="133" lean-forward="true" selection-start-line="180" selection-start-column="133" selection-end-line="180" selection-end-column="133" />
 
-               <folding />
 
-             </state>
 
-           </provider>
 
-         </entry>
 
-       </file>
 
-       <file leaf-file-name="chuangshiren.html" pinned="false" current-in-tab="true">
 
-         <entry file="file://$PROJECT_DIR$/chuangshiren.html">
 
-           <provider selected="true" editor-type-id="text-editor">
 
-             <state relative-caret-position="331">
 
-               <caret line="30" column="24" lean-forward="false" selection-start-line="30" selection-start-column="24" selection-end-line="30" selection-end-column="24" />
 
-               <folding />
 
-             </state>
 
-           </provider>
 
-         </entry>
 
-       </file>
 
-       <file leaf-file-name="index.css" 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="123">
 
-               <caret line="381" column="15" lean-forward="true" selection-start-line="381" selection-start-column="15" selection-end-line="381" selection-end-column="15" />
 
-               <folding />
 
-             </state>
 
-           </provider>
 
-         </entry>
 
-       </file>
 
-     </leaf>
 
-   </component>
 
-   <component name="FindInProjectRecents">
 
-     <findStrings>
 
-       <find>progressFirst</find>
 
-       <find>.progressFirst</find>
 
-       <find>progressSecondText</find>
 
-     </findStrings>
 
-     <replaceStrings>
 
-       <replace />
 
-     </replaceStrings>
 
-   </component>
 
-   <component name="Git.Settings">
 
-     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
 
-   </component>
 
-   <component name="IdeDocumentHistory">
 
-     <option name="CHANGED_PATHS">
 
-       <list>
 
-         <option value="$PROJECT_DIR$/css/index.css" />
 
-         <option value="$PROJECT_DIR$/licheng.html" />
 
-         <option value="$PROJECT_DIR$/do.html" />
 
-         <option value="$PROJECT_DIR$/do-damai.html" />
 
-         <option value="$PROJECT_DIR$/chuangshiren.html" />
 
-       </list>
 
-     </option>
 
-   </component>
 
-   <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
 
-   <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
 
-   <component name="JsGulpfileManager">
 
-     <detection-done>true</detection-done>
 
-     <sorting>DEFINITION_ORDER</sorting>
 
-   </component>
 
-   <component name="ProjectFrameBounds">
 
-     <option name="x" value="46" />
 
-     <option name="y" value="44" />
 
-     <option name="width" value="1394" />
 
-     <option name="height" value="757" />
 
-   </component>
 
-   <component name="ProjectView">
 
-     <navigator currentView="ProjectPane" proportions="" version="1">
 
-       <flattenPackages />
 
-       <showMembers />
 
-       <showModules />
 
-       <showLibraryContents />
 
-       <hideEmptyPackages />
 
-       <abbreviatePackageNames />
 
-       <autoscrollToSource />
 
-       <autoscrollFromSource />
 
-       <sortByType />
 
-       <manualOrder />
 
-       <foldersAlwaysOnTop value="true" />
 
-     </navigator>
 
-     <panes>
 
-       <pane id="Scope" />
 
-       <pane id="Scratches" />
 
-       <pane id="ProjectPane">
 
-         <subPane>
 
-           <expand>
 
-             <path>
 
-               <item name="ElabWeb" type="b2602c69:ProjectViewProjectNode" />
 
-               <item name="ElabWeb" type="462c0819:PsiDirectoryNode" />
 
-             </path>
 
-           </expand>
 
-           <select />
 
-         </subPane>
 
-       </pane>
 
-     </panes>
 
-   </component>
 
-   <component name="PropertiesComponent">
 
-     <property name="settings.editor.selected.configurable" value="preferences.lookFeel" />
 
-     <property name="WebServerToolWindowFactoryState" value="false" />
 
-     <property name="HbShouldOpenHtmlAsHb" value="" />
 
-   </component>
 
-   <component name="RunDashboard">
 
-     <option name="ruleStates">
 
-       <list>
 
-         <RuleState>
 
-           <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
 
-         </RuleState>
 
-         <RuleState>
 
-           <option name="name" value="StatusDashboardGroupingRule" />
 
-         </RuleState>
 
-       </list>
 
-     </option>
 
-   </component>
 
-   <component name="ShelveChangesManager" show_recycled="false">
 
-     <option name="remove_strategy" value="false" />
 
-   </component>
 
-   <component name="SvnConfiguration">
 
-     <configuration />
 
-   </component>
 
-   <component name="TaskManager">
 
-     <task active="true" id="Default" summary="Default task">
 
-       <changelist id="0739358d-fdeb-45f8-ab5c-b13eadea29c5" name="Default" comment="" />
 
-       <created>1538474319810</created>
 
-       <option name="number" value="Default" />
 
-       <option name="presentableId" value="Default" />
 
-       <updated>1538474319810</updated>
 
-       <workItem from="1538474321217" duration="4008000" />
 
-     </task>
 
-     <task id="LOCAL-00001" summary="修改轮播文字">
 
-       <created>1538476034349</created>
 
-       <option name="number" value="00001" />
 
-       <option name="presentableId" value="LOCAL-00001" />
 
-       <option name="project" value="LOCAL" />
 
-       <updated>1538476034349</updated>
 
-     </task>
 
-     <task id="LOCAL-00002" summary="hover 位置调整">
 
-       <created>1538477374593</created>
 
-       <option name="number" value="00002" />
 
-       <option name="presentableId" value="LOCAL-00002" />
 
-       <option name="project" value="LOCAL" />
 
-       <updated>1538477374593</updated>
 
-     </task>
 
-     <task id="LOCAL-00003" summary="Merge branch 'master' of https://github.com/mawicWang/ElabWeb

# Conflicts:
#	licheng.html">
 
-       <created>1538477841981</created>
 
-       <option name="number" value="00003" />
 
-       <option name="presentableId" value="LOCAL-00003" />
 
-       <option name="project" value="LOCAL" />
 
-       <updated>1538477841981</updated>
 
-     </task>
 
-     <task id="LOCAL-00004" summary="唯品顺位文字宽度修复">
 
-       <created>1538478030440</created>
 
-       <option name="number" value="00004" />
 
-       <option name="presentableId" value="LOCAL-00004" />
 
-       <option name="project" value="LOCAL" />
 
-       <updated>1538478030440</updated>
 
-     </task>
 
-     <task id="LOCAL-00005" summary="文字修复">
 
-       <created>1538478520144</created>
 
-       <option name="number" value="00005" />
 
-       <option name="presentableId" value="LOCAL-00005" />
 
-       <option name="project" value="LOCAL" />
 
-       <updated>1538478520145</updated>
 
-     </task>
 
-     <task id="LOCAL-00006" summary="创始人头像cdn">
 
-       <created>1538478742327</created>
 
-       <option name="number" value="00006" />
 
-       <option name="presentableId" value="LOCAL-00006" />
 
-       <option name="project" value="LOCAL" />
 
-       <updated>1538478742327</updated>
 
-     </task>
 
-     <option name="localTasksCounter" value="7" />
 
-     <servers />
 
-   </component>
 
-   <component name="TimeTrackingManager">
 
-     <option name="totallyTimeSpent" value="4008000" />
 
-   </component>
 
-   <component name="ToolWindowManager">
 
-     <frame x="46" y="44" width="1394" height="757" extended-state="0" />
 
-     <layout>
 
-       <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24981792" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
 
-       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
 
-       <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
 
-       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
 
-       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
 
-       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
 
-       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
 
-       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
 
-       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
 
-       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
 
-       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
 
-       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
 
-       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
 
-       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
 
-       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
 
-       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
 
-       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
 
-     </layout>
 
-   </component>
 
-   <component name="TypeScriptGeneratedFilesManager">
 
-     <option name="version" value="1" />
 
-   </component>
 
-   <component name="VcsContentAnnotationSettings">
 
-     <option name="myLimit" value="2678400000" />
 
-   </component>
 
-   <component name="VcsManagerConfiguration">
 
-     <MESSAGE value="修改轮播文字" />
 
-     <MESSAGE value="hover 位置调整" />
 
-     <MESSAGE value="Merge branch 'master' of https://github.com/mawicWang/ElabWeb

# Conflicts:
#	licheng.html" />
 
-     <MESSAGE value="唯品顺位文字宽度修复" />
 
-     <MESSAGE value="文字修复" />
 
-     <MESSAGE value="创始人头像cdn" />
 
-     <option name="LAST_COMMIT_MESSAGE" value="创始人头像cdn" />
 
-   </component>
 
-   <component name="XDebuggerManager">
 
-     <breakpoint-manager />
 
-     <watches-manager />
 
-   </component>
 
-   <component name="editorHistoryManager">
 
-     <entry file="file://$PROJECT_DIR$/css/index.css">
 
-       <provider selected="true" editor-type-id="text-editor">
 
-         <state relative-caret-position="123">
 
-           <caret line="381" column="15" lean-forward="true" selection-start-line="381" selection-start-column="15" selection-end-line="381" selection-end-column="15" />
 
-           <folding />
 
-         </state>
 
-       </provider>
 
-     </entry>
 
-     <entry file="file://$PROJECT_DIR$/licheng.html">
 
-       <provider selected="true" editor-type-id="text-editor">
 
-         <state relative-caret-position="405">
 
-           <caret line="135" column="141" lean-forward="true" selection-start-line="135" selection-start-column="141" selection-end-line="135" selection-end-column="141" />
 
-           <folding>
 
-             <element signature="n#style#0;n#span#0;n#p#1;n#div#0;n#li#3;n#ul#1;n#div#0;n#div#6;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
 
-             <element signature="n#style#0;n#span#1;n#p#1;n#div#0;n#li#3;n#ul#1;n#div#0;n#div#6;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
 
-             <element signature="n#style#0;n#span#0;n#p#0;n#div#0;n#li#1;n#ul#2;n#div#0;n#div#6;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
 
-             <element signature="n#style#0;n#span#1;n#p#0;n#div#0;n#li#1;n#ul#2;n#div#0;n#div#6;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
 
-             <element signature="e#10958#10964#1" expanded="true" />
 
-             <element signature="e#11100#11106#1" expanded="true" />
 
-           </folding>
 
-         </state>
 
-       </provider>
 
-     </entry>
 
-     <entry file="file://$PROJECT_DIR$/do.html">
 
-       <provider selected="true" editor-type-id="text-editor">
 
-         <state relative-caret-position="240">
 
-           <caret line="253" column="36" lean-forward="false" selection-start-line="253" selection-start-column="36" selection-end-line="253" selection-end-column="36" />
 
-           <folding />
 
-         </state>
 
-       </provider>
 
-     </entry>
 
-     <entry file="file://$PROJECT_DIR$/do-damai.html">
 
-       <provider selected="true" editor-type-id="text-editor">
 
-         <state relative-caret-position="226">
 
-           <caret line="180" column="133" lean-forward="true" selection-start-line="180" selection-start-column="133" selection-end-line="180" selection-end-column="133" />
 
-           <folding />
 
-         </state>
 
-       </provider>
 
-     </entry>
 
-     <entry file="file://$PROJECT_DIR$/chuangshiren.html">
 
-       <provider selected="true" editor-type-id="text-editor">
 
-         <state relative-caret-position="331">
 
-           <caret line="30" column="24" lean-forward="false" selection-start-line="30" selection-start-column="24" selection-end-line="30" selection-end-column="24" />
 
-           <folding />
 
-         </state>
 
-       </provider>
 
-     </entry>
 
-   </component>
 
- </project>
 
 
  |