Skip to content

php / dencare-game

Go to a project
Commit 84c10bf4 by zhangheng
Options

2

parent ba4a72b6
Showing with 22 additions and 23 deletions
.idea/workspace.xml
......@@ -2,8 +2,9 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="393705e8-a82c-4795-9b3b-5f911ddba9ac" name="Default" comment="">
<change type="DELETED" beforePath="$PROJECT_DIR$/.sass-cache/a99bcb3812225bbee2e3b2905f436d29891f981a/main.scssc" afterPath="" />
<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>
......@@ -84,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="361">
<caret line="139" column="30" lean-forward="false" selection-start-line="139" selection-start-column="30" selection-end-line="139" selection-end-column="30" />
<state relative-caret-position="466">
<caret line="42" column="26" lean-forward="true" selection-start-line="42" selection-start-column="26" selection-end-line="42" selection-end-column="26" />
<folding>
<element signature="n#style#0;n#div#39;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#40;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
......@@ -122,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="458">
<caret line="593" column="4" lean-forward="false" selection-start-line="593" selection-start-column="4" selection-end-line="593" selection-end-column="4" />
<state relative-caret-position="344">
<caret line="592" column="15" lean-forward="false" selection-start-line="592" selection-start-column="15" selection-end-line="592" selection-end-column="15" />
<folding />
</state>
</provider>
......@@ -182,8 +183,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>
......@@ -544,12 +545,12 @@
<option name="presentableId" value="Default" />
<updated>1566667513502</updated>
<workItem from="1566667516612" duration="55749000" />
<workItem from="1567098016695" duration="3954000" />
<workItem from="1567098016695" duration="4571000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="59703000" />
<option name="totallyTimeSpent" value="60320000" />
</component>
<component name="ToolWindowManager">
<frame x="14" y="23" width="1440" height="817" extended-state="0" />
......@@ -830,10 +831,18 @@
</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="344">
<caret line="592" column="15" lean-forward="false" selection-start-line="592" selection-start-column="15" selection-end-line="592" selection-end-column="15" />
<folding />
</state>
</provider>
</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="361">
<caret line="139" column="30" lean-forward="false" selection-start-line="139" selection-start-column="30" selection-end-line="139" selection-end-column="30" />
<state relative-caret-position="466">
<caret line="42" column="26" lean-forward="true" selection-start-line="42" selection-start-column="26" selection-end-line="42" selection-end-column="26" />
<folding>
<element signature="n#style#0;n#div#39;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#40;n#div#3;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
......@@ -842,13 +851,5 @@
</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="458">
<caret line="593" column="4" lean-forward="false" selection-start-line="593" selection-start-column="4" selection-end-line="593" selection-end-column="4" />
<folding />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
Application/Home/View/default/Index_index.tpl
......@@ -42,7 +42,7 @@
</script>
<title>冷热酸甜八十年</title>
<link href="__CDN__/css/swiper.min.css" rel="stylesheet">
<link href="__CDN__/css/main.css" rel="stylesheet">
<link href="__CDN__/css/main.css?t=1" rel="stylesheet">
<style>
#container.transform {
......
Public/static/css/main.css
......@@ -756,7 +756,7 @@ ul, li {
position: absolute;
display: inline-block;
left: 384px;
top: 4678px;
top: 4730px;
background: url("../images/37.png") left top;
width: 172px;
height: 113px;
......
Public/static/css/main.scss
......@@ -591,8 +591,7 @@ ul, li {
}
.map-37 {
opacity: 0;
@include image_bounds_by_pos("../images/37.png", 384px, 4678px);
@include image_bounds_by_pos("../images/37.png", 384px, 4730px);
-webkit-animation: right 0.5s 1 linear 1s;
animation-fill-mode: forwards
}
......
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