Commit 69646f3e by zhangheng

j

parent 9b1d6905
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
<list default="true" id="83262c17-7030-4f8f-af17-e1cc55f76944" name="Default" comment=""> <list default="true" id="83262c17-7030-4f8f-af17-e1cc55f76944" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.sass-cache/0adc96cee11bc739fc2ea1eeea463a9ab946286f/main.scssc" afterPath="$PROJECT_DIR$/.sass-cache/0adc96cee11bc739fc2ea1eeea463a9ab946286f/main.scssc" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.sass-cache/0adc96cee11bc739fc2ea1eeea463a9ab946286f/main.scssc" afterPath="$PROJECT_DIR$/.sass-cache/0adc96cee11bc739fc2ea1eeea463a9ab946286f/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$/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/css/main.css" afterPath="$PROJECT_DIR$/Public/static/css/main.css" /> <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" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/css/main.scss" afterPath="$PROJECT_DIR$/Public/static/css/main.scss" />
</list> </list>
...@@ -35,9 +36,11 @@ ...@@ -35,9 +36,11 @@
<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="152"> <state relative-caret-position="133">
<caret line="53" column="0" lean-forward="false" selection-start-line="53" selection-start-column="0" selection-end-line="53" selection-end-column="0" /> <caret line="43" column="13" lean-forward="true" selection-start-line="43" selection-start-column="13" selection-end-line="43" selection-end-column="13" />
<folding /> <folding>
<element signature="n#style#0;n#img#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -55,7 +58,7 @@ ...@@ -55,7 +58,7 @@
<file leaf-file-name="IndexController.class.php" pinned="false" current-in-tab="false"> <file leaf-file-name="IndexController.class.php" pinned="false" current-in-tab="false">
<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="266"> <state relative-caret-position="171">
<caret line="14" column="48" lean-forward="false" selection-start-line="14" selection-start-column="48" selection-end-line="14" selection-end-column="48" /> <caret line="14" column="48" lean-forward="false" selection-start-line="14" selection-start-column="48" selection-end-line="14" selection-end-column="48" />
<folding> <folding>
<element signature="e#34#44#0#PHP" expanded="true" /> <element signature="e#34#44#0#PHP" expanded="true" />
...@@ -121,10 +124,7 @@ ...@@ -121,10 +124,7 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3306"> <state relative-caret-position="3306">
<caret line="174" column="21" lean-forward="false" selection-start-line="174" selection-start-column="21" selection-end-line="174" selection-end-column="21" /> <caret line="174" column="21" lean-forward="false" selection-start-line="174" selection-start-column="21" selection-end-line="174" selection-end-column="21" />
<folding> <folding />
<marker date="1563355204000" expanded="true" signature="4169:4749" ph="{...}" />
<marker date="1563355204000" expanded="true" signature="4550:4713" ph="{...}" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -136,12 +136,9 @@ ...@@ -136,12 +136,9 @@
<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="221"> <state relative-caret-position="278">
<caret line="211" column="3" lean-forward="false" selection-start-line="211" selection-start-column="3" selection-end-line="211" selection-end-column="3" /> <caret line="251" column="8" lean-forward="false" selection-start-line="251" selection-start-column="8" selection-end-line="251" selection-end-column="8" />
<folding> <folding />
<marker date="1563355204000" expanded="true" signature="4169:4749" ph="{...}" />
<marker date="1563355204000" expanded="true" signature="4550:4713" ph="{...}" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -183,8 +180,8 @@ ...@@ -183,8 +180,8 @@
<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/js/index.js" /> <option value="$PROJECT_DIR$/Public/static/js/index.js" />
<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/Home/View/default/Index_index.tpl" />
<option value="$PROJECT_DIR$/Public/static/css/main.scss" /> <option value="$PROJECT_DIR$/Public/static/css/main.scss" />
<option value="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" />
</list> </list>
</option> </option>
</component> </component>
...@@ -215,6 +212,7 @@ ...@@ -215,6 +212,7 @@
<foldersAlwaysOnTop value="true" /> <foldersAlwaysOnTop value="true" />
</navigator> </navigator>
<panes> <panes>
<pane id="Scratches" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<PATH> <PATH>
...@@ -511,7 +509,6 @@ ...@@ -511,7 +509,6 @@
</PATH> </PATH>
</subPane> </subPane>
</pane> </pane>
<pane id="Scratches" />
<pane id="Scope" /> <pane id="Scope" />
</panes> </panes>
</component> </component>
...@@ -600,18 +597,19 @@ ...@@ -600,18 +597,19 @@
<workItem from="1563290476531" duration="770000" /> <workItem from="1563290476531" duration="770000" />
<workItem from="1563354420088" duration="21000" /> <workItem from="1563354420088" duration="21000" />
<workItem from="1563354519051" duration="69000" /> <workItem from="1563354519051" duration="69000" />
<workItem from="1563355155211" duration="50000" /> <workItem from="1563355155211" duration="115000" />
<workItem from="1563355311998" duration="51000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="15661000" /> <option name="totallyTimeSpent" value="15777000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="821" extended-state="6" /> <frame x="0" y="23" width="1440" height="821" extended-state="6" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.21530758" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.21816881" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<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" /> <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" />
<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="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="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" />
...@@ -671,7 +669,9 @@ ...@@ -671,7 +669,9 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1064"> <state relative-caret-position="1064">
<caret line="56" column="0" lean-forward="false" selection-start-line="56" selection-start-column="0" selection-end-line="56" selection-end-column="0" /> <caret line="56" column="0" lean-forward="false" selection-start-line="56" selection-start-column="0" selection-end-line="56" selection-end-column="0" />
<folding /> <folding>
<element signature="n#style#0;n#img#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -715,10 +715,7 @@ ...@@ -715,10 +715,7 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="4047"> <state relative-caret-position="4047">
<caret line="213" column="13" lean-forward="true" selection-start-line="213" selection-start-column="13" selection-end-line="213" selection-end-column="13" /> <caret line="213" column="13" lean-forward="true" selection-start-line="213" selection-start-column="13" selection-end-line="213" selection-end-column="13" />
<folding> <folding />
<marker date="1563355204000" expanded="true" signature="4169:4749" ph="{...}" />
<marker date="1563355204000" expanded="true" signature="4550:4713" ph="{...}" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -750,7 +747,9 @@ ...@@ -750,7 +747,9 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1064"> <state relative-caret-position="1064">
<caret line="56" column="0" lean-forward="false" selection-start-line="56" selection-start-column="0" selection-end-line="56" selection-end-column="0" /> <caret line="56" column="0" lean-forward="false" selection-start-line="56" selection-start-column="0" selection-end-line="56" selection-end-column="0" />
<folding /> <folding>
<element signature="n#style#0;n#img#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -766,10 +765,7 @@ ...@@ -766,10 +765,7 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3306"> <state relative-caret-position="3306">
<caret line="174" column="21" lean-forward="false" selection-start-line="174" selection-start-column="21" selection-end-line="174" selection-end-column="21" /> <caret line="174" column="21" lean-forward="false" selection-start-line="174" selection-start-column="21" selection-end-line="174" selection-end-column="21" />
<folding> <folding />
<marker date="1563355204000" expanded="true" signature="4169:4749" ph="{...}" />
<marker date="1563355204000" expanded="true" signature="4550:4713" ph="{...}" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -811,7 +807,9 @@ ...@@ -811,7 +807,9 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1064"> <state relative-caret-position="1064">
<caret line="56" column="0" lean-forward="false" selection-start-line="56" selection-start-column="0" selection-end-line="56" selection-end-column="0" /> <caret line="56" column="0" lean-forward="false" selection-start-line="56" selection-start-column="0" selection-end-line="56" selection-end-column="0" />
<folding /> <folding>
<element signature="n#style#0;n#img#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -859,10 +857,7 @@ ...@@ -859,10 +857,7 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3306"> <state relative-caret-position="3306">
<caret line="174" column="21" lean-forward="false" selection-start-line="174" selection-start-column="21" selection-end-line="174" selection-end-column="21" /> <caret line="174" column="21" lean-forward="false" selection-start-line="174" selection-start-column="21" selection-end-line="174" selection-end-column="21" />
<folding> <folding />
<marker date="1563355204000" expanded="true" signature="4169:4749" ph="{...}" />
<marker date="1563355204000" expanded="true" signature="4550:4713" ph="{...}" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -894,7 +889,9 @@ ...@@ -894,7 +889,9 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1007"> <state relative-caret-position="1007">
<caret line="53" column="37" lean-forward="true" selection-start-line="53" selection-start-column="37" selection-end-line="53" selection-end-column="37" /> <caret line="53" column="37" lean-forward="true" selection-start-line="53" selection-start-column="37" selection-end-line="53" selection-end-column="37" />
<folding /> <folding>
<element signature="n#style#0;n#img#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -920,10 +917,7 @@ ...@@ -920,10 +917,7 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3306"> <state relative-caret-position="3306">
<caret line="174" column="21" lean-forward="false" selection-start-line="174" selection-start-column="21" selection-end-line="174" selection-end-column="21" /> <caret line="174" column="21" lean-forward="false" selection-start-line="174" selection-start-column="21" selection-end-line="174" selection-end-column="21" />
<folding> <folding />
<marker date="1563355204000" expanded="true" signature="4169:4749" ph="{...}" />
<marker date="1563355204000" expanded="true" signature="4550:4713" ph="{...}" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -1050,7 +1044,7 @@ ...@@ -1050,7 +1044,7 @@
</entry> </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="266"> <state relative-caret-position="171">
<caret line="14" column="48" lean-forward="false" selection-start-line="14" selection-start-column="48" selection-end-line="14" selection-end-column="48" /> <caret line="14" column="48" lean-forward="false" selection-start-line="14" selection-start-column="48" selection-end-line="14" selection-end-column="48" />
<folding> <folding>
<element signature="e#34#44#0#PHP" expanded="true" /> <element signature="e#34#44#0#PHP" expanded="true" />
...@@ -1060,20 +1054,19 @@ ...@@ -1060,20 +1054,19 @@
</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="221"> <state relative-caret-position="3306">
<caret line="211" column="3" lean-forward="false" selection-start-line="211" selection-start-column="3" selection-end-line="211" selection-end-column="3" /> <caret line="174" column="21" lean-forward="false" selection-start-line="174" selection-start-column="21" selection-end-line="174" selection-end-column="21" />
<folding> <folding />
<marker date="1563355204000" expanded="true" signature="4169:4749" ph="{...}" />
<marker date="1563355204000" expanded="true" signature="4550:4713" ph="{...}" />
</folding>
</state> </state>
</provider> </provider>
</entry> </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="152"> <state relative-caret-position="133">
<caret line="53" column="0" lean-forward="false" selection-start-line="53" selection-start-column="0" selection-end-line="53" selection-end-column="0" /> <caret line="43" column="13" lean-forward="true" selection-start-line="43" selection-start-column="13" selection-end-line="43" selection-end-column="13" />
<folding /> <folding>
<element signature="n#style#0;n#img#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
// })(document, window); // })(document, window);
</script> </script>
<title>谁是桃源幸运锦鲤</title> <title>谁是桃源幸运锦鲤</title>
<link href="__CDN__/css/main.css?t=1.92" rel="stylesheet"> <link href="__CDN__/css/main.css?t=1.93" rel="stylesheet">
<style> <style>
</style> </style>
......
...@@ -192,8 +192,10 @@ ul, li { ...@@ -192,8 +192,10 @@ ul, li {
opacity: 0; opacity: 0;
} }
#container .prize-type .bounceInDown { #container .prize-type .bounceInDown {
-webkit-animation-name: bounceInDown; -webkit-animation: bounceInDown 1s ease 0s 1;
animation-name: bounceInDown; -webkit-animation-fill-mode: forwards;
animation-fill-mode: forwards;
opacity: 0;
} }
#container .word { #container .word {
font-size: 40px; font-size: 40px;
...@@ -215,10 +217,12 @@ ul, li { ...@@ -215,10 +217,12 @@ ul, li {
transform: translate3d(0, 25px, 0); transform: translate3d(0, 25px, 0);
} }
75% { 75% {
opacity: 1;
-webkit-transform: translate3d(0, -10px, 0); -webkit-transform: translate3d(0, -10px, 0);
transform: translate3d(0, -10px, 0); transform: translate3d(0, -10px, 0);
} }
90% { 90% {
opacity: 1;
-webkit-transform: translate3d(0, 5px, 0); -webkit-transform: translate3d(0, 5px, 0);
transform: translate3d(0, 5px, 0); transform: translate3d(0, 5px, 0);
} }
......
...@@ -215,8 +215,9 @@ flex-direction: column-reverse; ...@@ -215,8 +215,9 @@ flex-direction: column-reverse;
height: 300px; height: 300px;
opacity: 0; opacity: 0;
.bounceInDown { .bounceInDown {
-webkit-animation-name: bounceInDown; -webkit-animation: bounceInDown 1s ease 0s 1;
animation-name: bounceInDown @include animate_forwards;
opacity: 0;
} }
} }
.word{ .word{
...@@ -239,10 +240,12 @@ flex-direction: column-reverse; ...@@ -239,10 +240,12 @@ flex-direction: column-reverse;
transform: translate3d(0, 25px, 0) transform: translate3d(0, 25px, 0)
} }
75% { 75% {
opacity: 1;
-webkit-transform: translate3d(0, -10px, 0); -webkit-transform: translate3d(0, -10px, 0);
transform: translate3d(0, -10px, 0) transform: translate3d(0, -10px, 0)
} }
90% { 90% {
opacity: 1;
-webkit-transform: translate3d(0, 5px, 0); -webkit-transform: translate3d(0, 5px, 0);
transform: translate3d(0, 5px, 0) transform: translate3d(0, 5px, 0)
} }
......
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