Skip to content

php / sx-prize

Go to a project
Commit 4c1b1108 by zhangheng
Options

j

parent cc055497
Showing with 23 additions and 32 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$/Application/Home/View/default/Index_index.tpl" afterPath="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" />
<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$/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" />
......@@ -119,7 +121,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="1563291165000" expanded="true" signature="4169:4627" ph="{...}" />
<marker date="1563291256000" expanded="true" signature="4169:4626" ph="{...}" />
</folding>
</state>
</provider>
......@@ -133,7 +135,7 @@
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="262">
<caret line="217" column="8" lean-forward="true" selection-start-line="217" selection-start-column="8" selection-end-line="217" selection-end-column="8" />
<caret line="217" column="8" lean-forward="false" selection-start-line="217" selection-start-column="8" selection-end-line="217" selection-end-column="8" />
<folding />
</state>
</provider>
......@@ -176,8 +178,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>
......@@ -590,12 +592,12 @@
<workItem from="1563255994907" duration="30000" />
<workItem from="1563256090653" duration="277000" />
<workItem from="1563256430516" duration="171000" />
<workItem from="1563290476531" duration="635000" />
<workItem from="1563290476531" duration="678000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="15386000" />
<option name="totallyTimeSpent" value="15429000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="813" extended-state="6" />
......@@ -705,9 +707,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="1563291165000" expanded="true" signature="4169:4627" ph="{...}" />
</folding>
<folding />
</state>
</provider>
</entry>
......@@ -755,9 +755,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="1563291165000" expanded="true" signature="4169:4627" ph="{...}" />
</folding>
<folding />
</state>
</provider>
</entry>
......@@ -847,9 +845,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="1563291165000" expanded="true" signature="4169:4627" ph="{...}" />
</folding>
<folding />
</state>
</provider>
</entry>
......@@ -907,9 +903,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="1563291165000" expanded="true" signature="4169:4627" ph="{...}" />
</folding>
<folding />
</state>
</provider>
</entry>
......@@ -1044,20 +1038,18 @@
</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="1563291165000" expanded="true" signature="4169:4627" ph="{...}" />
</folding>
<state relative-caret-position="247">
<caret line="57" column="12" lean-forward="true" selection-start-line="57" selection-start-column="12" selection-end-line="57" selection-end-column="12" />
<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="247">
<caret line="57" column="12" lean-forward="true" selection-start-line="57" selection-start-column="12" selection-end-line="57" selection-end-column="12" />
<state relative-caret-position="262">
<caret line="217" column="8" lean-forward="false" selection-start-line="217" selection-start-column="8" selection-end-line="217" selection-end-column="8" />
<folding />
</state>
</provider>
......
Public/static/css/main.css
......@@ -187,8 +187,8 @@ ul, li {
border: 1px solid red;
}
#container .prize-type {
width: 219px;
height: 219px;
width: 300px;
height: 300px;
}
#container .word {
font-size: 40px;
......
Public/static/css/main.scss
......@@ -212,11 +212,10 @@ flex-direction: column-reverse;
}
.prize-type{
width: 219px;
height: 219px;
width: 300px;
height: 300px;
}
.word{
font-size: 40px;
}
}
......
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