Skip to content

php / dencare-game

Go to a project
Commit a1bbd2ec by zhangheng
Options

1

parent f24bff1b
Showing with 25 additions and 70 deletions
.idea/workspace.xml
......@@ -4,6 +4,7 @@
<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>
......@@ -19,7 +20,7 @@
</component>
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager">
<splitter split-orientation="horizontal" split-proportion="0.35795888">
<splitter split-orientation="horizontal" split-proportion="0.5407464">
<split-first>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
......@@ -84,12 +85,10 @@
<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="152">
<caret line="267" column="3" lean-forward="false" selection-start-line="267" selection-start-column="3" selection-end-line="273" selection-end-column="7" />
<state relative-caret-position="266">
<caret line="273" column="5" lean-forward="true" selection-start-line="273" selection-start-column="5" selection-end-line="273" selection-end-column="5" />
<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" />
<marker date="1567184687000" expanded="true" signature="12407:12599" ph="{...}" />
<marker date="1567184687000" expanded="true" signature="12475:12591" ph="{...}" />
</folding>
</state>
</provider>
......@@ -124,8 +123,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="401">
<caret line="148" column="3" lean-forward="false" selection-start-line="148" selection-start-column="3" selection-end-line="148" selection-end-column="3" />
<state relative-caret-position="342">
<caret line="367" column="12" lean-forward="true" selection-start-line="367" selection-start-column="12" selection-end-line="367" selection-end-column="12" />
<folding />
</state>
</provider>
......@@ -186,8 +185,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$/Application/Home/View/default/Index_index.tpl" />
<option value="$PROJECT_DIR$/Public/static/css/main.scss" />
<option value="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" />
</list>
</option>
</component>
......@@ -548,12 +547,12 @@
<updated>1566667513502</updated>
<workItem from="1566667516612" duration="55749000" />
<workItem from="1567098016695" duration="6433000" />
<workItem from="1567181764126" duration="2732000" />
<workItem from="1567181764126" duration="2852000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="64914000" />
<option name="totallyTimeSpent" value="65034000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="815" extended-state="6" />
......@@ -675,8 +674,6 @@
<caret line="199" column="20" lean-forward="false" selection-start-line="199" selection-start-column="20" selection-end-line="199" selection-end-column="28" />
<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" />
<marker date="1567184687000" expanded="true" signature="12407:12599" ph="{...}" />
<marker date="1567184687000" expanded="true" signature="12475:12591" ph="{...}" />
</folding>
</state>
</provider>
......@@ -770,8 +767,6 @@
<caret line="271" column="60" lean-forward="false" selection-start-line="271" selection-start-column="60" selection-end-line="271" selection-end-column="60" />
<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" />
<marker date="1567184687000" expanded="true" signature="12407:12599" ph="{...}" />
<marker date="1567184687000" expanded="true" signature="12475:12591" ph="{...}" />
</folding>
</state>
</provider>
......@@ -934,20 +929,18 @@
</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="152">
<caret line="267" column="3" lean-forward="false" selection-start-line="267" selection-start-column="3" selection-end-line="273" selection-end-column="7" />
<state relative-caret-position="266">
<caret line="273" column="5" lean-forward="true" selection-start-line="273" selection-start-column="5" selection-end-line="273" selection-end-column="5" />
<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" />
<marker date="1567184687000" expanded="true" signature="12407:12599" ph="{...}" />
<marker date="1567184687000" expanded="true" signature="12475:12591" ph="{...}" />
</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="401">
<caret line="148" column="3" lean-forward="false" selection-start-line="148" selection-start-column="3" selection-end-line="148" selection-end-column="3" />
<state relative-caret-position="342">
<caret line="367" column="12" lean-forward="true" selection-start-line="367" selection-start-column="12" selection-end-line="367" selection-end-column="12" />
<folding />
</state>
</provider>
......
Application/Home/View/default/Index_index.tpl
......@@ -265,13 +265,13 @@
<script type="text/javascript" src="__CDN__/js/jquery-2.1.3.min.js"></script>
<script>
// if (!/android/i.test(navigator.userAgent)) {
// var t = window.screen.height;
// if (t == '812') {
// $('.page-s-c').css('height', '1234px');
// $('body').css('height', '1234px');
// }
// }
if (!/android/i.test(navigator.userAgent)) {
var t = window.screen.height;
if (t == '812') {
$('.page-s-c').css('height', '1234px');
$('body').css('height', '1234px');
}
}
</script>
<script type="text/javascript" src="__CDN__/js/konva.min.js"></script>
<script type="text/javascript" src="__CDN__/js/swiper.min.js"></script>
......
Public/static/css/main.css
......@@ -81,37 +81,16 @@ html, body {
}
}
@media only screen and (min-device-width: 375px) and (max-device-width: 667px) and (orientation: portrait) and (-webkit-min-device-pixel-ratio: 2) {
.page-sate {
height: 1030px;
}
html, body {
height: 1041px;
height: 1030px;
}
}
@media only screen and (min-device-width: 414px) and (max-device-width: 736px) and (orientation: landscape) and (-webkit-min-device-pixel-ratio: 3) {
.page-sate {
height: 1041px;
}
html, body {
height: 1041px;
}
}
@media only screen and (min-device-width: 414px) and (max-device-width: 736px) and (orientation: portrait) and (-webkit-min-device-pixel-ratio: 3) {
.page-sate {
height: 1041px;
}
html, body {
height: 1041px;
}
}
@media only screen and (min-device-height: 818px) and (max-device-width: 818px) and (orientation: portrait) and (-webkit-min-device-pixel-ratio: 3) {
.page-sate {
height: 1238px;
}
html, body {
height: 1041px;
}
......
Public/static/css/main.scss
......@@ -112,42 +112,25 @@ html, body {
}
@media only screen and (min-device-width: 375px) and (max-device-width: 667px) and (orientation: landscape) and (-webkit-min-device-pixel-ratio: 2) {
.page-sate {
html, body {
height: 1030px;
}
}
@media only screen and (min-device-width: 375px) and (max-device-width: 667px) and (orientation: portrait) and (-webkit-min-device-pixel-ratio: 2) {
.page-sate {
html, body {
height: 1030px;
}
html,body{
height: 1041px;
}
}
@media only screen and (min-device-width: 414px) and (max-device-width: 736px) and (orientation: landscape) and (-webkit-min-device-pixel-ratio: 3) {
.page-sate {
height: 1041px;
}
html,body{
html, body {
height: 1041px;
}
}
@media only screen and (min-device-width: 414px) and (max-device-width: 736px) and (orientation: portrait) and (-webkit-min-device-pixel-ratio: 3) {
.page-sate {
height: 1041px;
}
html,body{
height: 1041px;
}
}
@media only screen and (min-device-height: 818px) and (max-device-width: 818px) and (orientation: portrait) and (-webkit-min-device-pixel-ratio: 3) {
.page-sate {
height: 1238px;
}
html,body{
html, body {
height: 1041px;
}
}
......
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