Commit 18f37549 by zhangheng

y

parent 30243778
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<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$/.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$/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>
...@@ -179,8 +178,8 @@ ...@@ -179,8 +178,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="285"> <state relative-caret-position="171">
<caret line="806" column="4" lean-forward="false" selection-start-line="806" selection-start-column="4" selection-end-line="806" selection-end-column="4" /> <caret line="805" column="8" lean-forward="false" selection-start-line="805" selection-start-column="8" selection-end-line="805" selection-end-column="8" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -589,12 +588,12 @@ ...@@ -589,12 +588,12 @@
<option name="number" value="Default" /> <option name="number" value="Default" />
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1566667513502</updated> <updated>1566667513502</updated>
<workItem from="1566667516612" duration="51322000" /> <workItem from="1566667516612" duration="51430000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="51322000" /> <option name="totallyTimeSpent" value="51430000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="69" y="69" width="1440" height="817" extended-state="0" /> <frame x="69" y="69" width="1440" height="817" extended-state="0" />
...@@ -836,8 +835,8 @@ ...@@ -836,8 +835,8 @@
</entry> </entry>
<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="285"> <state relative-caret-position="171">
<caret line="806" column="4" lean-forward="false" selection-start-line="806" selection-start-column="4" selection-end-line="806" selection-end-column="4" /> <caret line="805" column="8" lean-forward="false" selection-start-line="805" selection-start-column="8" selection-end-line="805" selection-end-column="8" />
<folding /> <folding />
</state> </state>
</provider> </provider>
......
...@@ -1024,7 +1024,7 @@ ul, li { ...@@ -1024,7 +1024,7 @@ ul, li {
height: 870px !important; height: 870px !important;
} }
.dialog_game_rule .btn-close-two { .dialog_game_rule .btn-close-two {
top: 211px !important; top: 91px !important;
left: 472px !important; left: 472px !important;
} }
......
...@@ -804,14 +804,14 @@ ul, li { ...@@ -804,14 +804,14 @@ ul, li {
.dialog_game_rule { .dialog_game_rule {
.map { .map {
position: relative; position: relative;
top: -116px; top: -116px;
width: 489px !important; width: 489px !important;
height: 870px !important; height: 870px !important;
} }
.btn-close-two { .btn-close-two {
top: 211px !important; top: 91px !important;
left: 472px !important; left: 472px !important;
} }
} }
......
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