Commit 47caac5f by zhangheng

1

parent 47e95969
...@@ -2,9 +2,10 @@ ...@@ -2,9 +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$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <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$/Application/Home/View/default/Index_index.tpl" afterPath="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" afterPath="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" />
<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" />
...@@ -83,8 +84,8 @@ ...@@ -83,8 +84,8 @@
<file leaf-file-name="Index_index.tpl" pinned="false" current-in-tab="true"> <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="133"> <state relative-caret-position="266">
<caret line="279" column="60" lean-forward="false" selection-start-line="279" selection-start-column="60" selection-end-line="279" selection-end-column="60" /> <caret line="202" column="12" lean-forward="false" selection-start-line="202" selection-start-column="12" selection-end-line="202" selection-end-column="12" />
<folding> <folding>
<element signature="n#style#0;n#div#6;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#6;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding> </folding>
...@@ -121,8 +122,8 @@ ...@@ -121,8 +122,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="361"> <state relative-caret-position="437">
<caret line="371" column="15" lean-forward="false" selection-start-line="371" selection-start-column="15" selection-end-line="371" selection-end-column="15" /> <caret line="375" column="4" lean-forward="false" selection-start-line="375" selection-start-column="4" selection-end-line="375" selection-end-column="4" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -180,8 +181,8 @@ ...@@ -180,8 +181,8 @@
<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$/Public/static/js/index.js" /> <option value="$PROJECT_DIR$/Public/static/js/index.js" />
<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" />
</list> </list>
</option> </option>
...@@ -543,12 +544,12 @@ ...@@ -543,12 +544,12 @@
<updated>1566667513502</updated> <updated>1566667513502</updated>
<workItem from="1566667516612" duration="55749000" /> <workItem from="1566667516612" duration="55749000" />
<workItem from="1567098016695" duration="6433000" /> <workItem from="1567098016695" duration="6433000" />
<workItem from="1567181764126" duration="591000" /> <workItem from="1567181764126" duration="631000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="62773000" /> <option name="totallyTimeSpent" value="62813000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="815" extended-state="6" /> <frame x="0" y="23" width="1440" height="815" extended-state="6" />
...@@ -903,14 +904,6 @@ ...@@ -903,14 +904,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="361">
<caret line="371" column="15" lean-forward="false" selection-start-line="371" selection-start-column="15" selection-end-line="371" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php"> <entry file="file://$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="589"> <state relative-caret-position="589">
...@@ -929,10 +922,18 @@ ...@@ -929,10 +922,18 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="437">
<caret line="375" column="4" lean-forward="false" selection-start-line="375" selection-start-column="4" selection-end-line="375" selection-end-column="4" />
<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="133"> <state relative-caret-position="266">
<caret line="279" column="60" lean-forward="false" selection-start-line="279" selection-start-column="60" selection-end-line="279" selection-end-column="60" /> <caret line="202" column="12" lean-forward="false" selection-start-line="202" selection-start-column="12" selection-end-line="202" selection-end-column="12" />
<folding> <folding>
<element signature="n#style#0;n#div#6;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#6;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding> </folding>
......
...@@ -200,6 +200,7 @@ ...@@ -200,6 +200,7 @@
<div class="page-s-c" style="display: none"> <div class="page-s-c" style="display: none">
<div class="zhou m-b-zhou-sate"></div> <div class="zhou m-b-zhou-sate"></div>
<div class="c-d m-b-sate"></div> <div class="c-d m-b-sate"></div>
<img class="b-j-two" src="__CDN__/images/bj-two.jpg"> <img class="b-j-two" src="__CDN__/images/bj-two.jpg">
<img class="h-b" src=""> <img class="h-b" src="">
<img class="btn-s" src="__CDN__/images/f-h.png"> <img class="btn-s" src="__CDN__/images/f-h.png">
......
...@@ -417,6 +417,9 @@ ul, li { ...@@ -417,6 +417,9 @@ ul, li {
width: 599px; width: 599px;
height: 1091px; height: 1091px;
} }
.page-s-c .h-b {
position: absolute;
}
.page-s-c .btn-s { .page-s-c .btn-s {
position: absolute; position: absolute;
display: inline-block; display: inline-block;
...@@ -589,7 +592,7 @@ ul, li { ...@@ -589,7 +592,7 @@ ul, li {
background: url("../images/1.png") left top; background: url("../images/1.png") left top;
width: 267px; width: 267px;
height: 147px; height: 147px;
-webkit-animation: left 0.5s linear 1; -webkit-animation: left 0.5s linear 1;
animation-fill-mode: forwards; animation-fill-mode: forwards;
} }
.page-lang .map-2 { .page-lang .map-2 {
...@@ -601,7 +604,7 @@ ul, li { ...@@ -601,7 +604,7 @@ ul, li {
background: url("../images/2.png") left top; background: url("../images/2.png") left top;
width: 486px; width: 486px;
height: 384px; height: 384px;
-webkit-animation: right 0.5s linear 1; -webkit-animation: right 0.5s linear 1;
animation-fill-mode: forwards; animation-fill-mode: forwards;
} }
.page-lang .map-3 { .page-lang .map-3 {
...@@ -732,7 +735,7 @@ ul, li { ...@@ -732,7 +735,7 @@ ul, li {
background: url("../images/35.png") left top; background: url("../images/35.png") left top;
width: 225px; width: 225px;
height: 196px; height: 196px;
-webkit-animation: right 1.5s 1 linear 1s; -webkit-animation: right 1.5s 1 linear 1s;
animation-fill-mode: forwards; animation-fill-mode: forwards;
} }
.page-lang .map-13 { .page-lang .map-13 {
......
...@@ -371,6 +371,10 @@ ul, li { ...@@ -371,6 +371,10 @@ ul, li {
width: 599px; width: 599px;
height: 1091px; height: 1091px;
} }
.h-b{
position: absolute;
}
.btn-s { .btn-s {
@include image_bounds_by_pos("../images/f-h.png", 41px, 98px); @include image_bounds_by_pos("../images/f-h.png", 41px, 98px);
......
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