Skip to content

php / dencare-game

Go to a project
Commit 509295e9 by zhangheng
Options

1

parent 9729efec
Showing with 8 additions and 12 deletions
.idea/workspace.xml
......@@ -4,10 +4,8 @@
<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$/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/js/index.js" afterPath="$PROJECT_DIR$/Public/static/js/index.js" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
......@@ -124,8 +122,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="399">
<caret line="381" column="3" lean-forward="true" selection-start-line="381" selection-start-column="3" selection-end-line="381" selection-end-column="3" />
<state relative-caret-position="171">
<caret line="148" column="17" lean-forward="false" selection-start-line="148" selection-start-column="17" selection-end-line="148" selection-end-column="17" />
<folding />
</state>
</provider>
......@@ -547,12 +545,12 @@
<updated>1566667513502</updated>
<workItem from="1566667516612" duration="55749000" />
<workItem from="1567098016695" duration="6433000" />
<workItem from="1567181764126" duration="1588000" />
<workItem from="1567181764126" duration="1693000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="63770000" />
<option name="totallyTimeSpent" value="63875000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="815" extended-state="6" />
......@@ -937,8 +935,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="399">
<caret line="381" column="3" lean-forward="true" selection-start-line="381" selection-start-column="3" selection-end-line="381" selection-end-column="3" />
<state relative-caret-position="171">
<caret line="148" column="17" lean-forward="false" selection-start-line="148" selection-start-column="17" selection-end-line="148" selection-end-column="17" />
<folding />
</state>
</provider>
......
Public/static/css/main.css
......@@ -103,7 +103,6 @@ ul, li {
#container {
width: 640px;
height: 100%;
max-width: 640px;
margin: 0 auto;
position: relative;
......@@ -415,7 +414,6 @@ ul, li {
.page-s-c .b-j-two {
position: relative;
display: block;
width: 599px;
height: 1091px;
background: url("../images/bj-two.jpg") no-repeat center;
}
......
Public/static/css/main.scss
......@@ -145,7 +145,7 @@ ul, li {
#container {
width: $container-body-width;
height: 100%;
//height: 100%;
max-width: $max-width;
margin: 0 auto;
position: relative;
......@@ -368,7 +368,7 @@ ul, li {
.b-j-two {
position: relative;
display: block;
width: 599px;
//width: 599px;
height: 1091px;
background: url("../images/bj-two.jpg") no-repeat center;
}
......
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