Skip to content

php / dencare-game

Go to a project
Commit 996fccf3 by zhangheng
Options

1

parent fcdd7054
Showing with 43 additions and 23 deletions
.idea/workspace.xml
......@@ -2,9 +2,11 @@
<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/js/index.js" afterPath="$PROJECT_DIR$/Public/static/js/index.js" />
<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" />
......@@ -83,8 +85,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="171">
<caret line="291" column="60" lean-forward="false" selection-start-line="291" selection-start-column="60" selection-end-line="291" selection-end-column="60" />
<state relative-caret-position="247">
<caret line="234" column="29" lean-forward="true" selection-start-line="234" selection-start-column="29" selection-end-line="234" selection-end-column="29" />
<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>
......@@ -119,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="304">
<caret line="879" column="3" lean-forward="false" selection-start-line="879" selection-start-column="3" selection-end-line="879" selection-end-column="3" />
<state relative-caret-position="342">
<caret line="905" column="21" lean-forward="false" selection-start-line="905" selection-start-column="21" selection-end-line="905" selection-end-column="21" />
<folding />
</state>
</provider>
......@@ -180,8 +182,8 @@
<option value="$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php" />
<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/css/main.scss" />
<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" />
</list>
</option>
......@@ -543,12 +545,12 @@
<updated>1566667513502</updated>
<workItem from="1566667516612" duration="55749000" />
<workItem from="1567098016695" duration="6433000" />
<workItem from="1567181764126" duration="6275000" />
<workItem from="1567181764126" duration="6836000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="68457000" />
<option name="totallyTimeSpent" value="69018000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="815" extended-state="6" />
......@@ -917,14 +919,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="304">
<caret line="879" column="3" lean-forward="false" selection-start-line="879" selection-start-column="3" selection-end-line="879" selection-end-column="3" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="67">
......@@ -935,13 +929,21 @@
</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="171">
<caret line="291" column="60" lean-forward="false" selection-start-line="291" selection-start-column="60" selection-end-line="291" selection-end-column="60" />
<state relative-caret-position="247">
<caret line="234" column="29" lean-forward="true" selection-start-line="234" selection-start-column="29" selection-end-line="234" selection-end-column="29" />
<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>
</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="342">
<caret line="905" column="21" lean-forward="false" selection-start-line="905" selection-start-column="21" selection-end-line="905" selection-end-column="21" />
<folding />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
Application/Home/View/default/Index_index.tpl
......@@ -230,16 +230,16 @@
<img src="__CDN__/images/share.png">
</div>
<div class="page-no-prize" style="display: none">
<div class="zhou m-b-zhou-sate"></div>
<div class="c-d m-b-sate"></div>
<div class="zhou m-b-zhou-sate-two"></div>
<div class="c-d m-b-sate-two"></div>
<div class="btn">
<div class="btn-share"></div>
<div class="btn-j-x"></div>
</div>
</div>
<div class="page-prize" style="display: none">
<div class="zhou m-b-zhou-sate"></div>
<div class="c-d m-b-sate"></div>
<div class="zhou m-b-zhou-sate-two"></div>
<div class="c-d m-b-sate-two"></div>
<img class="prize-map" src="__CDN__/images/prize-1.jpg">
<div class="btn-info"></div>
</div>
......
Public/static/css/main.css
......@@ -1162,6 +1162,16 @@ ul, li {
top: 18px !important;
}
.m-b-zhou-sate-two {
left: 585px !important;
top: 104px !important;
}
.m-b-sate-two {
left: 585px !important;
top: 103px !important;
}
.m-b-sate {
left: 542px !important;
top: 20px !important;
......
Public/static/css/main.scss
......@@ -898,7 +898,14 @@ ul, li {
left: 585px !important;
top: 18px !important;
}
.m-b-zhou-sate-two {
left: 585px !important;
top: 104px !important;
}
.m-b-sate-two{
left: 585px !important;
top: 103px !important;
}
.m-b-sate {
left: 542px !important;
top: 20px !important;
......
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