Skip to content

php / sx-prize

Go to a project
Commit 1aaa11ff by 张恒
Options

j

parent 9134a812
Showing with 24 additions and 24 deletions
.idea/workspace.xml
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="83262c17-7030-4f8f-af17-e1cc55f76944" name="Default" comment=""> <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$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php" afterPath="$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php" /> <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$/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" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/js/index.js" afterPath="$PROJECT_DIR$/Public/static/js/index.js" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" /> <option name="TRACKING_ENABLED" value="true" />
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
</component> </component>
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" /> <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager"> <component name="FileEditorManager">
<splitter split-orientation="horizontal" split-proportion="0.55711776"> <splitter split-orientation="horizontal" split-proportion="0.19947276">
<split-first> <split-first>
<leaf> <leaf>
<file leaf-file-name="index.html" pinned="false" current-in-tab="false"> <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
...@@ -78,11 +78,11 @@ ...@@ -78,11 +78,11 @@
</split-first> </split-first>
<split-second> <split-second>
<leaf> <leaf>
<file leaf-file-name="main.scss" pinned="false" current-in-tab="false"> <file leaf-file-name="main.scss" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss"> <entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="483"> <state relative-caret-position="272">
<caret line="205" column="26" lean-forward="false" selection-start-line="205" selection-start-column="26" selection-end-line="205" selection-end-column="26" /> <caret line="201" column="15" lean-forward="false" selection-start-line="201" selection-start-column="15" selection-end-line="201" selection-end-column="15" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="config.php" pinned="false" current-in-tab="true"> <file leaf-file-name="config.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Application/Common/Conf/config.php"> <entry file="file://$PROJECT_DIR$/Application/Common/Conf/config.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-133"> <state relative-caret-position="-133">
...@@ -119,10 +119,10 @@ ...@@ -119,10 +119,10 @@
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/Application/Common/Conf/db.php" /> <option value="$PROJECT_DIR$/Application/Common/Conf/db.php" />
<option value="$PROJECT_DIR$/Public/static/css/main.scss" />
<option value="$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php" /> <option value="$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php" />
<option value="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" /> <option value="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" />
<option value="$PROJECT_DIR$/Public/static/js/index.js" /> <option value="$PROJECT_DIR$/Public/static/js/index.js" />
<option value="$PROJECT_DIR$/Public/static/css/main.scss" />
</list> </list>
</option> </option>
</component> </component>
...@@ -447,12 +447,12 @@ ...@@ -447,12 +447,12 @@
<option name="number" value="Default" /> <option name="number" value="Default" />
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1562502557206</updated> <updated>1562502557206</updated>
<workItem from="1562502558877" duration="1778000" /> <workItem from="1562502558877" duration="1831000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="1778000" /> <option name="totallyTimeSpent" value="1831000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="821" extended-state="6" /> <frame x="0" y="23" width="1440" height="821" extended-state="6" />
...@@ -506,14 +506,6 @@ ...@@ -506,14 +506,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1148">
<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 />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Common/Conf/db.php"> <entry file="file://$PROJECT_DIR$/Application/Common/Conf/db.php">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="133"> <state relative-caret-position="133">
...@@ -556,6 +548,14 @@ ...@@ -556,6 +548,14 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="272">
<caret line="201" column="15" lean-forward="false" selection-start-line="201" selection-start-column="15" selection-end-line="201" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
</component> </component>
<component name="masterDetails"> <component name="masterDetails">
<states> <states>
......
Public/static/css/main.css
...@@ -79,7 +79,7 @@ html, body { ...@@ -79,7 +79,7 @@ html, body {
overflow-x: hidden; overflow-x: hidden;
user-select: none; user-select: none;
padding: 0; padding: 0;
background-color: #000000; background-color: white;
font-family: 'MicrosoftYaHei', '微软雅黑', 'STHeitiSC'; font-family: 'MicrosoftYaHei', '微软雅黑', 'STHeitiSC';
} }
...@@ -178,7 +178,7 @@ ul, li { ...@@ -178,7 +178,7 @@ ul, li {
justify-content: center; justify-content: center;
} }
#container .btn-prize { #container .btn-prize {
width: 100px; width: 200px;
height: 100px; height: 100px;
font-size: 27px; font-size: 27px;
border: 1px solid red; border: 1px solid red;
......
Public/static/css/main.scss
...@@ -106,7 +106,7 @@ html, body { ...@@ -106,7 +106,7 @@ html, body {
user-select: none; user-select: none;
padding: 0; padding: 0;
// -webkit-overflow-scrolling: touch; // -webkit-overflow-scrolling: touch;
background-color: #000000; background-color: white;
font-family: 'MicrosoftYaHei', '微软雅黑', 'STHeitiSC'; font-family: 'MicrosoftYaHei', '微软雅黑', 'STHeitiSC';
} }
...@@ -200,8 +200,8 @@ ul, li { ...@@ -200,8 +200,8 @@ ul, li {
justify-content: center; justify-content: center;
.btn-prize { .btn-prize {
@extend .flex; @extend .flex;
width: torem(100px); width: torem(200px);
height: torem(100px); height: torem(200px);
font-size: 27px; font-size: 27px;
border: 1px solid red; border: 1px solid red;
} }
......
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