Skip to content

php / dencare-game

Go to a project
Commit 88b4b672 by zhangheng
Options

y

parent 9f21f992
Showing with 19 additions and 18 deletions
.idea/workspace.xml
......@@ -3,7 +3,7 @@
<component name="ChangeListManager">
<list default="true" id="393705e8-a82c-4795-9b3b-5f911ddba9ac" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<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.scss" afterPath="$PROJECT_DIR$/Public/static/css/main.scss" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
......@@ -17,7 +17,7 @@
</component>
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager">
<splitter split-orientation="horizontal" split-proportion="0.7152074">
<splitter split-orientation="horizontal" split-proportion="0.124423966">
<split-first>
<leaf>
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
......@@ -178,8 +178,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="477">
<caret line="239" column="11" lean-forward="true" selection-start-line="239" selection-start-column="11" selection-end-line="239" selection-end-column="11" />
<state relative-caret-position="382">
<caret line="198" column="16" lean-forward="false" selection-start-line="198" selection-start-column="16" selection-end-line="198" selection-end-column="16" />
<folding />
</state>
</provider>
......@@ -231,8 +231,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$/Application/Home/View/default/Index_index.tpl" />
<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" />
</list>
</option>
</component>
......@@ -586,12 +586,12 @@
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1566667513502</updated>
<workItem from="1566667516612" duration="47501000" />
<workItem from="1566667516612" duration="47592000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="47501000" />
<option name="totallyTimeSpent" value="47592000" />
</component>
<component name="ToolWindowManager">
<frame x="33" y="23" width="1440" height="817" extended-state="0" />
......@@ -763,14 +763,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="477">
<caret line="239" column="11" lean-forward="true" selection-start-line="239" selection-start-column="11" selection-end-line="239" selection-end-column="11" />
<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="266">
......@@ -839,5 +831,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="382">
<caret line="198" column="16" lean-forward="false" selection-start-line="198" selection-start-column="16" selection-end-line="198" selection-end-column="16" />
<folding />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
Public/static/css/main.css
......@@ -180,7 +180,7 @@ ul, li {
position: absolute;
display: inline-block;
left: -271px;
top: -63px;
top: -53px;
background: url("../images/x-k-map.jpg") left top;
width: 1177px;
height: 1375px;
......@@ -246,7 +246,7 @@ ul, li {
height: 147px;
-webkit-transform: scale(0);
animation: planet 4s ease-in 1.5s infinite forwards;
-webkit-animation: planet 4s ease-in 1.5s infinite forwards;
-webkit-animation: planet 4s ease-in 2s infinite forwards;
}
.page-m-b {
......
Public/static/css/main.scss
......@@ -197,7 +197,7 @@ ul, li {
overflow: hidden;
background: #9bc2f6;
.through-map {
@include image_bounds_by_pos("../images/x-k-map.jpg",-271px, -63px);
@include image_bounds_by_pos("../images/x-k-map.jpg",-271px, -53px);
-webkit-transform: scale(0.5);
animation: planetz_two 6s ease-in 0s infinite forwards;
-webkit-animation: planetz_two 6s ease-in 0s infinite 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