Skip to content

php / dencare-game

Go to a project
Commit b4f1d748 by zhangheng
Options

y

parent 8bc74585
Showing with 15 additions and 23 deletions
.idea/workspace.xml
...@@ -2,14 +2,7 @@ ...@@ -2,14 +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$/Public/static/images/b-17.png" afterPath="$PROJECT_DIR$/Public/static/images/b-17.png" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/images/b-18.png" afterPath="$PROJECT_DIR$/Public/static/images/b-18.png" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/images/b-19.png" afterPath="$PROJECT_DIR$/Public/static/images/b-19.png" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/images/b-20.png" afterPath="$PROJECT_DIR$/Public/static/images/b-20.png" />
<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" />
...@@ -185,8 +178,8 @@ ...@@ -185,8 +178,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="361"> <state relative-caret-position="285">
<caret line="489" column="9" lean-forward="true" selection-start-line="489" selection-start-column="9" selection-end-line="489" selection-end-column="9" /> <caret line="485" column="65" lean-forward="false" selection-start-line="485" selection-start-column="65" selection-end-line="485" selection-end-column="65" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -596,12 +589,12 @@ ...@@ -596,12 +589,12 @@
<option name="number" value="Default" /> <option name="number" value="Default" />
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1566667513502</updated> <updated>1566667513502</updated>
<workItem from="1566667516612" duration="52429000" /> <workItem from="1566667516612" duration="52492000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="52429000" /> <option name="totallyTimeSpent" value="52492000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="31" y="23" width="1440" height="817" extended-state="0" /> <frame x="31" y="23" width="1440" height="817" extended-state="0" />
...@@ -781,14 +774,6 @@ ...@@ -781,14 +774,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="361">
<caret line="489" column="9" lean-forward="true" selection-start-line="489" selection-start-column="9" selection-end-line="489" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl"> <entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285"> <state relative-caret-position="285">
...@@ -849,5 +834,13 @@ ...@@ -849,5 +834,13 @@
</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="285">
<caret line="485" column="65" lean-forward="false" selection-start-line="485" selection-start-column="65" selection-end-line="485" selection-end-column="65" />
<folding />
</state>
</provider>
</entry>
</component> </component>
</project> </project>
\ No newline at end of file
Public/static/css/main.css
...@@ -536,8 +536,8 @@ ul, li { ...@@ -536,8 +536,8 @@ ul, li {
.page-lang .head { .page-lang .head {
position: absolute; position: absolute;
display: inline-block; display: inline-block;
left: 214px; left: 0px;
top: 334px; top: 0px;
background: url("../images/head.png") left top; background: url("../images/head.png") left top;
width: 640px; width: 640px;
height: 1154px; height: 1154px;
......
Public/static/css/main.scss
...@@ -484,8 +484,6 @@ ul, li { ...@@ -484,8 +484,6 @@ ul, li {
height: 10194px; height: 10194px;
.head{ .head{
@include image_bounds_by_pos("../images/head.png", 0px, 0px); @include image_bounds_by_pos("../images/head.png", 0px, 0px);
} }
.word { .word {
@include image_bounds_by_pos("../images/word-3.png", 214px, 334px); @include image_bounds_by_pos("../images/word-3.png", 214px, 334px);
......
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