Commit 48d74b06 by zhangheng

y

parent c4ba24d3
......@@ -2,8 +2,11 @@
<project version="4">
<component name="ChangeListManager">
<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$/Public/static/js/index.js" afterPath="$PROJECT_DIR$/Public/static/js/index.js" />
<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>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
......@@ -17,7 +20,7 @@
</component>
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager">
<splitter split-orientation="horizontal" split-proportion="0.65529954">
<splitter split-orientation="horizontal" split-proportion="0.10691244">
<split-first>
<leaf>
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
......@@ -164,11 +167,9 @@
<file leaf-file-name="index.js" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="57">
<caret line="102" column="5" lean-forward="false" selection-start-line="102" selection-start-column="5" selection-end-line="105" selection-end-column="18" />
<folding>
<marker date="1566922506000" expanded="true" signature="3349:3444" ph="{...}" />
</folding>
<state relative-caret-position="295">
<caret line="292" column="0" lean-forward="false" selection-start-line="292" selection-start-column="0" selection-end-line="292" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
......@@ -180,8 +181,8 @@
<file leaf-file-name="main.scss" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135">
<caret line="192" column="1" lean-forward="false" selection-start-line="192" selection-start-column="1" selection-end-line="192" selection-end-column="1" />
<state relative-caret-position="249">
<caret line="220" column="10" lean-forward="false" selection-start-line="220" selection-start-column="10" selection-end-line="220" selection-end-column="10" />
<folding />
</state>
</provider>
......@@ -233,8 +234,8 @@
<option value="$PROJECT_DIR$/Application/User/View/default/Report_index.tpl" />
<option value="$PROJECT_DIR$/Application/User/Controller/ReportController.class.php" />
<option value="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" />
<option value="$PROJECT_DIR$/Public/static/css/main.scss" />
<option value="$PROJECT_DIR$/Public/static/js/index.js" />
<option value="$PROJECT_DIR$/Public/static/css/main.scss" />
</list>
</option>
</component>
......@@ -588,12 +589,12 @@
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1566667513502</updated>
<workItem from="1566667516612" duration="47065000" />
<workItem from="1566667516612" duration="47286000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="47065000" />
<option name="totallyTimeSpent" value="47286000" />
</component>
<component name="ToolWindowManager">
<frame x="33" y="23" width="1440" height="817" extended-state="0" />
......@@ -825,21 +826,19 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135">
<caret line="192" column="1" lean-forward="false" selection-start-line="192" selection-start-column="1" selection-end-line="192" selection-end-column="1" />
<state relative-caret-position="295">
<caret line="292" column="0" lean-forward="false" selection-start-line="292" selection-start-column="0" selection-end-line="292" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="57">
<caret line="102" column="5" lean-forward="false" selection-start-line="102" selection-start-column="5" selection-end-line="105" selection-end-column="18" />
<folding>
<marker date="1566922506000" expanded="true" signature="3349:3444" ph="{...}" />
</folding>
<state relative-caret-position="249">
<caret line="220" column="10" lean-forward="false" selection-start-line="220" selection-start-column="10" selection-end-line="220" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
......
......@@ -179,8 +179,8 @@ ul, li {
.page-through .through-map {
position: absolute;
display: inline-block;
left: -288px;
top: -69px;
left: -271px;
top: -63px;
background: url("../images/x-k-map.jpg") left top;
width: 1177px;
height: 1375px;
......@@ -215,8 +215,8 @@ ul, li {
.page-through .map-3 {
position: absolute;
display: inline-block;
left: -6px;
top: 263px;
left: 37px;
top: 269px;
background: url("../images/2-3.png") left top;
width: 539px;
height: 605px;
......
......@@ -197,7 +197,7 @@ ul, li {
overflow: hidden;
background: #9bc2f6;
.through-map {
@include image_bounds_by_pos("../images/x-k-map.jpg",-288px, -69px);
@include image_bounds_by_pos("../images/x-k-map.jpg",-271px, -63px);
-webkit-transform: scale(0.5);
animation: planetz_two 6s ease-in 0s infinite forwards;
-webkit-animation: planetz_two 6s ease-in 0s infinite forwards;
......@@ -219,8 +219,7 @@ ul, li {
}
.map-3 {
@include image_bounds_by_pos("../images/2-3.png", -6px, 263px);
@include image_bounds_by_pos("../images/2-3.png", 37px, 269px);
-webkit-transform: scale(0);
animation: planet 4s ease-in 1s infinite forwards;
-webkit-animation: planet 4s ease-in 1s infinite forwards;
......

71.6 KB | W: | H:

428 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