Commit 937eac3a by zhangheng

y

parent b4f1d748
...@@ -2,7 +2,9 @@ ...@@ -2,7 +2,9 @@
<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.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>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
...@@ -179,7 +181,7 @@ ...@@ -179,7 +181,7 @@
<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="285">
<caret line="485" column="65" lean-forward="false" selection-start-line="485" selection-start-column="65" selection-end-line="485" selection-end-column="65" /> <caret line="245" column="2" lean-forward="false" selection-start-line="245" selection-start-column="2" selection-end-line="245" selection-end-column="2" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -589,12 +591,12 @@ ...@@ -589,12 +591,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="52492000" /> <workItem from="1566667516612" duration="52633000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="52492000" /> <option name="totallyTimeSpent" value="52633000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="31" y="23" width="1440" height="817" extended-state="0" /> <frame x="31" y="23" width="1440" height="817" extended-state="0" />
...@@ -837,7 +839,7 @@ ...@@ -837,7 +839,7 @@
<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="285">
<caret line="485" column="65" lean-forward="false" selection-start-line="485" selection-start-column="65" selection-end-line="485" selection-end-column="65" /> <caret line="245" column="2" lean-forward="false" selection-start-line="245" selection-start-column="2" selection-end-line="245" selection-end-column="2" />
<folding /> <folding />
</state> </state>
</provider> </provider>
......
...@@ -253,6 +253,8 @@ ul, li { ...@@ -253,6 +253,8 @@ ul, li {
background: url("../images/m-b-bj-1.jpg") no-repeat center; background: url("../images/m-b-bj-1.jpg") no-repeat center;
width: 640px; width: 640px;
height: 1238px; height: 1238px;
position: relative;
top: -57px;
} }
.page-m-b .side-1, .page-m-b .side-2, .page-m-b .side-3, .page-m-b .side-4 { .page-m-b .side-1, .page-m-b .side-2, .page-m-b .side-3, .page-m-b .side-4 {
width: 515px; width: 515px;
......
...@@ -241,6 +241,9 @@ ul, li { ...@@ -241,6 +241,9 @@ ul, li {
background: url("../images/m-b-bj-1.jpg") no-repeat center; background: url("../images/m-b-bj-1.jpg") no-repeat center;
width: 640px; width: 640px;
height: 1238px; height: 1238px;
position: relative;
top: -57px;
.side-1, .side-2, .side-3, .side-4 { .side-1, .side-2, .side-3, .side-4 {
width: 515px; width: 515px;
height: 671px; height: 671px;
......
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