Commit edfd8771 by zhangheng

2

parent e457dc48
......@@ -2,8 +2,9 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="393705e8-a82c-4795-9b3b-5f911ddba9ac" name="Default" comment="">
<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$/.sass-cache/a99bcb3812225bbee2e3b2905f436d29891f981a/main.scssc" afterPath="$PROJECT_DIR$/.sass-cache/a99bcb3812225bbee2e3b2905f436d29891f981a/main.scssc" />
<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 +18,7 @@
</component>
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager">
<splitter split-orientation="horizontal" split-proportion="0.6903226">
<splitter split-orientation="horizontal" split-proportion="0.2812211">
<split-first>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
......@@ -129,8 +130,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="399">
<caret line="250" column="8" lean-forward="true" selection-start-line="250" selection-start-column="8" selection-end-line="250" selection-end-column="8" />
<state relative-caret-position="323">
<caret line="669" column="4" lean-forward="false" selection-start-line="669" selection-start-column="4" selection-end-line="669" selection-end-column="4" />
<folding />
</state>
</provider>
......@@ -184,9 +185,9 @@
<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/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$/Application/Home/View/default/Index_index.tpl" />
<option value="$PROJECT_DIR$/Public/static/css/main.scss" />
</list>
</option>
</component>
......@@ -546,12 +547,12 @@
<option name="presentableId" value="Default" />
<updated>1566667513502</updated>
<workItem from="1566667516612" duration="55749000" />
<workItem from="1567098016695" duration="999000" />
<workItem from="1567098016695" duration="1675000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="56748000" />
<option name="totallyTimeSpent" value="57424000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="817" extended-state="6" />
......@@ -562,20 +563,20 @@
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24689655" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.17517242" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24689655" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="npm" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Grunt " active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
</layout>
<layout-to-restore>
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
......@@ -822,14 +823,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="399">
<caret line="250" column="8" lean-forward="true" selection-start-line="250" selection-start-column="8" selection-end-line="250" selection-end-column="8" />
<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="494">
......@@ -849,5 +842,13 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="323">
<caret line="669" column="4" lean-forward="false" selection-start-line="669" selection-start-column="4" selection-end-line="669" selection-end-column="4" />
<folding />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
......@@ -581,7 +581,7 @@ ul, li {
background: url("../images/1.png") left top;
width: 267px;
height: 147px;
-webkit-animation: left 0.5s 1 linear;
-webkit-animation: left 1s 1 linear;
animation-fill-mode: forwards;
}
.page-lang .map-2 {
......@@ -593,7 +593,7 @@ ul, li {
background: url("../images/2.png") left top;
width: 486px;
height: 384px;
-webkit-animation: right 0.5s 1 linear;
-webkit-animation: right 1s 1 linear;
animation-fill-mode: forwards;
}
.page-lang .map-3 {
......@@ -605,7 +605,7 @@ ul, li {
background: url("../images/3.png") left top;
width: 396px;
height: 408px;
-webkit-animation: left 0.5s 1 linear;
-webkit-animation: left 1s 1 linear;
animation-fill-mode: forwards;
}
.page-lang .map-4 {
......@@ -617,7 +617,7 @@ ul, li {
background: url("../images/4.png") left top;
width: 367px;
height: 147px;
-webkit-animation: right 0.5s 1 linear;
-webkit-animation: right 1s 1 linear;
animation-fill-mode: forwards;
}
.page-lang .map-5 {
......@@ -629,7 +629,7 @@ ul, li {
background: url("../images/5.png") left top;
width: 294px;
height: 565px;
-webkit-animation: left 0.5s 1 linear;
-webkit-animation: left 1s 1 linear;
animation-fill-mode: forwards;
}
.page-lang .map-6 {
......@@ -641,7 +641,7 @@ ul, li {
background: url("../images/6.png") left top;
width: 344px;
height: 507px;
-webkit-animation: right 0.5s 1 linear;
-webkit-animation: right 1s 1 linear;
animation-fill-mode: forwards;
}
.page-lang .map-7 {
......@@ -653,7 +653,7 @@ ul, li {
background: url("../images/7.png") left top;
width: 478px;
height: 147px;
-webkit-animation: left 0.5s 1 linear;
-webkit-animation: left 1s 1 linear;
animation-fill-mode: forwards;
}
.page-lang .map-8 {
......@@ -665,7 +665,7 @@ ul, li {
background: url("../images/8.png") left top;
width: 461px;
height: 189px;
-webkit-animation: down 0.5s 1 linear;
-webkit-animation: down 1s 1 linear;
animation-fill-mode: forwards;
}
.page-lang .map-9 {
......@@ -677,7 +677,7 @@ ul, li {
background: url("../images/9.png") left top;
width: 355px;
height: 176px;
-webkit-animation: right 0.5s 1 linear;
-webkit-animation: right 1s 1 linear;
animation-fill-mode: forwards;
}
.page-lang .map-10 {
......@@ -700,7 +700,7 @@ ul, li {
background: url("../images/11.png") left top;
width: 394px;
height: 148px;
-webkit-animation: right 0.5s 1 linear;
-webkit-animation: right 1s 1 linear;
animation-fill-mode: forwards;
}
.page-lang .map-12 {
......@@ -724,7 +724,7 @@ ul, li {
background: url("../images/13.png") left top;
width: 486px;
height: 172px;
-webkit-animation: right 0.5s 1 linear;
-webkit-animation: right 1s 1 linear;
animation-fill-mode: forwards;
}
.page-lang .map-14 {
......@@ -736,7 +736,7 @@ ul, li {
background: url("../images/14.png") left top;
width: 454px;
height: 160px;
-webkit-animation: down 0.5s 1 linear;
-webkit-animation: down 1s 1 linear;
animation-fill-mode: forwards;
}
.page-lang .map-18 {
......@@ -748,7 +748,7 @@ ul, li {
background: url("../images/18.png") left top;
width: 427px;
height: 147px;
-webkit-animation: right 0.5s 1 linear;
-webkit-animation: right 1s 1 linear;
animation-fill-mode: forwards;
}
.page-lang .map-16 {
......@@ -760,7 +760,7 @@ ul, li {
background: url("../images/16.png") left top;
width: 315px;
height: 147px;
-webkit-animation: left 0.5s 1 linear;
-webkit-animation: left 1s 1 linear;
animation-fill-mode: forwards;
}
.page-lang .map-17 {
......@@ -772,7 +772,7 @@ ul, li {
background: url("../images/17.png") left top;
width: 528px;
height: 484px;
-webkit-animation: down 0.5s 1 linear;
-webkit-animation: down 1s 1 linear;
animation-fill-mode: forwards;
}
.page-lang .map-19 {
......@@ -784,7 +784,7 @@ ul, li {
background: url("../images/19.png") left top;
width: 548px;
height: 304px;
-webkit-animation: left 0.5s 1 linear;
-webkit-animation: left 1s 1 linear;
animation-fill-mode: forwards;
}
.page-lang .map-20 {
......@@ -796,7 +796,7 @@ ul, li {
background: url("../images/20.png") left top;
width: 520px;
height: 419px;
-webkit-animation: down 0.5s 1 linear;
-webkit-animation: down 1s 1 linear;
animation-fill-mode: forwards;
}
.page-lang .map-21 {
......@@ -808,7 +808,7 @@ ul, li {
background: url("../images/21.png") left top;
width: 267px;
height: 147px;
-webkit-animation: left 0.5s 1 linear;
-webkit-animation: left 1s 1 linear;
animation-fill-mode: forwards;
}
.page-lang .map-22 {
......@@ -820,7 +820,7 @@ ul, li {
background: url("../images/22.png") left top;
width: 103px;
height: 411px;
-webkit-animation: top 0.5s 1 linear;
-webkit-animation: top 1s 1 linear;
animation-fill-mode: forwards;
}
.page-lang .map-23 {
......@@ -832,7 +832,7 @@ ul, li {
background: url("../images/23.png") left top;
width: 517px;
height: 364px;
-webkit-animation: left 0.5s 1 linear;
-webkit-animation: left 1s 1 linear;
animation-fill-mode: forwards;
}
.page-lang .map-24 {
......@@ -844,7 +844,7 @@ ul, li {
background: url("../images/24.png") left top;
width: 259px;
height: 148px;
-webkit-animation: right 0.5s 1 linear;
-webkit-animation: right 1s 1 linear;
animation-fill-mode: forwards;
}
.page-lang .map-25 {
......@@ -856,7 +856,7 @@ ul, li {
background: url("../images/25.png") left top;
width: 371px;
height: 255px;
-webkit-animation: left 0.5s 1 linear;
-webkit-animation: left 1s 1 linear;
animation-fill-mode: forwards;
}
.page-lang .map-26 {
......@@ -868,7 +868,7 @@ ul, li {
background: url("../images/26.png") left top;
width: 470px;
height: 186px;
-webkit-animation: top 0.5s 1 linear;
-webkit-animation: top 1s 1 linear;
animation-fill-mode: forwards;
}
.page-lang .map-27 {
......@@ -880,7 +880,7 @@ ul, li {
background: url("../images/27.png") left top;
width: 598px;
height: 435px;
-webkit-animation: top 0.5s 1 linear;
-webkit-animation: top 1s 1 linear;
animation-fill-mode: forwards;
}
.page-lang .map-28 {
......@@ -891,7 +891,7 @@ ul, li {
background: url("../images/28.png") left top;
width: 271px;
height: 388px;
-webkit-animation: height 0.5s 1 linear;
-webkit-animation: height 1s 1 linear;
animation-fill-mode: forwards;
}
.page-lang .map-29 {
......@@ -903,7 +903,7 @@ ul, li {
background: url("../images/btn-1.png") left top;
width: 268px;
height: 126px;
-webkit-animation: down 0.5s 1 linear;
-webkit-animation: down 1s 1 linear;
animation-fill-mode: forwards;
}
.page-lang .map-30 {
......@@ -915,7 +915,7 @@ ul, li {
background: url("../images/word-two.png") left top;
width: 247px;
height: 24px;
-webkit-animation: down 0.5s 1 linear;
-webkit-animation: down 1s 1 linear;
animation-fill-mode: forwards;
}
......
......@@ -501,56 +501,56 @@ ul, li {
.map-1 {
opacity: 0;
@include image_bounds_by_pos("../images/1.png", 71px, 1222px);
-webkit-animation: left 0.5s 1 linear;
-webkit-animation: left 1s 1 linear;
animation-fill-mode: forwards
}
.map-2 {
opacity: 0;
@include image_bounds_by_pos("../images/2.png", 116px, 1466px);
-webkit-animation: right 0.5s 1 linear;
-webkit-animation: right 1s 1 linear;
animation-fill-mode: forwards
}
.map-3 {
opacity: 0;
@include image_bounds_by_pos("../images/3.png", 39px, 1725px);
-webkit-animation: left 0.5s 1 linear;
-webkit-animation: left 1s 1 linear;
animation-fill-mode: forwards
}
.map-4 {
opacity: 0;
@include image_bounds_by_pos("../images/4.png", 215px, 2258px);
-webkit-animation: right 0.5s 1 linear;
-webkit-animation: right 1s 1 linear;
animation-fill-mode: forwards
}
.map-5 {
opacity: 0;
@include image_bounds_by_pos("../images/5.png", 57px, 2468px);
-webkit-animation: left 0.5s 1 linear;
-webkit-animation: left 1s 1 linear;
animation-fill-mode: forwards
}
.map-6 {
opacity: 0;
@include image_bounds_by_pos("../images/6.png", 242px, 2522px);
-webkit-animation: right 0.5s 1 linear;
-webkit-animation: right 1s 1 linear;
animation-fill-mode: forwards
}
.map-7 {
opacity: 0;
@include image_bounds_by_pos("../images/7.png", 69px, 3233px);
-webkit-animation: left 0.5s 1 linear;
-webkit-animation: left 1s 1 linear;
animation-fill-mode: forwards
}
.map-8 {
opacity: 0;
@include image_bounds_by_pos("../images/8.png", 99px, 3439px);
-webkit-animation: down 0.5s 1 linear;
-webkit-animation: down 1s 1 linear;
animation-fill-mode: forwards
}
.map-9 {
opacity: 0;
@include image_bounds_by_pos("../images/9.png", 117px, 3672px);
-webkit-animation: right 0.5s 1 linear;
-webkit-animation: right 1s 1 linear;
animation-fill-mode: forwards
}
.map-10 {
......@@ -561,7 +561,7 @@ ul, li {
.map-11 {
opacity: 0;
@include image_bounds_by_pos("../images/11.png", 185px, 4302px);
-webkit-animation: right 0.5s 1 linear;
-webkit-animation: right 1s 1 linear;
animation-fill-mode: forwards
}
.map-12 {
......@@ -573,104 +573,104 @@ ul, li {
.map-13 {
opacity: 0;
@include image_bounds_by_pos("../images/13.png", 70px, 4674px);
-webkit-animation: right 0.5s 1 linear;
-webkit-animation: right 1s 1 linear;
animation-fill-mode: forwards
}
.map-14 {
opacity: 0;
@include image_bounds_by_pos("../images/14.png", 105px, 4876px);
-webkit-animation: down 0.5s 1 linear;
-webkit-animation: down 1s 1 linear;
animation-fill-mode: forwards
}
.map-18 {
opacity: 0;
@include image_bounds_by_pos("../images/18.png", 149px, 6170px);
-webkit-animation: right 0.5s 1 linear;
-webkit-animation: right 1s 1 linear;
animation-fill-mode: forwards
}
.map-16 {
opacity: 0;
@include image_bounds_by_pos("../images/16.png", 65px, 5227px);
-webkit-animation: left 0.5s 1 linear;
-webkit-animation: left 1s 1 linear;
animation-fill-mode: forwards
}
.map-17 {
opacity: 0;
@include image_bounds_by_pos("../images/17.png", 70px, 5474px);
-webkit-animation: down 0.5s 1 linear;
-webkit-animation: down 1s 1 linear;
animation-fill-mode: forwards
}
.map-19 {
opacity: 0;
@include image_bounds_by_pos("../images/19.png", 39px, 6361px);
-webkit-animation: left 0.5s 1 linear;
-webkit-animation: left 1s 1 linear;
animation-fill-mode: forwards
}
.map-20 {
opacity: 0;
@include image_bounds_by_pos("../images/20.png", 70px, 6691px);
-webkit-animation: down 0.5s 1 linear;
-webkit-animation: down 1s 1 linear;
animation-fill-mode: forwards
}
.map-21 {
opacity: 0;
@include image_bounds_by_pos("../images/21.png", 74px, 7268px);
-webkit-animation: left 0.5s 1 linear;
-webkit-animation: left 1s 1 linear;
animation-fill-mode: forwards
}
.map-22 {
opacity: 0;
@include image_bounds_by_pos("../images/22.png", 463px, 7239px);
-webkit-animation: top 0.5s 1 linear;
-webkit-animation: top 1s 1 linear;
animation-fill-mode: forwards
}
.map-23 {
opacity: 0;
@include image_bounds_by_pos("../images/23.png", 54px, 7557px);
-webkit-animation: left 0.5s 1 linear;
-webkit-animation: left 1s 1 linear;
animation-fill-mode: forwards
}
.map-24 {
opacity: 0;
@include image_bounds_by_pos("../images/24.png", 319px, 8096px);
-webkit-animation: right 0.5s 1 linear;
-webkit-animation: right 1s 1 linear;
animation-fill-mode: forwards
}
.map-25 {
opacity: 0;
@include image_bounds_by_pos("../images/25.png", 35px, 8215px);
-webkit-animation: left 0.5s 1 linear;
-webkit-animation: left 1s 1 linear;
animation-fill-mode: forwards
}
.map-26 {
opacity: 0;
@include image_bounds_by_pos("../images/26.png", 85px, 8481px);
-webkit-animation: top 0.5s 1 linear;
-webkit-animation: top 1s 1 linear;
animation-fill-mode: forwards
}
.map-27 {
opacity: 0;
@include image_bounds_by_pos("../images/27.png", 20px, 8693px);
-webkit-animation: top 0.5s 1 linear;
-webkit-animation: top 1s 1 linear;
animation-fill-mode: forwards
}
.map-28 {
@include image_bounds_by_pos("../images/28.png", 193px, 9317px);
-webkit-animation: height 0.5s 1 linear;
-webkit-animation: height 1s 1 linear;
animation-fill-mode: forwards
}
.map-29 {
opacity: 0;
@include image_bounds_by_pos("../images/btn-1.png", 200px, 9855px);
-webkit-animation: down 0.5s 1 linear;
-webkit-animation: down 1s 1 linear;
animation-fill-mode: forwards
}
.map-30 {
opacity: 0;
@include image_bounds_by_pos("../images/word-two.png", 214px, 10017px);
-webkit-animation: down 0.5s 1 linear;
-webkit-animation: down 1s 1 linear;
animation-fill-mode: 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