Commit ceb9b144 by zhangheng

y

parent 4fda0f94
...@@ -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$/.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" />
</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" />
...@@ -17,7 +16,7 @@ ...@@ -17,7 +16,7 @@
</component> </component>
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" /> <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager"> <component name="FileEditorManager">
<splitter split-orientation="horizontal" split-proportion="0.5907834"> <splitter split-orientation="horizontal" split-proportion="0.18617511">
<split-first> <split-first>
<leaf> <leaf>
<file leaf-file-name="index.html" pinned="false" current-in-tab="false"> <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
...@@ -180,8 +179,8 @@ ...@@ -180,8 +179,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="190"> <state relative-caret-position="287">
<caret line="199" column="16" lean-forward="false" selection-start-line="199" selection-start-column="16" selection-end-line="199" selection-end-column="16" /> <caret line="210" column="28" lean-forward="false" selection-start-line="210" selection-start-column="28" selection-end-line="210" selection-end-column="28" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -246,8 +245,8 @@ ...@@ -246,8 +245,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="-8" /> <option name="x" value="-452" />
<option name="y" value="259" /> <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" />
</component> </component>
...@@ -588,15 +587,15 @@ ...@@ -588,15 +587,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="46702000" /> <workItem from="1566667516612" duration="46773000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="46702000" /> <option name="totallyTimeSpent" value="46773000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-8" y="259" width="1440" height="817" extended-state="0" /> <frame x="-452" 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" />
...@@ -837,8 +836,8 @@ ...@@ -837,8 +836,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="190"> <state relative-caret-position="287">
<caret line="199" column="16" lean-forward="false" selection-start-line="199" selection-start-column="16" selection-end-line="199" selection-end-column="16" /> <caret line="210" column="28" lean-forward="false" selection-start-line="210" selection-start-column="28" selection-end-line="210" selection-end-column="28" />
<folding /> <folding />
</state> </state>
</provider> </provider>
......
...@@ -191,7 +191,7 @@ ul, li { ...@@ -191,7 +191,7 @@ ul, li {
.page-through .map-1 { .page-through .map-1 {
position: absolute; position: absolute;
display: inline-block; display: inline-block;
left: 0px; left: -173px;
top: 74px; top: 74px;
background: url("../images/2-1.png") left top; background: url("../images/2-1.png") left top;
width: 983px; width: 983px;
...@@ -203,7 +203,7 @@ ul, li { ...@@ -203,7 +203,7 @@ ul, li {
.page-through .map-2 { .page-through .map-2 {
position: absolute; position: absolute;
display: inline-block; display: inline-block;
left: 0px; left: -76px;
top: 153px; top: 153px;
background: url("../images/2-2.png") left top; background: url("../images/2-2.png") left top;
width: 735px; width: 735px;
...@@ -215,8 +215,8 @@ ul, li { ...@@ -215,8 +215,8 @@ ul, li {
.page-through .map-3 { .page-through .map-3 {
position: absolute; position: absolute;
display: inline-block; display: inline-block;
left: 73px; left: -6px;
top: 303px; top: 263px;
background: url("../images/2-3.png") left top; background: url("../images/2-3.png") left top;
width: 539px; width: 539px;
height: 605px; height: 605px;
...@@ -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: 134px; left: 29px;
top: 369px; top: 287px;
background: url("../images/2-4.png") left top; background: url("../images/2-4.png") left top;
width: 368px; width: 368px;
height: 357px; height: 357px;
......
...@@ -206,14 +206,14 @@ ul, li { ...@@ -206,14 +206,14 @@ ul, li {
//dos code //dos code
.map-1 { .map-1 {
@include image_bounds_by_pos("../images/2-1.png", 0px, 74px); @include image_bounds_by_pos("../images/2-1.png", -173px, 74px);
-webkit-transform: scale(0); -webkit-transform: scale(0);
animation: planet 4s ease-in 0s infinite forwards; animation: planet 4s ease-in 0s infinite forwards;
-webkit-animation: planet 4s ease-in 0s infinite forwards; -webkit-animation: planet 4s ease-in 0s infinite forwards;
} }
.map-2 { .map-2 {
@include image_bounds_by_pos("../images/2-2.png", 0px, 153px); @include image_bounds_by_pos("../images/2-2.png", -76px, 153px);
-webkit-transform: scale(0); -webkit-transform: scale(0);
animation: planet 4s ease-in 0.5s infinite forwards; animation: planet 4s ease-in 0.5s infinite forwards;
-webkit-animation: planet 4s ease-in 0.5s infinite forwards; -webkit-animation: planet 4s ease-in 0.5s infinite forwards;
...@@ -221,13 +221,13 @@ ul, li { ...@@ -221,13 +221,13 @@ ul, li {
} }
.map-3 { .map-3 {
@include image_bounds_by_pos("../images/2-3.png", 73px, 303px); @include image_bounds_by_pos("../images/2-3.png", -6px, 263px);
-webkit-transform: scale(0); -webkit-transform: scale(0);
animation: planet 4s ease-in 1s infinite forwards; animation: planet 4s ease-in 1s infinite forwards;
-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", 134px, 369px); @include image_bounds_by_pos("../images/2-4.png", 29px, 287px);
-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