Skip to content

php / sx-prize

Go to a project
Commit cfc16217 by zhangheng
Options

j

parent 0bb5572e
Showing with 25 additions and 21 deletions
.idea/workspace.xml
......@@ -2,7 +2,9 @@
<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" />
......@@ -17,7 +19,7 @@
</component>
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager">
<splitter split-orientation="horizontal" split-proportion="0.20420168">
<splitter split-orientation="horizontal" split-proportion="0.6184874">
<split-first>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
......@@ -33,8 +35,8 @@
<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="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" />
<state relative-caret-position="285">
<caret line="38" column="0" lean-forward="true" selection-start-line="38" selection-start-column="0" selection-end-line="38" selection-end-column="0" />
<folding />
</state>
</provider>
......@@ -118,9 +120,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="175" column="21" lean-forward="false" selection-start-line="175" selection-start-column="21" selection-end-line="175" 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>
<marker date="1563377924000" expanded="true" signature="4606:4724" ph="{...}" />
<marker date="1563378009000" expanded="true" signature="4641:4759" ph="{...}" />
</folding>
</state>
</provider>
......@@ -133,8 +135,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="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" />
<state relative-caret-position="95">
<caret line="202" column="4" lean-forward="false" selection-start-line="202" selection-start-column="4" selection-end-line="202" selection-end-column="4" />
<folding />
</state>
</provider>
......@@ -596,12 +598,12 @@
<workItem from="1563354519051" duration="69000" />
<workItem from="1563355155211" duration="115000" />
<workItem from="1563355311998" duration="122000" />
<workItem from="1563377354829" duration="486000" />
<workItem from="1563377354829" duration="562000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="16334000" />
<option name="totallyTimeSpent" value="16410000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="815" extended-state="6" />
......@@ -1044,16 +1046,16 @@
</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="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" />
<state relative-caret-position="285">
<caret line="38" column="0" lean-forward="true" selection-start-line="38" selection-start-column="0" selection-end-line="38" selection-end-column="0" />
<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="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" />
<state relative-caret-position="95">
<caret line="202" column="4" lean-forward="false" selection-start-line="202" selection-start-column="4" selection-end-line="202" selection-end-column="4" />
<folding />
</state>
</provider>
......
Public/static/css/main.css
......@@ -174,20 +174,21 @@ ul, li {
#container {
position: relative;
background: url("../images/bj.jpg") no-repeat center;
width: 8.53333rem;
height: 16.50667rem;
background-size: 100% 100%;
width: 6.4rem;
height: 12.38rem;
}
#container .btn-prize {
justify-content: center;
width: 2.66667rem;
height: 2.66667rem;
width: 2rem;
height: 2rem;
font-size: 27px;
border: 1px solid red;
}
#container .prize-type {
position: absolute;
width: 4rem;
height: 4rem;
width: 3rem;
height: 3rem;
opacity: 0;
}
#container .word {
......
Public/static/css/main.scss
......@@ -50,9 +50,8 @@ $ea-prefix-for-spec: false !global;
// width: torem($w);
// height:torem($h);
//}
@function torem($px) {
@return $px / 75px * 1rem;
@return $px / 100px * 1rem;
}
@mixin bounds_by_pos($x, $y, $w, $h) {
......@@ -197,9 +196,11 @@ ul, li {
#container {
position: relative;
background: url("../images/bj.jpg") no-repeat center;
background-size: 100% 100%;
width: torem(640px);
height: torem(1238px);
.btn-prize {
@extend .flex;
justify-content: center;
width: torem(200px);
......
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