Commit 0bb5572e by zhangheng

j

parent ed5cf8c5
......@@ -2,9 +2,7 @@
<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$/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.scss" afterPath="$PROJECT_DIR$/Public/static/css/main.scss" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
......@@ -19,7 +17,7 @@
</component>
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager">
<splitter split-orientation="horizontal" split-proportion="0.6134454">
<splitter split-orientation="horizontal" split-proportion="0.20420168">
<split-first>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
......@@ -37,13 +35,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="38">
<caret line="26" column="7" lean-forward="false" selection-start-line="26" selection-start-column="7" selection-end-line="42" selection-end-column="37" />
<folding>
<marker date="1563377844000" expanded="true" signature="769:1271" ph="{...}" />
<marker date="1563377844000" expanded="true" signature="855:1126" ph="{...}" />
<marker date="1563377844000" expanded="true" signature="1132:1259" ph="{...}" />
<marker date="1563377844000" expanded="true" signature="1277:1414" ph="{...}" />
<marker date="1563377844000" expanded="true" signature="1424:2307" ph="//..." />
</folding>
<folding />
</state>
</provider>
</entry>
......@@ -126,9 +118,9 @@
<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" />
<caret line="175" column="21" lean-forward="false" selection-start-line="175" selection-start-column="21" selection-end-line="175" selection-end-column="21" />
<folding>
<marker date="1563377831000" expanded="true" signature="4590:4708" ph="{...}" />
<marker date="1563377924000" expanded="true" signature="4606:4724" ph="{...}" />
</folding>
</state>
</provider>
......@@ -141,8 +133,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="304">
<caret line="211" column="25" lean-forward="true" selection-start-line="211" selection-start-column="25" selection-end-line="211" selection-end-column="25" />
<state relative-caret-position="171">
<caret line="52" column="0" lean-forward="true" selection-start-line="52" selection-start-column="0" selection-end-line="52" selection-end-column="0" />
<folding />
</state>
</provider>
......@@ -185,8 +177,8 @@
<option value="$PROJECT_DIR$/Application/User/Controller/ReportController.class.php" />
<option value="$PROJECT_DIR$/Public/static/js/index.js" />
<option value="$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php" />
<option value="$PROJECT_DIR$/Public/static/css/main.scss" />
<option value="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" />
<option value="$PROJECT_DIR$/Public/static/css/main.scss" />
</list>
</option>
</component>
......@@ -604,12 +596,12 @@
<workItem from="1563354519051" duration="69000" />
<workItem from="1563355155211" duration="115000" />
<workItem from="1563355311998" duration="122000" />
<workItem from="1563377354829" duration="406000" />
<workItem from="1563377354829" duration="486000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="16254000" />
<option name="totallyTimeSpent" value="16334000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="815" extended-state="6" />
......@@ -622,7 +614,7 @@
<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.32918397" 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="false" show_stripe_button="true" weight="0.22821577" sideWeight="0.5" order="9" 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.22821577" 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" />
......@@ -675,13 +667,7 @@
<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>
<marker date="1563377844000" expanded="true" signature="769:1271" ph="{...}" />
<marker date="1563377844000" expanded="true" signature="855:1126" ph="{...}" />
<marker date="1563377844000" expanded="true" signature="1132:1259" ph="{...}" />
<marker date="1563377844000" expanded="true" signature="1277:1414" ph="{...}" />
<marker date="1563377844000" expanded="true" signature="1424:2307" ph="//..." />
</folding>
<folding />
</state>
</provider>
</entry>
......@@ -725,9 +711,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="1563377831000" expanded="true" signature="4590:4708" ph="{...}" />
</folding>
<folding />
</state>
</provider>
</entry>
......@@ -759,13 +743,7 @@
<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>
<marker date="1563377844000" expanded="true" signature="769:1271" ph="{...}" />
<marker date="1563377844000" expanded="true" signature="855:1126" ph="{...}" />
<marker date="1563377844000" expanded="true" signature="1132:1259" ph="{...}" />
<marker date="1563377844000" expanded="true" signature="1277:1414" ph="{...}" />
<marker date="1563377844000" expanded="true" signature="1424:2307" ph="//..." />
</folding>
<folding />
</state>
</provider>
</entry>
......@@ -781,9 +759,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="1563377831000" expanded="true" signature="4590:4708" ph="{...}" />
</folding>
<folding />
</state>
</provider>
</entry>
......@@ -825,13 +801,7 @@
<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>
<marker date="1563377844000" expanded="true" signature="769:1271" ph="{...}" />
<marker date="1563377844000" expanded="true" signature="855:1126" ph="{...}" />
<marker date="1563377844000" expanded="true" signature="1132:1259" ph="{...}" />
<marker date="1563377844000" expanded="true" signature="1277:1414" ph="{...}" />
<marker date="1563377844000" expanded="true" signature="1424:2307" ph="//..." />
</folding>
<folding />
</state>
</provider>
</entry>
......@@ -879,9 +849,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="1563377831000" expanded="true" signature="4590:4708" ph="{...}" />
</folding>
<folding />
</state>
</provider>
</entry>
......@@ -913,13 +881,7 @@
<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>
<marker date="1563377844000" expanded="true" signature="769:1271" ph="{...}" />
<marker date="1563377844000" expanded="true" signature="855:1126" ph="{...}" />
<marker date="1563377844000" expanded="true" signature="1132:1259" ph="{...}" />
<marker date="1563377844000" expanded="true" signature="1277:1414" ph="{...}" />
<marker date="1563377844000" expanded="true" signature="1424:2307" ph="//..." />
</folding>
<folding />
</state>
</provider>
</entry>
......@@ -945,9 +907,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="1563377831000" expanded="true" signature="4590:4708" ph="{...}" />
</folding>
<folding />
</state>
</provider>
</entry>
......@@ -1082,27 +1042,19 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl">
<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="1563377831000" expanded="true" signature="4590:4708" ph="{...}" />
</folding>
<state relative-caret-position="38">
<caret line="26" column="7" lean-forward="false" selection-start-line="26" selection-start-column="7" selection-end-line="42" selection-end-column="37" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl">
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="38">
<caret line="26" column="7" lean-forward="false" selection-start-line="26" selection-start-column="7" selection-end-line="42" selection-end-column="37" />
<folding>
<marker date="1563377844000" expanded="true" signature="769:1271" ph="{...}" />
<marker date="1563377844000" expanded="true" signature="855:1126" ph="{...}" />
<marker date="1563377844000" expanded="true" signature="1132:1259" ph="{...}" />
<marker date="1563377844000" expanded="true" signature="1277:1414" ph="{...}" />
<marker date="1563377844000" expanded="true" signature="1424:2307" ph="//..." />
</folding>
<state relative-caret-position="171">
<caret line="52" column="0" lean-forward="true" selection-start-line="52" selection-start-column="0" selection-end-line="52" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
......
......@@ -174,20 +174,20 @@ ul, li {
#container {
position: relative;
background: url("../images/bj.jpg") no-repeat center;
width: 640px;
height: 1238px;
width: 8.53333rem;
height: 16.50667rem;
}
#container .btn-prize {
justify-content: center;
width: 200px;
height: 200px;
width: 2.66667rem;
height: 2.66667rem;
font-size: 27px;
border: 1px solid red;
}
#container .prize-type {
position: absolute;
width: 300px;
height: 300px;
width: 4rem;
height: 4rem;
opacity: 0;
}
#container .word {
......
......@@ -50,8 +50,9 @@ $ea-prefix-for-spec: false !global;
// width: torem($w);
// height:torem($h);
//}
@function torem($px) {
@return $px
@return $px / 75px * 1rem;
}
@mixin bounds_by_pos($x, $y, $w, $h) {
......
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