Commit 5e48d91f by zhangheng

y

parent 9e680f98
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
<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$/.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.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" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/css/main.scss" afterPath="$PROJECT_DIR$/Public/static/css/main.scss" />
...@@ -183,8 +182,8 @@ ...@@ -183,8 +182,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="325"> <state relative-caret-position="135">
<caret line="234" column="1" lean-forward="false" selection-start-line="234" selection-start-column="1" selection-end-line="234" selection-end-column="1" /> <caret line="192" column="1" lean-forward="false" selection-start-line="192" selection-start-column="1" selection-end-line="192" selection-end-column="1" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -591,12 +590,12 @@ ...@@ -591,12 +590,12 @@
<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="46890000" /> <workItem from="1566667516612" duration="46992000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="46890000" /> <option name="totallyTimeSpent" value="46992000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="33" y="23" width="1440" height="817" extended-state="0" /> <frame x="33" y="23" width="1440" height="817" extended-state="0" />
...@@ -840,8 +839,8 @@ ...@@ -840,8 +839,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="325"> <state relative-caret-position="135">
<caret line="234" column="1" lean-forward="false" selection-start-line="234" selection-start-column="1" selection-end-line="234" selection-end-column="1" /> <caret line="192" column="1" lean-forward="false" selection-start-line="192" selection-start-column="1" selection-end-line="192" selection-end-column="1" />
<folding /> <folding />
</state> </state>
</provider> </provider>
......
...@@ -174,7 +174,7 @@ ul, li { ...@@ -174,7 +174,7 @@ ul, li {
position: relative; position: relative;
height: 1238px; height: 1238px;
overflow: hidden; overflow: hidden;
background: #a9d0fe; background: #9bc2f6;
} }
.page-through .through-map { .page-through .through-map {
position: absolute; position: absolute;
...@@ -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: 35px; left: 123px;
top: 387px; top: 425px;
background: url("../images/2-4.png") left top; background: url("../images/2-4.png") left top;
width: 368px; width: 368px;
height: 357px; height: 357px;
......
...@@ -191,12 +191,11 @@ ul, li { ...@@ -191,12 +191,11 @@ ul, li {
height: 224px; height: 224px;
} }
} }
.page-through { .page-through {
position: relative; position: relative;
height: 1238px; height: 1238px;
overflow: hidden; overflow: hidden;
background: #a9d0fe; background: #9bc2f6;
.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",-288px, -69px);
-webkit-transform: scale(0.5); -webkit-transform: scale(0.5);
...@@ -227,7 +226,7 @@ ul, li { ...@@ -227,7 +226,7 @@ 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", 35px, 387px); @include image_bounds_by_pos("../images/2-4.png", 123px, 425px);
-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;
......
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