Commit 4fda0f94 by zhangheng

y

parent f1b994e5
...@@ -2,10 +2,6 @@ ...@@ -2,10 +2,6 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="393705e8-a82c-4795-9b3b-5f911ddba9ac" name="Default" comment=""> <list default="true" id="393705e8-a82c-4795-9b3b-5f911ddba9ac" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/images/2-1.png" afterPath="$PROJECT_DIR$/Public/static/images/2-1.png" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/images/2-2.png" afterPath="$PROJECT_DIR$/Public/static/images/2-2.png" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/images/2-3.png" afterPath="$PROJECT_DIR$/Public/static/images/2-3.png" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/images/x-k-map.jpg" afterPath="$PROJECT_DIR$/Public/static/images/x-k-map.jpg" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/css/main.scss" afterPath="$PROJECT_DIR$/Public/static/css/main.scss" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/css/main.scss" afterPath="$PROJECT_DIR$/Public/static/css/main.scss" />
</list> </list>
...@@ -170,7 +166,9 @@ ...@@ -170,7 +166,9 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1227"> <state relative-caret-position="1227">
<caret line="369" column="27" lean-forward="false" selection-start-line="369" selection-start-column="27" selection-end-line="369" selection-end-column="27" /> <caret line="369" column="27" lean-forward="false" selection-start-line="369" selection-start-column="27" selection-end-line="369" selection-end-column="27" />
<folding /> <folding>
<marker date="1566922036000" expanded="true" signature="10761:10763" ph="{...}" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -182,8 +180,8 @@ ...@@ -182,8 +180,8 @@
<file leaf-file-name="main.scss" pinned="false" current-in-tab="true"> <file leaf-file-name="main.scss" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss"> <entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285"> <state relative-caret-position="190">
<caret line="200" column="4" lean-forward="false" selection-start-line="200" selection-start-column="4" selection-end-line="200" selection-end-column="4" /> <caret line="199" column="16" lean-forward="false" selection-start-line="199" selection-start-column="16" selection-end-line="199" selection-end-column="16" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -248,8 +246,8 @@ ...@@ -248,8 +246,8 @@
</component> </component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds"> <component name="ProjectFrameBounds">
<option name="x" value="2" /> <option name="x" value="-8" />
<option name="y" value="23" /> <option name="y" value="259" />
<option name="width" value="1440" /> <option name="width" value="1440" />
<option name="height" value="817" /> <option name="height" value="817" />
</component> </component>
...@@ -590,15 +588,15 @@ ...@@ -590,15 +588,15 @@
<option name="number" value="Default" /> <option name="number" value="Default" />
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1566667513502</updated> <updated>1566667513502</updated>
<workItem from="1566667516612" duration="46589000" /> <workItem from="1566667516612" duration="46702000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="46589000" /> <option name="totallyTimeSpent" value="46702000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="2" y="23" width="1440" height="817" extended-state="6" /> <frame x="-8" y="259" width="1440" height="817" extended-state="0" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.22389127" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.22389127" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
...@@ -771,7 +769,9 @@ ...@@ -771,7 +769,9 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1227"> <state relative-caret-position="1227">
<caret line="369" column="27" lean-forward="false" selection-start-line="369" selection-start-column="27" selection-end-line="369" selection-end-column="27" /> <caret line="369" column="27" lean-forward="false" selection-start-line="369" selection-start-column="27" selection-end-line="369" selection-end-column="27" />
<folding /> <folding>
<marker date="1566922036000" expanded="true" signature="10761:10763" ph="{...}" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -837,8 +837,8 @@ ...@@ -837,8 +837,8 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss"> <entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285"> <state relative-caret-position="190">
<caret line="200" column="4" lean-forward="false" selection-start-line="200" selection-start-column="4" selection-end-line="200" selection-end-column="4" /> <caret line="199" column="16" lean-forward="false" selection-start-line="199" selection-start-column="16" selection-end-line="199" selection-end-column="16" />
<folding /> <folding />
</state> </state>
</provider> </provider>
......
...@@ -179,8 +179,8 @@ ul, li { ...@@ -179,8 +179,8 @@ ul, li {
.page-through .through-map { .page-through .through-map {
position: absolute; position: absolute;
display: inline-block; display: inline-block;
left: 0px; left: -288px;
top: 0px; top: -69px;
background: url("../images/x-k-map.jpg") left top; background: url("../images/x-k-map.jpg") left top;
width: 1177px; width: 1177px;
height: 1375px; height: 1375px;
......
...@@ -198,8 +198,7 @@ ul, li { ...@@ -198,8 +198,7 @@ ul, li {
overflow: hidden; overflow: hidden;
background: #a9d0fe; background: #a9d0fe;
.through-map { .through-map {
@include image_bounds_by_pos("../images/x-k-map.jpg",-288px, -69px);
@include image_bounds_by_pos("../images/x-k-map.jpg", 0px, 0px);
-webkit-transform: scale(0.5); -webkit-transform: scale(0.5);
animation: planetz_two 6s ease-in 0s infinite forwards; animation: planetz_two 6s ease-in 0s infinite forwards;
-webkit-animation: planetz_two 6s ease-in 0s infinite forwards; -webkit-animation: planetz_two 6s ease-in 0s infinite forwards;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment