Skip to content

php / dencare-game

Go to a project
Commit 25dc3bce by zhangheng
Options

1

parent c02c6357
Showing with 32 additions and 29 deletions
.idea/workspace.xml
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
<list default="true" id="393705e8-a82c-4795-9b3b-5f911ddba9ac" name="Default" comment=""> <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$/.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$/.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.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/css/main.scss" afterPath="$PROJECT_DIR$/Public/static/css/main.scss" />
</list> </list>
...@@ -20,7 +19,7 @@ ...@@ -20,7 +19,7 @@
</component> </component>
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" /> <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager"> <component name="FileEditorManager">
<splitter split-orientation="horizontal" split-proportion="0.49767873"> <splitter split-orientation="horizontal" split-proportion="0.16914499">
<split-first> <split-first>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="index.html" pinned="false" current-in-tab="false"> <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
...@@ -85,8 +84,8 @@ ...@@ -85,8 +84,8 @@
<file leaf-file-name="Index_index.tpl" pinned="false" current-in-tab="true"> <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"> <entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="114"> <state relative-caret-position="152">
<caret line="199" column="52" lean-forward="false" selection-start-line="199" selection-start-column="52" selection-end-line="199" selection-end-column="52" /> <caret line="201" column="33" lean-forward="false" selection-start-line="201" selection-start-column="33" selection-end-line="201" selection-end-column="46" />
<folding> <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" /> <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> </folding>
...@@ -123,8 +122,8 @@ ...@@ -123,8 +122,8 @@
<file leaf-file-name="main.scss" pinned="false" current-in-tab="true"> <file leaf-file-name="main.scss" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss"> <entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="266"> <state relative-caret-position="209">
<caret line="372" column="20" lean-forward="false" selection-start-line="372" selection-start-column="20" selection-end-line="372" selection-end-column="20" /> <caret line="381" column="66" lean-forward="false" selection-start-line="381" selection-start-column="66" selection-end-line="381" selection-end-column="66" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -185,8 +184,8 @@ ...@@ -185,8 +184,8 @@
<option value="$PROJECT_DIR$/Application/User/View/default/Report_index.tpl" /> <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$/Application/User/Controller/ReportController.class.php" />
<option value="$PROJECT_DIR$/Public/static/js/index.js" /> <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$/Application/Home/View/default/Index_index.tpl" />
<option value="$PROJECT_DIR$/Public/static/css/main.scss" />
</list> </list>
</option> </option>
</component> </component>
...@@ -547,12 +546,12 @@ ...@@ -547,12 +546,12 @@
<updated>1566667513502</updated> <updated>1566667513502</updated>
<workItem from="1566667516612" duration="55749000" /> <workItem from="1566667516612" duration="55749000" />
<workItem from="1567098016695" duration="6433000" /> <workItem from="1567098016695" duration="6433000" />
<workItem from="1567181764126" duration="2048000" /> <workItem from="1567181764126" duration="2276000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="64230000" /> <option name="totallyTimeSpent" value="64458000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="815" extended-state="6" /> <frame x="0" y="23" width="1440" height="815" extended-state="6" />
...@@ -927,23 +926,23 @@ ...@@ -927,23 +926,23 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="266">
<caret line="372" column="20" lean-forward="false" selection-start-line="372" selection-start-column="20" selection-end-line="372" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl"> <entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="114"> <state relative-caret-position="152">
<caret line="199" column="52" lean-forward="false" selection-start-line="199" selection-start-column="52" selection-end-line="199" selection-end-column="52" /> <caret line="201" column="33" lean-forward="false" selection-start-line="201" selection-start-column="33" selection-end-line="201" selection-end-column="46" />
<folding> <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" /> <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> </folding>
</state> </state>
</provider> </provider>
</entry> </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="381" column="66" lean-forward="false" selection-start-line="381" selection-start-column="66" selection-end-line="381" selection-end-column="66" />
<folding />
</state>
</provider>
</entry>
</component> </component>
</project> </project>
\ No newline at end of file
Public/static/css/main.css
...@@ -421,12 +421,14 @@ ul, li { ...@@ -421,12 +421,14 @@ ul, li {
} }
.page-s-c .h-b { .page-s-c .h-b {
position: absolute; position: absolute;
top: 108px;
left: 58px;
} }
.page-s-c .btn-s { .page-s-c .btn-s {
position: absolute; position: absolute;
display: inline-block; display: inline-block;
left: 41px; left: 41px;
top: 98px; top: 25px;
background: url("../images/f-h.png") left top; background: url("../images/f-h.png") left top;
width: 59px; width: 59px;
height: 59px; height: 59px;
...@@ -435,8 +437,8 @@ ul, li { ...@@ -435,8 +437,8 @@ ul, li {
justify-content: space-around; justify-content: space-around;
position: absolute; position: absolute;
display: inline-block; display: inline-block;
left: 130px; left: 169px;
top: 1060px; top: 1003px;
background: url("../images/btn.png") left top; background: url("../images/btn.png") left top;
width: 292px; width: 292px;
height: 59px; height: 59px;
...@@ -1158,12 +1160,12 @@ ul, li { ...@@ -1158,12 +1160,12 @@ ul, li {
.m-b-zhou-sate { .m-b-zhou-sate {
left: 585px !important; left: 585px !important;
top: 91px !important; top: 18px !important;
} }
.m-b-sate { .m-b-sate {
left: 542px !important; left: 542px !important;
top: 94px !important; top: 20px !important;
} }
.rotate-sate { .rotate-sate {
......
Public/static/css/main.scss
...@@ -374,15 +374,16 @@ ul, li { ...@@ -374,15 +374,16 @@ ul, li {
} }
.h-b{ .h-b{
position: absolute; position: absolute;
top: 108px;
left: 58px;
} }
.btn-s { .btn-s {
@include image_bounds_by_pos("../images/f-h.png", 41px, 98px); @include image_bounds_by_pos("../images/f-h.png", 41px, 25px);
} }
.btn { .btn {
justify-content: space-around; justify-content: space-around;
@include image_bounds_by_pos("../images/btn.png", 130px, 1060px); @include image_bounds_by_pos("../images/btn.png", 169px, 1003px);
display: flex; display: flex;
.btn-sate { .btn-sate {
flex: 1; flex: 1;
...@@ -892,12 +893,12 @@ ul, li { ...@@ -892,12 +893,12 @@ ul, li {
.m-b-zhou-sate { .m-b-zhou-sate {
left: 585px !important; left: 585px !important;
top: 91px !important; top: 18px !important;
} }
.m-b-sate { .m-b-sate {
left: 542px !important; left: 542px !important;
top: 94px !important; top: 20px !important;
} }
.rotate-sate { .rotate-sate {
......
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