Commit a7b10a92 by 张恒

k

parent 4d17d4e5
...@@ -2,10 +2,8 @@ ...@@ -2,10 +2,8 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="d52db3c2-5e88-4692-bb71-d738c8d9556a" name="Default" comment=""> <list default="true" id="d52db3c2-5e88-4692-bb71-d738c8d9556a" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.sass-cache/46cd6a78425e02f38b71790c64f1d20201d3ab25/main.scssc" afterPath="$PROJECT_DIR$/.sass-cache/46cd6a78425e02f38b71790c64f1d20201d3ab25/main.scssc" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/css/main.css" afterPath="$PROJECT_DIR$/css/main.css" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/css/main.scss" afterPath="$PROJECT_DIR$/css/main.scss" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/css/main.scss" afterPath="$PROJECT_DIR$/css/main.scss" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/js/index.js" afterPath="$PROJECT_DIR$/js/index.js" />
</list> </list>
<ignored path="$PROJECT_DIR$/.tmp/" /> <ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" /> <ignored path="$PROJECT_DIR$/temp/" />
...@@ -29,8 +27,8 @@ ...@@ -29,8 +27,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$/css/main.scss"> <entry file="file://$PROJECT_DIR$/css/main.scss">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="100"> <state relative-caret-position="60">
<caret line="111" column="0" lean-forward="true" selection-start-line="111" selection-start-column="0" selection-end-line="111" selection-end-column="0" /> <caret line="109" column="16" lean-forward="true" selection-start-line="109" selection-start-column="16" selection-end-line="109" selection-end-column="16" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -152,12 +150,12 @@ ...@@ -152,12 +150,12 @@
<option name="number" value="Default" /> <option name="number" value="Default" />
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1513957319156</updated> <updated>1513957319156</updated>
<workItem from="1513957320785" duration="446000" /> <workItem from="1513957320785" duration="486000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="446000" /> <option name="totallyTimeSpent" value="486000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="0" y="29" width="1440" height="821" extended-state="6" /> <frame x="0" y="29" width="1440" height="821" extended-state="6" />
...@@ -202,8 +200,8 @@ ...@@ -202,8 +200,8 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/css/main.scss"> <entry file="file://$PROJECT_DIR$/css/main.scss">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="100"> <state relative-caret-position="60">
<caret line="111" column="0" lean-forward="true" selection-start-line="111" selection-start-column="0" selection-end-line="111" selection-end-column="0" /> <caret line="109" column="16" lean-forward="true" selection-start-line="109" selection-start-column="16" selection-end-line="109" selection-end-column="16" />
<folding /> <folding />
</state> </state>
</provider> </provider>
......
...@@ -104,7 +104,7 @@ p { ...@@ -104,7 +104,7 @@ p {
background: url("../image/home-bj.jpg") no-repeat center; background: url("../image/home-bj.jpg") no-repeat center;
background-size: 100% 100%; background-size: 100% 100%;
width: 100%; width: 100%;
height: 13.88rem; height: 16.29333rem;
position: relative; position: relative;
} }
#page .home .content { #page .home .content {
......
...@@ -108,7 +108,7 @@ p { ...@@ -108,7 +108,7 @@ p {
background: url("../image/home-bj.jpg") no-repeat center; background: url("../image/home-bj.jpg") no-repeat center;
background-size: 100% 100%; background-size: 100% 100%;
width: 100%; width: 100%;
height: torem(1041px); height: torem(1222px);
position: relative; position: relative;
.content { .content {
......
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