Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
bearyan
2016-11-16 22:04:35 +08:00
5 changed files with 110 additions and 5 deletions

View File

@@ -1843,7 +1843,21 @@
<p class="page__desc">滑块</p>
</div>
<div class="page__bd">
<div class="weui-slider">
<div class="weui-slider__inner">
<div style="width: 0;" class="weui-slider__track"></div>
<div style="left: 0;" class="weui-slider__handler"></div>
</div>
</div>
<div class="weui-slider">
<div class="weui-slider__inner">
<div style="width: 50%;" class="weui-slider__track"></div>
<div style="left: 50%;" class="weui-slider__handler"></div>
</div>
<div class="weui-slider__value">
<span>50</span>
</div>
</div>
</div>
<div class="page__ft">
<a href="javascript:home()"><img src="./images/icon_footer_link.png" /></a>

41
dist/style/weui.css vendored
View File

File diff suppressed because one or more lines are too long

View File

File diff suppressed because one or more lines are too long

View File

@@ -4,7 +4,21 @@
<p class="page__desc">滑块</p>
</div>
<div class="page__bd">
<div class="weui-slider">
<div class="weui-slider__inner">
<div style="width: 0;" class="weui-slider__track"></div>
<div style="left: 0;" class="weui-slider__handler"></div>
</div>
</div>
<div class="weui-slider">
<div class="weui-slider__inner">
<div style="width: 50%;" class="weui-slider__track"></div>
<div style="left: 50%;" class="weui-slider__handler"></div>
</div>
<div class="weui-slider__value">
<span>50</span>
</div>
</div>
</div>
<div class="page__ft">
<a href="javascript:home()"><img src="./images/icon_footer_link.png" /></a>

View File

@@ -1 +1,39 @@
@import "../../base/fn";
@import "../../base/fn";
.weui-slider {
padding: 15px 18px;
display: flex;
align-items: center;
}
.weui-slider__inner {
position: relative;
flex: 1;
height: 2px;
background-color: #E9E9E9;
}
.weui-slider__track {
height: 2px;
background-color: #1aad19;
width: 0;
}
.weui-slider__handler {
position: absolute;
left: 0;
top: 50%;
width: 28px;
height: 28px;
margin-left: -14px;
margin-top: -14px;
border-radius: 50%;
background-color: #ffffff;
box-shadow: 0 0 4px rgba(0, 0, 0, .2);
}
.weui-slider__value {
color: #888888;
font-size: 14px;
margin-left: 1em;
}