Skip to content

php / dencare-game

Go to a project
Commit de423d4e by zhangheng
Options

1

parent 996fccf3
Showing with 9 additions and 12 deletions
.idea/workspace.xml
...@@ -2,10 +2,7 @@ ...@@ -2,10 +2,7 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="393705e8-a82c-4795-9b3b-5f911ddba9ac" name="Default" comment=""> <list default="true" id="393705e8-a82c-4795-9b3b-5f911ddba9ac" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.sass-cache/a99bcb3812225bbee2e3b2905f436d29891f981a/main.scssc" afterPath="$PROJECT_DIR$/.sass-cache/a99bcb3812225bbee2e3b2905f436d29891f981a/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/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.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" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/css/main.scss" afterPath="$PROJECT_DIR$/Public/static/css/main.scss" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
...@@ -121,8 +118,8 @@ ...@@ -121,8 +118,8 @@
<file leaf-file-name="main.scss" pinned="false" current-in-tab="true"> <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="342"> <state relative-caret-position="304">
<caret line="905" column="21" lean-forward="false" selection-start-line="905" selection-start-column="21" selection-end-line="905" selection-end-column="21" /> <caret line="903" column="1" lean-forward="false" selection-start-line="903" selection-start-column="1" selection-end-line="903" selection-end-column="1" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -183,8 +180,8 @@ ...@@ -183,8 +180,8 @@
<option value="$PROJECT_DIR$/Application/User/View/default/Report_index.tpl" /> <option value="$PROJECT_DIR$/Application/User/View/default/Report_index.tpl" />
<option value="$PROJECT_DIR$/Application/User/Controller/ReportController.class.php" /> <option value="$PROJECT_DIR$/Application/User/Controller/ReportController.class.php" />
<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" />
<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/css/main.scss" />
</list> </list>
</option> </option>
</component> </component>
...@@ -545,12 +542,12 @@ ...@@ -545,12 +542,12 @@
<updated>1566667513502</updated> <updated>1566667513502</updated>
<workItem from="1566667516612" duration="55749000" /> <workItem from="1566667516612" duration="55749000" />
<workItem from="1567098016695" duration="6433000" /> <workItem from="1567098016695" duration="6433000" />
<workItem from="1567181764126" duration="6836000" /> <workItem from="1567181764126" duration="6910000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="69018000" /> <option name="totallyTimeSpent" value="69092000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="815" extended-state="6" /> <frame x="0" y="23" width="1440" height="815" extended-state="6" />
...@@ -939,8 +936,8 @@ ...@@ -939,8 +936,8 @@
</entry> </entry>
<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="342"> <state relative-caret-position="304">
<caret line="905" column="21" lean-forward="false" selection-start-line="905" selection-start-column="21" selection-end-line="905" selection-end-column="21" /> <caret line="903" column="1" lean-forward="false" selection-start-line="903" selection-start-column="1" selection-end-line="903" selection-end-column="1" />
<folding /> <folding />
</state> </state>
</provider> </provider>
......
Public/static/css/main.css
...@@ -1168,7 +1168,7 @@ ul, li { ...@@ -1168,7 +1168,7 @@ ul, li {
} }
.m-b-sate-two { .m-b-sate-two {
left: 585px !important; left: 541px !important;
top: 103px !important; top: 103px !important;
} }
......
Public/static/css/main.scss
...@@ -903,7 +903,7 @@ ul, li { ...@@ -903,7 +903,7 @@ ul, li {
top: 104px !important; top: 104px !important;
} }
.m-b-sate-two{ .m-b-sate-two{
left: 585px !important; left: 541px !important;
top: 103px !important; top: 103px !important;
} }
.m-b-sate { .m-b-sate {
......
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