Merge branch 'YOUFANGAPP1.1.2' of 192.168.0.27:dev0/youfang-app into xh-YOUFANGAPP1.1.2
# Conflicts: # fangija-zsyf/css/main.css
This commit is contained in:
@@ -325,6 +325,7 @@ em.down{color:#88D053;}
|
||||
.content-padded + .newCss ul{padding-bottom:0;}
|
||||
|
||||
.list-block .item-content label.label-checkbox{float:left;padding-left:0;}
|
||||
.list-block .item-content label.label-checkbox:last-child{margin-left:0.8rem;}
|
||||
.list-block .item-content label.label-checkbox .item-media{width:auto;height:auto;padding:0;margin:0;}
|
||||
label.label-checkbox i.icon-form-checkbox{margin-right:0.5rem;}
|
||||
label.label-checkbox i.current{background:url(../images/checkImg.png) no-repeat center center #F18D00;background-size:0.55rem;border:none;}
|
||||
@@ -531,6 +532,9 @@ input::-webkit-input-placeholder{
|
||||
.cardInfo03 .card-content-inner div.vote02 label{color:#8698F0;text-align:left;}
|
||||
.cardInfo03 .card-content-inner em{font-size:1rem;color:#F18D00;text-align:center;line-height:45px;position:absolute;left:48%;}
|
||||
|
||||
.cardInfo01 .cardInfoPlaceholder{width:100%;height:180px;background:url(../images/cardInfoPlaceholderImg.png) no-repeat center center;background-size:20%;border:solid 1px #e7e7e7;}
|
||||
.cardInfo02 .cardInfoPlaceholder{width:6.5rem;height:5.2rem;background:url(../images/cardInfoPlaceholderImg.png) no-repeat center center;background-size:30%;border:solid 1px #e7e7e7;}
|
||||
|
||||
.icon-eye-white{width:0.89rem;height:0.57rem;background:url(../images/icon-eye-white.png) no-repeat center center;background-size:100%;margin-right:0.3rem;vertical-align:baseline;}
|
||||
.icon-eye-grey{width:0.85rem;height:0.6rem;background:url(../images/icon-eye-grey.png) no-repeat center center;background-size:100%;margin-right:0.3rem;vertical-align:baseline;}
|
||||
.icon-eye-orange{width:0.7rem;height:0.5rem;background:url(../images/icon-eye-orange.png) no-repeat center center;background-size:100%;margin-right:0.3rem;vertical-align:baseline;}
|
||||
@@ -648,6 +652,7 @@ input::-webkit-input-placeholder{
|
||||
.popup .bar .searchbar .icon-left{padding:0;line-height:38px;color:#666;}
|
||||
.popup .bar .searchbar .search-input input{height:36px;border:solid 1px #e6e6ea;}
|
||||
.bar.bar-nav01{height:auto;overflow:hidden;padding-left:0.5rem;padding-right:0.5rem;}
|
||||
.bar.bar-nav01 .title{margin-left:-0.5rem;}
|
||||
.bar.bar-nav01 .button-link{color:#F18D00;}
|
||||
|
||||
/* 底部 */
|
||||
@@ -1162,6 +1167,18 @@ input::-webkit-input-placeholder{
|
||||
.topic .topicContent .topicContent_center.homeWin{width:540px;overflow:hidden;}
|
||||
.topic .topicContent .topicContent_center.homeWin div{width:90px;}
|
||||
|
||||
/* 税费计算 */
|
||||
.buttons-tab .button{color:#999;}
|
||||
|
||||
/* 分享 */
|
||||
.shareBox{height:66px;padding-left:0;padding-right:0.5rem;border-top:solid 1px #e7e7e7;bottom:0;}
|
||||
.shareBox ul:before{height:0;}
|
||||
.shareBox .list-block .item-media img{width:2.3rem;height:2.3rem;}
|
||||
.shareBox .list-block .item-title{font-size:0.75rem;line-height:1.2rem;}
|
||||
.shareBox .list-block .item-title em{color:#F18D00;}
|
||||
.shareBox .button{top:0.5rem;}
|
||||
.shareBox .icon-close{width:10px;height:10px;background:url(../images/icon-close.png) no-repeat center center;background-size:100%;position:absolute;top:0.25rem;right:0.25rem;}
|
||||
|
||||
/* 出错页面 */
|
||||
.contentError{padding-top:30%;}
|
||||
.contentError img{width:30%;margin:0 auto;}
|
||||
|
||||
Reference in New Issue
Block a user