Commit fcd0de9c by zhangheng

j

parent 75677f7d
......@@ -2,7 +2,10 @@
<project version="4">
<component name="ChangeListManager">
<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$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<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" />
......@@ -16,7 +19,7 @@
</component>
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager">
<splitter split-orientation="horizontal" split-proportion="0.41092438">
<splitter split-orientation="horizontal" split-proportion="0.53781515">
<split-first>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
......@@ -32,9 +35,11 @@
<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">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="369">
<caret line="50" column="5" lean-forward="false" selection-start-line="50" selection-start-column="5" selection-end-line="50" selection-end-column="5" />
<folding />
<state relative-caret-position="141">
<caret line="55" column="25" lean-forward="false" selection-start-line="55" selection-start-column="20" selection-end-line="55" selection-end-column="25" />
<folding>
<element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
......@@ -119,7 +124,7 @@
<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" />
<folding>
<marker date="1563378109000" expanded="true" signature="4592:4710" ph="{...}" />
<marker date="1563378648000" expanded="true" signature="4724:4842" ph="{...}" />
</folding>
</state>
</provider>
......@@ -132,8 +137,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="331">
<caret line="197" column="55" lean-forward="false" selection-start-line="197" selection-start-column="55" selection-end-line="197" selection-end-column="55" />
<state relative-caret-position="255">
<caret line="210" column="20" lean-forward="true" selection-start-line="210" selection-start-column="20" selection-end-line="210" selection-end-column="20" />
<folding />
</state>
</provider>
......@@ -175,9 +180,9 @@
<option value="$PROJECT_DIR$/Application/User/Controller/CheckController.class.php" />
<option value="$PROJECT_DIR$/Application/User/Controller/ReportController.class.php" />
<option value="$PROJECT_DIR$/Application/Home/Controller/IndexController.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>
......@@ -595,12 +600,12 @@
<workItem from="1563354519051" duration="69000" />
<workItem from="1563355155211" duration="115000" />
<workItem from="1563355311998" duration="122000" />
<workItem from="1563377354829" duration="713000" />
<workItem from="1563377354829" duration="1041000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="16561000" />
<option name="totallyTimeSpent" value="16889000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="815" extended-state="6" />
......@@ -666,7 +671,9 @@
<provider selected="true" editor-type-id="text-editor">
<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" />
<folding />
<folding>
<element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
......@@ -710,9 +717,7 @@
<provider selected="true" editor-type-id="text-editor">
<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" />
<folding>
<marker date="1563378109000" expanded="true" signature="4592:4710" ph="{...}" />
</folding>
<folding />
</state>
</provider>
</entry>
......@@ -744,7 +749,9 @@
<provider selected="true" editor-type-id="text-editor">
<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" />
<folding />
<folding>
<element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
......@@ -760,9 +767,7 @@
<provider selected="true" editor-type-id="text-editor">
<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" />
<folding>
<marker date="1563378109000" expanded="true" signature="4592:4710" ph="{...}" />
</folding>
<folding />
</state>
</provider>
</entry>
......@@ -804,7 +809,9 @@
<provider selected="true" editor-type-id="text-editor">
<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" />
<folding />
<folding>
<element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
......@@ -852,9 +859,7 @@
<provider selected="true" editor-type-id="text-editor">
<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" />
<folding>
<marker date="1563378109000" expanded="true" signature="4592:4710" ph="{...}" />
</folding>
<folding />
</state>
</provider>
</entry>
......@@ -886,7 +891,9 @@
<provider selected="true" editor-type-id="text-editor">
<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" />
<folding />
<folding>
<element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
......@@ -912,9 +919,7 @@
<provider selected="true" editor-type-id="text-editor">
<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" />
<folding>
<marker date="1563378109000" expanded="true" signature="4592:4710" ph="{...}" />
</folding>
<folding />
</state>
</provider>
</entry>
......@@ -1041,16 +1046,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="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" />
<folding>
<marker date="1563378109000" expanded="true" signature="4592:4710" ph="{...}" />
</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="266">
......@@ -1061,8 +1056,18 @@
</entry>
<entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="369">
<caret line="50" column="5" lean-forward="false" selection-start-line="50" selection-start-column="5" selection-end-line="50" selection-end-column="5" />
<state relative-caret-position="141">
<caret line="55" column="25" lean-forward="false" selection-start-line="55" selection-start-column="20" selection-end-line="55" selection-end-column="25" />
<folding>
<element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</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="255">
<caret line="210" column="20" lean-forward="true" selection-start-line="210" selection-start-column="20" selection-end-line="210" selection-end-column="20" />
<folding />
</state>
</provider>
......
......@@ -178,17 +178,23 @@ ul, li {
height: 1238px;
}
#container .btn-prize {
background: url("../images/btn-prize.png") no-repeat center;
position: absolute;
top: 420px;
left: 182px;
justify-content: center;
width: 200px;
height: 200px;
align-items: flex-end;
width: 250px;
height: 250px;
font-size: 27px;
border: 1px solid red;
}
#container .prize-type {
position: absolute;
width: 300px;
height: 300px;
opacity: 0;
width: 250px;
height: 250px;
/* opacity: 0; */
top: 420px;
left: 182px;
}
#container .word {
font-size: 40px;
......
......@@ -199,19 +199,24 @@ ul, li {
width: torem(640px);
height: torem(1238px);
.btn-prize {
background: url("../images/btn-prize.png") no-repeat center;
position: absolute;
top: 420px;
left: 182px;
@extend .flex;
justify-content: center;
width: torem(200px);
height: torem(200px);
align-items: flex-end;
width: 250px;
height: 250px;
font-size: 27px;
border: 1px solid red;
}
.prize-type {
position: absolute;
width: torem(300px);
height: torem(300px);
opacity: 0;
width: 250px;
height: 250px;
/* opacity: 0; */
top: 420px;
left: 182px;
//.bounceInDown {
// -webkit-animation: bounceInDown 1s ease 0s 1;
// @include animate_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