Skip to content

php / dencare-game

Go to a project
Commit e32fd1c3 by zhangheng
Options

1

parent 242a64c0
Showing with 30 additions and 26 deletions
.idea/workspace.xml
......@@ -2,8 +2,10 @@
<project version="4">
<component name="ChangeListManager">
<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" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
......@@ -82,7 +84,7 @@
<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="439">
<state relative-caret-position="2377">
<caret line="282" column="0" lean-forward="true" selection-start-line="282" selection-start-column="0" selection-end-line="282" selection-end-column="0" />
<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" />
......@@ -120,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="285">
<caret line="278" column="8" lean-forward="false" selection-start-line="278" selection-start-column="8" selection-end-line="278" selection-end-column="8" />
<state relative-caret-position="361">
<caret line="287" column="4" lean-forward="false" selection-start-line="287" selection-start-column="4" selection-end-line="287" selection-end-column="4" />
<folding />
</state>
</provider>
......@@ -182,8 +184,8 @@
<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$/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$/Public/static/css/main.scss" />
</list>
</option>
</component>
......@@ -544,12 +546,12 @@
<updated>1566667513502</updated>
<workItem from="1566667516612" duration="55749000" />
<workItem from="1567098016695" duration="6433000" />
<workItem from="1567181764126" duration="3781000" />
<workItem from="1567181764126" duration="4041000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="65963000" />
<option name="totallyTimeSpent" value="66223000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="815" extended-state="6" />
......@@ -924,14 +926,6 @@
</state>
</provider>
</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="278" column="8" lean-forward="false" selection-start-line="278" selection-start-column="8" selection-end-line="278" selection-end-column="8" />
<folding />
</state>
</provider>
</entry>
<entry file="jar://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/lib/JavaScriptLanguage.jar!/com/intellij/lang/javascript/index/predefined/DHTML.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="190">
......@@ -942,7 +936,7 @@
</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="439">
<state relative-caret-position="2377">
<caret line="282" column="0" lean-forward="true" selection-start-line="282" selection-start-column="0" selection-end-line="282" selection-end-column="0" />
<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" />
......@@ -950,5 +944,13 @@
</state>
</provider>
</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="287" column="4" lean-forward="false" selection-start-line="287" selection-start-column="4" selection-end-line="287" selection-end-column="4" />
<folding />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
Public/static/css/main.css
......@@ -323,7 +323,7 @@ ul, li {
align-items: center;
position: absolute;
left: 57px;
top: 878px;
top: 823px;
width: 510px;
background: white;
border-radius: 15px;
......@@ -335,7 +335,7 @@ ul, li {
.page-x-z .b-j {
position: absolute;
left: 60px;
top: 190px;
top: 126px;
width: 515px;
height: 671px;
}
......@@ -346,7 +346,7 @@ ul, li {
.page-x-z .w-p {
padding: 10px 0 10px 0;
position: absolute;
top: 463px;
top: 823px;
left: 274px;
width: 96px;
height: 83px;
......@@ -380,7 +380,7 @@ ul, li {
position: absolute;
display: inline-block;
left: 94px;
top: 997px;
top: 945px;
background: url("../images/btn-b-y.png") left top;
width: 435px;
height: 97px;
......@@ -396,7 +396,7 @@ ul, li {
position: absolute;
display: inline-block;
left: 94px;
top: 1047px;
top: 945px;
background: url("../images/word-2.png") left top;
width: 425px;
height: 49px;
......
Public/static/css/main.scss
......@@ -284,7 +284,8 @@ ul, li {
align-items: center;
position: absolute;
left: 57px;
top: 878px;
top: 823px;
width: 510px;
background: white;
border-radius: 15px;
......@@ -296,7 +297,7 @@ ul, li {
.b-j {
position: absolute;
left: 60px;
top: 190px;
top: 126px;
width: 515px;
height: 671px;
}
......@@ -308,7 +309,7 @@ ul, li {
padding: 10px 0 10px 0;
position: absolute;
top: 463px;
top: 823px;
left: 274px;
width: 96px;
height: 83px;
......@@ -340,7 +341,7 @@ ul, li {
}
.b-y {
@include image_bounds_by_pos("../images/btn-b-y.png", 94px, 997px);
@include image_bounds_by_pos("../images/btn-b-y.png", 94px, 945px);
display: flex;
justify-content: space-around;
align-items: flex-end;
......@@ -351,7 +352,7 @@ ul, li {
}
.btn-w-p {
@include image_bounds_by_pos("../images/word-2.png", 94px, 1047px);
@include image_bounds_by_pos("../images/word-2.png", 94px, 945px);
display: flex;
justify-content: space-around;
align-items: flex-end;
......
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