Commit 9e680f98 by zhangheng

y

parent ceb9b144
...@@ -2,7 +2,11 @@ ...@@ -2,7 +2,11 @@
<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$/.sass-cache/a99bcb3812225bbee2e3b2905f436d29891f981a/main.scssc" afterPath="$PROJECT_DIR$/.sass-cache/a99bcb3812225bbee2e3b2905f436d29891f981a/main.scssc" />
<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.css" afterPath="$PROJECT_DIR$/Public/static/css/main.css" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/css/main.scss" afterPath="$PROJECT_DIR$/Public/static/css/main.scss" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" /> <option name="TRACKING_ENABLED" value="true" />
...@@ -179,8 +183,8 @@ ...@@ -179,8 +183,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="287"> <state relative-caret-position="325">
<caret line="210" column="28" lean-forward="false" selection-start-line="210" selection-start-column="28" selection-end-line="210" selection-end-column="28" /> <caret line="234" column="1" lean-forward="false" selection-start-line="234" selection-start-column="1" selection-end-line="234" selection-end-column="1" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -245,7 +249,7 @@ ...@@ -245,7 +249,7 @@
</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="-452" /> <option name="x" value="33" />
<option name="y" value="23" /> <option name="y" value="23" />
<option name="width" value="1440" /> <option name="width" value="1440" />
<option name="height" value="817" /> <option name="height" value="817" />
...@@ -587,15 +591,15 @@ ...@@ -587,15 +591,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="46773000" /> <workItem from="1566667516612" duration="46890000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="46773000" /> <option name="totallyTimeSpent" value="46890000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-452" y="23" width="1440" height="817" extended-state="0" /> <frame x="33" y="23" 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" />
...@@ -836,8 +840,8 @@ ...@@ -836,8 +840,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="287"> <state relative-caret-position="325">
<caret line="210" column="28" lean-forward="false" selection-start-line="210" selection-start-column="28" selection-end-line="210" selection-end-column="28" /> <caret line="234" column="1" lean-forward="false" selection-start-line="234" selection-start-column="1" selection-end-line="234" selection-end-column="1" />
<folding /> <folding />
</state> </state>
</provider> </provider>
......
...@@ -227,8 +227,8 @@ ul, li { ...@@ -227,8 +227,8 @@ ul, li {
.page-through .map-4 { .page-through .map-4 {
position: absolute; position: absolute;
display: inline-block; display: inline-block;
left: 29px; left: 35px;
top: 287px; top: 387px;
background: url("../images/2-4.png") left top; background: url("../images/2-4.png") left top;
width: 368px; width: 368px;
height: 357px; height: 357px;
......
...@@ -227,13 +227,12 @@ ul, li { ...@@ -227,13 +227,12 @@ ul, li {
-webkit-animation: planet 4s ease-in 1s infinite forwards; -webkit-animation: planet 4s ease-in 1s infinite forwards;
} }
.map-4 { .map-4 {
@include image_bounds_by_pos("../images/2-4.png", 29px, 287px); @include image_bounds_by_pos("../images/2-4.png", 35px, 387px);
-webkit-transform: scale(0); -webkit-transform: scale(0);
animation: planet 4s ease-in 1.5s infinite forwards; animation: planet 4s ease-in 1.5s infinite forwards;
-webkit-animation: planet 4s ease-in 1.5s infinite forwards; -webkit-animation: planet 4s ease-in 1.5s infinite forwards;
} }
} }
.page-m-b { .page-m-b {
background: url("../images/m-b-bj-1.jpg") no-repeat center; background: url("../images/m-b-bj-1.jpg") no-repeat center;
width: 640px; width: 640px;
......

425 KB | W: | H:

71.6 KB | W: | H:

Public/static/images/x-k-map.jpg
Public/static/images/x-k-map.jpg
Public/static/images/x-k-map.jpg
Public/static/images/x-k-map.jpg
  • 2-up
  • Swipe
  • Onion skin
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