Skip to content

php / dencare-game

Go to a project
Commit 948cbad3 by zhangheng
Options

1

parent 2f77e773
Showing with 26 additions and 18 deletions
.idea/workspace.xml
......@@ -4,7 +4,6 @@
<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$/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" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
......@@ -84,8 +83,8 @@
<file leaf-file-name="Index_index.tpl" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135">
<caret line="200" column="30" lean-forward="true" selection-start-line="200" selection-start-column="30" selection-end-line="200" selection-end-column="38" />
<state relative-caret-position="268">
<caret line="207" column="48" lean-forward="false" selection-start-line="207" selection-start-column="48" selection-end-line="207" selection-end-column="48" />
<folding>
<element signature="n#style#0;n#div#6;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
......@@ -122,8 +121,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="209">
<caret line="355" column="15" lean-forward="true" selection-start-line="355" selection-start-column="15" selection-end-line="355" selection-end-column="15" />
<state relative-caret-position="344">
<caret line="1080" column="1" lean-forward="false" selection-start-line="1080" selection-start-column="1" selection-end-line="1080" selection-end-column="1" />
<folding />
</state>
</provider>
......@@ -546,12 +545,12 @@
<updated>1566667513502</updated>
<workItem from="1566667516612" duration="55749000" />
<workItem from="1567098016695" duration="6433000" />
<workItem from="1567181764126" duration="3164000" />
<workItem from="1567181764126" duration="3252000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="65346000" />
<option name="totallyTimeSpent" value="65434000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="815" extended-state="6" />
......@@ -928,8 +927,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135">
<caret line="200" column="30" lean-forward="true" selection-start-line="200" selection-start-column="30" selection-end-line="200" selection-end-column="38" />
<state relative-caret-position="268">
<caret line="207" column="48" lean-forward="false" selection-start-line="207" selection-start-column="48" selection-end-line="207" selection-end-column="48" />
<folding>
<element signature="n#style#0;n#div#6;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
......@@ -938,8 +937,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="209">
<caret line="355" column="15" lean-forward="true" selection-start-line="355" selection-start-column="15" selection-end-line="355" selection-end-column="15" />
<state relative-caret-position="344">
<caret line="1080" column="1" lean-forward="false" selection-start-line="1080" selection-start-column="1" selection-end-line="1080" selection-end-column="1" />
<folding />
</state>
</provider>
......
Public/static/css/main.css
......@@ -1331,3 +1331,10 @@ ul, li {
-webkit-transform: translate3d(0, -10px, 0);
}
}
.b-j-two {
position: relative;
display: block;
width: 100%;
height: 1091px;
background: url("../images/bj-two.jpg") no-repeat center;
}
Public/static/css/main.scss
......@@ -360,13 +360,7 @@ ul, li {
}
}
.b-j-two {
position: relative;
display: block;
width:100%;
height: 1091px;
background: url("../images/bj-two.jpg") no-repeat center;
}
.page-s-c {
display: flex;
align-items: center;
......@@ -1085,3 +1079,10 @@ ul, li {
-webkit-transform: translate3d(0, -10px, 0)
}
}
.b-j-two {
position: relative;
display: block;
width:100%;
height: 1091px;
background: url("../images/bj-two.jpg") no-repeat center;
}
\ No newline at end of file
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