Commit f1f73997 by zhangheng

y

parent 88864aeb
...@@ -2,8 +2,10 @@ ...@@ -2,8 +2,10 @@
<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$/.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/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> </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" />
...@@ -166,9 +168,7 @@ ...@@ -166,9 +168,7 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238"> <state relative-caret-position="238">
<caret line="102" column="5" lean-forward="false" selection-start-line="102" selection-start-column="5" selection-end-line="105" selection-end-column="18" /> <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> <folding />
<marker date="1566923379000" expanded="true" signature="3349:3444" ph="{...}" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -180,8 +180,8 @@ ...@@ -180,8 +180,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="382"> <state relative-caret-position="249">
<caret line="198" column="16" lean-forward="false" selection-start-line="198" selection-start-column="16" selection-end-line="198" selection-end-column="16" /> <caret line="225" column="3" lean-forward="false" selection-start-line="225" selection-start-column="3" selection-end-line="225" selection-end-column="3" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -233,8 +233,8 @@ ...@@ -233,8 +233,8 @@
<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$/Application/Home/View/default/Index_index.tpl" /> <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/js/index.js" />
<option value="$PROJECT_DIR$/Public/static/css/main.scss" />
</list> </list>
</option> </option>
</component> </component>
...@@ -588,12 +588,12 @@ ...@@ -588,12 +588,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="47730000" /> <workItem from="1566667516612" duration="47912000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="47730000" /> <option name="totallyTimeSpent" value="47912000" />
</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" />
...@@ -825,21 +825,19 @@ ...@@ -825,21 +825,19 @@
</state> </state>
</provider> </provider>
</entry> </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"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="382"> <state relative-caret-position="238">
<caret line="198" column="16" lean-forward="false" selection-start-line="198" selection-start-column="16" selection-end-line="198" selection-end-column="16" /> <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 /> <folding />
</state> </state>
</provider> </provider>
</entry> </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"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238"> <state relative-caret-position="249">
<caret line="102" column="5" lean-forward="false" selection-start-line="102" selection-start-column="5" selection-end-line="105" selection-end-column="18" /> <caret line="225" column="3" lean-forward="false" selection-start-line="225" selection-start-column="3" selection-end-line="225" selection-end-column="3" />
<folding> <folding />
<marker date="1566923379000" expanded="true" signature="3349:3444" ph="{...}" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
......
...@@ -203,8 +203,8 @@ ul, li { ...@@ -203,8 +203,8 @@ ul, li {
.page-through .map-2 { .page-through .map-2 {
position: absolute; position: absolute;
display: inline-block; display: inline-block;
left: -76px; left: -35px;
top: 153px; top: 182px;
background: url("../images/2-2.png") left top; background: url("../images/2-2.png") left top;
width: 735px; width: 735px;
height: 876px; height: 876px;
...@@ -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: 37px; left: 65px;
top: 269px; top: 332px;
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: 123px; left: 147px;
top: 425px; top: 460px;
background: url("../images/2-4.png") left top; background: url("../images/2-4.png") left top;
width: 368px; width: 368px;
height: 357px; height: 357px;
......
...@@ -212,20 +212,20 @@ ul, li { ...@@ -212,20 +212,20 @@ ul, li {
} }
.map-2 { .map-2 {
@include image_bounds_by_pos("../images/2-2.png", -76px, 153px); @include image_bounds_by_pos("../images/2-2.png", -35px, 182px);
-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;
} }
.map-3 { .map-3 {
@include image_bounds_by_pos("../images/2-3.png", 37px, 269px); @include image_bounds_by_pos("../images/2-3.png", 65px, 332px);
-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", 123px, 425px); @include image_bounds_by_pos("../images/2-4.png", 147px, 460px);
-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