Commit d33bd9de by zhangheng

1

parent 948cbad3
......@@ -4,6 +4,7 @@
<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/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" />
......@@ -121,8 +122,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="344">
<caret line="1080" column="1" lean-forward="false" selection-start-line="1080" selection-start-column="1" selection-end-line="1080" selection-end-column="1" />
<state relative-caret-position="418">
<caret line="266" column="4" lean-forward="false" selection-start-line="266" selection-start-column="4" selection-end-line="266" selection-end-column="4" />
<folding />
</state>
</provider>
......@@ -545,12 +546,12 @@
<updated>1566667513502</updated>
<workItem from="1566667516612" duration="55749000" />
<workItem from="1567098016695" duration="6433000" />
<workItem from="1567181764126" duration="3252000" />
<workItem from="1567181764126" duration="3409000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="65434000" />
<option name="totallyTimeSpent" value="65591000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="815" extended-state="6" />
......@@ -937,8 +938,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/Public/static/css/main.scss">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="344">
<caret line="1080" column="1" lean-forward="false" selection-start-line="1080" selection-start-column="1" selection-end-line="1080" selection-end-column="1" />
<state relative-caret-position="418">
<caret line="266" column="4" lean-forward="false" selection-start-line="266" selection-start-column="4" selection-end-line="266" selection-end-column="4" />
<folding />
</state>
</provider>
......
......@@ -274,7 +274,7 @@ ul, li {
position: absolute;
display: inline-block;
left: 28px;
top: 477px;
top: 422px;
background: url("../images/arrow-right.png") left top;
width: 25px;
height: 43px;
......@@ -284,7 +284,7 @@ ul, li {
position: absolute;
display: inline-block;
left: 586px;
top: 477px;
top: 422px;
background: url("../images/arrow-left.png") left top;
width: 24px;
height: 44px;
......@@ -293,7 +293,7 @@ ul, li {
position: absolute;
display: inline-block;
left: 219px;
top: 1020px;
top: 950px;
background: url("../images/btn-z-y-1.png") left top;
width: 220px;
height: 90px;
......@@ -302,7 +302,7 @@ ul, li {
position: absolute;
display: inline-block;
left: 226px;
top: 907px;
top: 832px;
background: url("../images/word-1.png") left top;
width: 198px;
height: 79px;
......@@ -486,7 +486,7 @@ ul, li {
.swiper-container {
position: absolute;
left: 60px;
top: 190px;
top: 126px;
width: 517px;
height: 782px;
}
......
......@@ -253,18 +253,19 @@ ul, li {
}
.btn-right {
z-index: 1;
@include image_bounds_by_pos("../images/arrow-right.png", 28px, 477px);
@include image_bounds_by_pos("../images/arrow-right.png", 28px, 422px);
}
.btn-left {
z-index: 1;
@include image_bounds_by_pos("../images/arrow-left.png", 586px, 477px);
@include image_bounds_by_pos("../images/arrow-left.png", 586px, 422px);
}
.btn-next {
@include image_bounds_by_pos("../images/btn-z-y-1.png", 219px, 1020px);
@include image_bounds_by_pos("../images/btn-z-y-1.png", 219px, 950px);
}
.word {
@include image_bounds_by_pos("../images/word-1.png", 226px, 907px);
@include image_bounds_by_pos("../images/word-1.png", 226px, 832px);
}
}
......@@ -434,7 +435,7 @@ ul, li {
.swiper-container {
position: absolute;
left: 60px;
top: 190px;
top: 126px;
width: 517px;
height: 782px;
......
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