|
@@ -1,18 +1,7 @@
|
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
- <list default="true" id="16049291-669a-47fb-8e5c-99449ef4a199" name="Default" comment="">
|
|
|
- <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/careers.html" beforeDir="false" afterPath="$PROJECT_DIR$/careers.html" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/contact.html" beforeDir="false" afterPath="$PROJECT_DIR$/contact.html" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/css/style.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/style.css" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/do.html" beforeDir="false" afterPath="$PROJECT_DIR$/do.html" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/index.html" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/licheng.html" beforeDir="false" afterPath="$PROJECT_DIR$/licheng.html" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/news.html" beforeDir="false" afterPath="$PROJECT_DIR$/news.html" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/projects-1.html" beforeDir="false" afterPath="$PROJECT_DIR$/projects-1.html" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/projects.html" beforeDir="false" afterPath="$PROJECT_DIR$/projects.html" afterDir="false" />
|
|
|
- </list>
|
|
|
+ <list default="true" id="16049291-669a-47fb-8e5c-99449ef4a199" name="Default" comment="" />
|
|
|
<ignored path="$PROJECT_DIR$/.tmp/" />
|
|
|
<ignored path="$PROJECT_DIR$/temp/" />
|
|
|
<ignored path="$PROJECT_DIR$/tmp/" />
|
|
@@ -39,8 +28,8 @@
|
|
|
<file pinned="false" current-in-tab="true">
|
|
|
<entry file="file://$PROJECT_DIR$/news.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="345">
|
|
|
- <caret line="414" column="62" lean-forward="true" selection-start-line="414" selection-start-column="62" selection-end-line="414" selection-end-column="62" />
|
|
|
+ <state relative-caret-position="276">
|
|
|
+ <caret line="378" column="30" lean-forward="true" selection-start-line="378" selection-start-column="30" selection-end-line="378" selection-end-column="30" />
|
|
|
<folding>
|
|
|
<element signature="n#style#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
</folding>
|
|
@@ -114,7 +103,7 @@
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/css/style.css">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="206">
|
|
|
+ <state relative-caret-position="53015">
|
|
|
<caret line="2305" column="23" selection-start-line="2305" selection-start-column="17" selection-end-line="2305" selection-end-column="23" />
|
|
|
</state>
|
|
|
</provider>
|
|
@@ -131,7 +120,6 @@
|
|
|
</component>
|
|
|
<component name="FindInProjectRecents">
|
|
|
<findStrings>
|
|
|
- <find>menu-close</find>
|
|
|
<find>menu-close-news</find>
|
|
|
<find>menu-contact</find>
|
|
|
<find>main-menu-news</find>
|
|
@@ -161,6 +149,7 @@
|
|
|
<find>newsListBottom</find>
|
|
|
<find>scale-down</find>
|
|
|
<find>itemBg</find>
|
|
|
+ <find>106.14.225.13</find>
|
|
|
</findStrings>
|
|
|
<replaceStrings>
|
|
|
<replace>750</replace>
|
|
@@ -212,6 +201,7 @@
|
|
|
<foldersAlwaysOnTop value="true" />
|
|
|
</navigator>
|
|
|
<panes>
|
|
|
+ <pane id="PackagesPane" />
|
|
|
<pane id="ProjectPane">
|
|
|
<subPane>
|
|
|
<expand>
|
|
@@ -233,7 +223,6 @@
|
|
|
<select />
|
|
|
</subPane>
|
|
|
</pane>
|
|
|
- <pane id="PackagesPane" />
|
|
|
<pane id="Scope" />
|
|
|
</panes>
|
|
|
</component>
|
|
@@ -296,17 +285,18 @@
|
|
|
<workItem from="1544080830485" duration="10667000" />
|
|
|
<workItem from="1544094293008" duration="37000" />
|
|
|
<workItem from="1544167194982" duration="2510000" />
|
|
|
+ <workItem from="1544170883585" duration="446000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="156869000" />
|
|
|
+ <option name="totallyTimeSpent" value="157315000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="1358" y="-8" width="1936" height="1056" extended-state="6" />
|
|
|
<editor active="true" />
|
|
|
<layout>
|
|
|
- <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.22228146" />
|
|
|
+ <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.22441365" />
|
|
|
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
|
|
<window_info id="Favorites" order="2" side_tool="true" />
|
|
|
<window_info id="Image Layers" order="3" />
|
|
@@ -455,15 +445,15 @@
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/css/style.css">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="206">
|
|
|
+ <state relative-caret-position="53015">
|
|
|
<caret line="2305" column="23" selection-start-line="2305" selection-start-column="17" selection-end-line="2305" selection-end-column="23" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/news.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="345">
|
|
|
- <caret line="414" column="62" lean-forward="true" selection-start-line="414" selection-start-column="62" selection-end-line="414" selection-end-column="62" />
|
|
|
+ <state relative-caret-position="276">
|
|
|
+ <caret line="378" column="30" lean-forward="true" selection-start-line="378" selection-start-column="30" selection-end-line="378" selection-end-column="30" />
|
|
|
<folding>
|
|
|
<element signature="n#style#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
|
|
|
</folding>
|