Commit f1b994e5 by zhangheng

y

parent c61f3ded
...@@ -2,7 +2,12 @@ ...@@ -2,7 +2,12 @@
<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/js/index.js" afterPath="$PROJECT_DIR$/Public/static/js/index.js" /> <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$/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" />
...@@ -78,11 +83,11 @@ ...@@ -78,11 +83,11 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="Index_index.tpl" pinned="false" current-in-tab="false"> <file leaf-file-name="Index_index.tpl" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl"> <entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="247"> <state relative-caret-position="228">
<caret line="216" column="0" lean-forward="true" selection-start-line="216" selection-start-column="0" selection-end-line="216" selection-end-column="0" /> <caret line="64" column="10" lean-forward="true" selection-start-line="64" selection-start-column="10" selection-end-line="64" selection-end-column="10" />
<folding> <folding>
<element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
...@@ -160,10 +165,10 @@ ...@@ -160,10 +165,10 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="index.js" pinned="false" current-in-tab="true"> <file leaf-file-name="index.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js"> <entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="201"> <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 />
</state> </state>
...@@ -177,8 +182,8 @@ ...@@ -177,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="171"> <state relative-caret-position="285">
<caret line="428" column="0" lean-forward="true" selection-start-line="428" selection-start-column="0" selection-end-line="428" selection-end-column="0" /> <caret line="200" column="4" lean-forward="false" selection-start-line="200" selection-start-column="4" selection-end-line="200" selection-end-column="4" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -209,8 +214,8 @@ ...@@ -209,8 +214,8 @@
<find>btn-close</find> <find>btn-close</find>
<find>page-lang</find> <find>page-lang</find>
<find>btn-next-map</find> <find>btn-next-map</find>
<find>btn-info</find>
<find>mix/</find> <find>mix/</find>
<find>btn-info</find>
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
<replace>m-</replace> <replace>m-</replace>
...@@ -229,9 +234,9 @@ ...@@ -229,9 +234,9 @@
<option value="$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php" /> <option value="$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php" />
<option value="$PROJECT_DIR$/Application/User/View/default/Report_index.tpl" /> <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/User/Controller/ReportController.class.php" />
<option value="$PROJECT_DIR$/Public/static/css/main.scss" />
<option value="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" /> <option value="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" />
<option value="$PROJECT_DIR$/Public/static/js/index.js" /> <option value="$PROJECT_DIR$/Public/static/js/index.js" />
<option value="$PROJECT_DIR$/Public/static/css/main.scss" />
</list> </list>
</option> </option>
</component> </component>
...@@ -585,12 +590,12 @@ ...@@ -585,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="45647000" /> <workItem from="1566667516612" duration="46589000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="45647000" /> <option name="totallyTimeSpent" value="46589000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="2" y="23" width="1440" height="817" extended-state="6" /> <frame x="2" y="23" width="1440" height="817" extended-state="6" />
...@@ -762,10 +767,18 @@ ...@@ -762,10 +767,18 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<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" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl"> <entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="247"> <state relative-caret-position="228">
<caret line="216" column="0" lean-forward="true" selection-start-line="216" selection-start-column="0" selection-end-line="216" selection-end-column="0" /> <caret line="64" column="10" lean-forward="true" selection-start-line="64" selection-start-column="10" selection-end-line="64" selection-end-column="10" />
<folding> <folding>
<element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
...@@ -824,16 +837,8 @@ ...@@ -824,16 +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="171"> <state relative-caret-position="285">
<caret line="428" column="0" lean-forward="true" selection-start-line="428" selection-start-column="0" selection-end-line="428" selection-end-column="0" /> <caret line="200" column="4" lean-forward="false" selection-start-line="200" selection-start-column="4" selection-end-line="200" selection-end-column="4" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="201">
<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 />
</state> </state>
</provider> </provider>
......
...@@ -182,8 +182,8 @@ ul, li { ...@@ -182,8 +182,8 @@ ul, li {
left: 0px; left: 0px;
top: 0px; top: 0px;
background: url("../images/x-k-map.jpg") left top; background: url("../images/x-k-map.jpg") left top;
width: 640px; width: 1177px;
height: 1170px; height: 1375px;
-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;
...@@ -194,8 +194,8 @@ ul, li { ...@@ -194,8 +194,8 @@ ul, li {
left: 0px; left: 0px;
top: 74px; top: 74px;
background: url("../images/2-1.png") left top; background: url("../images/2-1.png") left top;
width: 640px; width: 983px;
height: 922px; height: 1142px;
-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;
...@@ -206,8 +206,8 @@ ul, li { ...@@ -206,8 +206,8 @@ ul, li {
left: 0px; left: 0px;
top: 153px; top: 153px;
background: url("../images/2-2.png") left top; background: url("../images/2-2.png") left top;
width: 634px; width: 735px;
height: 701px; height: 876px;
-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;
...@@ -218,8 +218,8 @@ ul, li { ...@@ -218,8 +218,8 @@ ul, li {
left: 73px; left: 73px;
top: 303px; top: 303px;
background: url("../images/2-3.png") left top; background: url("../images/2-3.png") left top;
width: 474px; width: 539px;
height: 531px; height: 605px;
-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;
......
...@@ -198,6 +198,7 @@ ul, li { ...@@ -198,6 +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", 0px, 0px); @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;
......

35.4 KB | W: | H:

99.2 KB | W: | H:

Public/static/images/2-1.png
Public/static/images/2-1.png
Public/static/images/2-1.png
Public/static/images/2-1.png
  • 2-up
  • Swipe
  • Onion skin

39.5 KB | W: | H:

67.7 KB | W: | H:

Public/static/images/2-2.png
Public/static/images/2-2.png
Public/static/images/2-2.png
Public/static/images/2-2.png
  • 2-up
  • Swipe
  • Onion skin

43.8 KB | W: | H:

53.6 KB | W: | H:

Public/static/images/2-3.png
Public/static/images/2-3.png
Public/static/images/2-3.png
Public/static/images/2-3.png
  • 2-up
  • Swipe
  • Onion skin

179 KB | W: | H:

425 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