Skip to content

php / sx-prize

Go to a project
Commit fe65f199 by zhangheng
Options

j

parent a168a18f
Showing with 25 additions and 33 deletions
.idea/workspace.xml
......@@ -3,7 +3,7 @@
<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$/Application/Home/View/default/Index_index.tpl" afterPath="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" />
<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>
......@@ -35,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="342">
<caret line="45" column="42" lean-forward="false" selection-start-line="45" selection-start-column="42" selection-end-line="45" selection-end-column="42" />
<state relative-caret-position="285">
<caret line="59" column="26" lean-forward="true" selection-start-line="59" selection-start-column="16" selection-end-line="59" selection-end-column="26" />
<folding />
</state>
</provider>
......@@ -122,7 +122,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="1563291022000" expanded="true" signature="4169:4607" ph="{...}" />
<marker date="1563291164000" expanded="true" signature="4169:4629" ph="{...}" />
</folding>
</state>
</provider>
......@@ -135,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="361">
<caret line="201" column="15" lean-forward="false" selection-start-line="201" selection-start-column="15" selection-end-line="201" selection-end-column="15" />
<state relative-caret-position="167">
<caret line="212" column="2" lean-forward="false" selection-start-line="212" selection-start-column="2" selection-end-line="212" selection-end-column="2" />
<folding />
</state>
</provider>
......@@ -179,8 +179,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>
......@@ -593,12 +593,12 @@
<workItem from="1563255994907" duration="30000" />
<workItem from="1563256090653" duration="277000" />
<workItem from="1563256430516" duration="171000" />
<workItem from="1563290476531" duration="451000" />
<workItem from="1563290476531" duration="585000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="15202000" />
<option name="totallyTimeSpent" value="15336000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="813" extended-state="6" />
......@@ -708,9 +708,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="1563291022000" expanded="true" signature="4169:4607" ph="{...}" />
</folding>
<folding />
</state>
</provider>
</entry>
......@@ -758,9 +756,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="1563291022000" expanded="true" signature="4169:4607" ph="{...}" />
</folding>
<folding />
</state>
</provider>
</entry>
......@@ -850,9 +846,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="1563291022000" expanded="true" signature="4169:4607" ph="{...}" />
</folding>
<folding />
</state>
</provider>
</entry>
......@@ -910,9 +904,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="1563291022000" expanded="true" signature="4169:4607" ph="{...}" />
</folding>
<folding />
</state>
</provider>
</entry>
......@@ -1047,20 +1039,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="1563291022000" expanded="true" signature="4169:4607" ph="{...}" />
</folding>
<state relative-caret-position="285">
<caret line="59" column="26" lean-forward="true" selection-start-line="59" selection-start-column="16" selection-end-line="59" selection-end-column="26" />
<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="342">
<caret line="45" column="42" lean-forward="false" selection-start-line="45" selection-start-column="42" selection-end-line="45" selection-end-column="42" />
<state relative-caret-position="167">
<caret line="212" column="2" lean-forward="false" selection-start-line="212" selection-start-column="2" selection-end-line="212" selection-end-column="2" />
<folding />
</state>
</provider>
......
Public/static/css/main.css
......@@ -187,7 +187,8 @@ ul, li {
border: 1px solid red;
}
#container .prize-type {
width: 100%;
width: 219px;
height: 219px;
}
#container .word {
font-size: 40px;
......
Public/static/css/main.scss
......@@ -210,9 +210,10 @@ flex-direction: column-reverse;
font-size: 27px;
border: 1px solid red;
}
.prize-type{
width: 100%;
.prize-type{
width: 219px;
height: 219px;
}
.word{
......
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