Skip to content

php / dencare-game

Go to a project
Commit 29008421 by zhangheng
Options

y

parent 8c88032d
Showing with 24 additions and 21 deletions
.idea/workspace.xml
......@@ -2,8 +2,10 @@
<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$/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" />
......@@ -17,7 +19,7 @@
</component>
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager">
<splitter split-orientation="horizontal" split-proportion="0.7422003">
<splitter split-orientation="horizontal" split-proportion="0.44581282">
<split-first>
<leaf>
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
......@@ -178,8 +180,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="186">
<caret line="661" column="0" lean-forward="false" selection-start-line="661" selection-start-column="0" selection-end-line="661" selection-end-column="0" />
<state relative-caret-position="222">
<caret line="925" column="3" lean-forward="false" selection-start-line="925" selection-start-column="3" selection-end-line="925" selection-end-column="3" />
<folding />
</state>
</provider>
......@@ -226,10 +228,10 @@
<option value="$PROJECT_DIR$/Public/static/js/konva.min.js" />
<option value="$PROJECT_DIR$/Public/static/js/hammer.min.js" />
<option value="$PROJECT_DIR$/index.html" />
<option value="$PROJECT_DIR$/Public/static/css/main.scss" />
<option value="$PROJECT_DIR$/Application/Common/Conf/db.php" />
<option value="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" />
<option value="$PROJECT_DIR$/Public/static/js/index.js" />
<option value="$PROJECT_DIR$/Public/static/css/main.scss" />
</list>
</option>
</component>
......@@ -241,7 +243,7 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="60" />
<option name="x" value="-314" />
<option name="y" value="23" />
<option name="width" value="1440" />
<option name="height" value="817" />
......@@ -531,15 +533,15 @@
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1566667513502</updated>
<workItem from="1566667516612" duration="43581000" />
<workItem from="1566667516612" duration="43787000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="43581000" />
<option name="totallyTimeSpent" value="43787000" />
</component>
<component name="ToolWindowManager">
<frame x="60" y="23" width="1440" height="817" extended-state="0" />
<frame x="-314" y="23" width="1440" height="817" extended-state="0" />
<editor active="true" />
<layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.12875536" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
......@@ -619,14 +621,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="186">
<caret line="661" column="0" lean-forward="false" selection-start-line="661" selection-start-column="0" selection-end-line="661" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Application/Common/Conf/db.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="114">
......@@ -768,5 +762,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="222">
<caret line="925" column="3" lean-forward="false" selection-start-line="925" selection-start-column="3" selection-end-line="925" selection-end-column="3" />
<folding />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
Public/static/css/main.css
......@@ -1125,7 +1125,7 @@ ul, li {
left: 185px;
width: 341px;
height: 49px;
font-size: 20px;
font-size: 30px;
border: 0;
margin: 0;
padding: 0;
......@@ -1138,7 +1138,7 @@ ul, li {
top: 649px;
}
.page-info .tel {
top: 765px;
top: 767px;
left: 236px;
width: 299px;
}
......
Public/static/css/main.scss
......@@ -918,7 +918,7 @@ ul, li {
left: 185px;
width: 341px;
height: 49px;
font-size: 20px;
font-size: 30px;
border: 0;
margin: 0;
padding: 0;
......@@ -932,7 +932,7 @@ ul, li {
}
.tel {
top: 765px;
top: 767px;
left: 236px;
width: 299px;
}
......
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