Skip to content

php / dencare-game

Go to a project
Commit 95000b04 by zhangheng
Options

y

parent 4e7fc29e
Showing with 14 additions and 28 deletions
.idea/workspace.xml
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
<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$/.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.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>
...@@ -181,8 +180,8 @@ ...@@ -181,8 +180,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="399"> <state relative-caret-position="266">
<caret line="250" column="16" lean-forward="false" selection-start-line="250" selection-start-column="16" selection-end-line="250" selection-end-column="16" /> <caret line="243" column="13" lean-forward="false" selection-start-line="243" selection-start-column="13" selection-end-line="243" selection-end-column="13" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -592,12 +591,12 @@ ...@@ -592,12 +591,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="53770000" /> <workItem from="1566667516612" duration="54060000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="53770000" /> <option name="totallyTimeSpent" value="54060000" />
</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" />
...@@ -839,8 +838,8 @@ ...@@ -839,8 +838,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="399"> <state relative-caret-position="266">
<caret line="250" column="16" lean-forward="false" selection-start-line="250" selection-start-column="16" selection-end-line="250" selection-end-column="16" /> <caret line="243" column="13" lean-forward="false" selection-start-line="243" selection-start-column="13" selection-end-line="243" selection-end-column="13" />
<folding /> <folding />
</state> </state>
</provider> </provider>
......
Public/static/css/main.css
...@@ -250,15 +250,11 @@ ul, li { ...@@ -250,15 +250,11 @@ ul, li {
} }
.page-m-b { .page-m-b {
display: flex; background: url("../images/m-b-bj-1.jpg") no-repeat center;
justify-content: center;
align-items: center;
width: 640px; width: 640px;
} height: 1238px;
.page-m-b .ceshi { position: absolute;
background: url("../images/ceshi.jpg") top center no-repeat; top: -57px;
width: 600px;
height: 1039px;
} }
.page-m-b .side-1, .page-m-b .side-2, .page-m-b .side-3, .page-m-b .side-4 { .page-m-b .side-1, .page-m-b .side-2, .page-m-b .side-3, .page-m-b .side-4 {
width: 515px; width: 515px;
......
Public/static/css/main.scss
...@@ -237,20 +237,11 @@ ul, li { ...@@ -237,20 +237,11 @@ ul, li {
} }
} }
.page-m-b { .page-m-b {
//background: url("../images/m-b-bj-1.jpg") no-repeat center; background: url("../images/m-b-bj-1.jpg") no-repeat center;
display: flex;
justify-content: center;
align-items: center;
width: 640px; width: 640px;
.ceshi{ height: 1238px;
background:url("../images/ceshi.jpg") top center no-repeat; position: absolute;
width: 600px; top: -57px;
height: 1039px;
}
//height: 1238px;
//position: relative;
//top: -57px;
.side-1, .side-2, .side-3, .side-4 { .side-1, .side-2, .side-3, .side-4 {
width: 515px; width: 515px;
height: 671px; height: 671px;
......
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