Commit d3d7c6db by zhangheng

1

parent 5fe43364
...@@ -2,7 +2,10 @@ ...@@ -2,7 +2,10 @@
<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="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/btn-b-y.png" afterPath="" />
<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" />
...@@ -120,8 +123,8 @@ ...@@ -120,8 +123,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="209"> <state relative-caret-position="247">
<caret line="342" column="2" lean-forward="false" selection-start-line="342" selection-start-column="2" selection-end-line="342" selection-end-column="2" /> <caret line="344" column="55" lean-forward="false" selection-start-line="344" selection-start-column="55" selection-end-line="344" selection-end-column="55" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -544,12 +547,12 @@ ...@@ -544,12 +547,12 @@
<updated>1566667513502</updated> <updated>1566667513502</updated>
<workItem from="1566667516612" duration="55749000" /> <workItem from="1566667516612" duration="55749000" />
<workItem from="1567098016695" duration="6433000" /> <workItem from="1567098016695" duration="6433000" />
<workItem from="1567181764126" duration="4303000" /> <workItem from="1567181764126" duration="4373000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="66485000" /> <option name="totallyTimeSpent" value="66555000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="815" extended-state="6" /> <frame x="0" y="23" width="1440" height="815" extended-state="6" />
...@@ -944,8 +947,8 @@ ...@@ -944,8 +947,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="209"> <state relative-caret-position="247">
<caret line="342" column="2" lean-forward="false" selection-start-line="342" selection-start-column="2" selection-end-line="342" selection-end-column="2" /> <caret line="344" column="55" lean-forward="false" selection-start-line="344" selection-start-column="55" selection-end-line="344" selection-end-column="55" />
<folding /> <folding />
</state> </state>
</provider> </provider>
......
...@@ -381,7 +381,7 @@ ul, li { ...@@ -381,7 +381,7 @@ ul, li {
display: inline-block; display: inline-block;
left: 94px; left: 94px;
top: 979px; top: 979px;
background: url("../images/btn-b-y.png") left top; background: url("../images/btn-b-y-two.png") left top;
width: 435px; width: 435px;
height: 49px; height: 49px;
display: flex; display: flex;
......
...@@ -342,7 +342,7 @@ ul, li { ...@@ -342,7 +342,7 @@ ul, li {
} }
.b-y { .b-y {
@include image_bounds_by_pos("../images/btn-b-y.png", 94px, 979px); @include image_bounds_by_pos("../images/btn-b-y-two.png", 94px, 979px);
display: flex; display: flex;
justify-content: space-around; justify-content: space-around;
align-items: flex-end; align-items: flex-end;
......
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