iFish/Light12306
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge css

Browse Source
This commit is contained in:
SilenceLeo 2014-09-02 19:19:02 +08:00
parent 6863909cc7
commit 586556757b
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Mobile12306New/css/css.css
View File

@ -437,23 +437,19 @@ input[type=radio]:checked:after{content:''; display:block; width:12px; height:12
/*.passed_list li.passed_end:after{width:12px; height:12px; border:#fa8c13 solid 1px; background:#fa8c13; box-shadow:inset 1px 1px 0 #FFF,inset -1px -1px 0 #FFF,inset 1px -1px 0 #FFF,inset -1px 1px 0 #FFF; border-radius:50%; left:0; top:50%; margin:-7px 0 0 -22px;}*/
.passed_list li.passed_end:after{width:11px; height:11px; border:#FFF solid 1px; background:#fa8c13; box-shadow:0 0 1px #fa8c13; border-radius:50%; left:0; top:50%; margin:-7px 0 0 -22px;}
<<<<<<< HEAD
.order_list{padding:15px;}
.order_list li{background:#FFF; box-shadow:0 0 5px rgba(0,0,0,.2); margin-bottom:15px;}
.order_list li .order_info{padding:0 10px; line-height:2em;}
.order_ticket{text-align:center; font-size:1.25rem; color:#000; line-height:2em;}
.order_fn{ font-size:1.25rem; line-height:2.1em; padding:0 10px; background:#f9f9f9; position:relative;}
.order_fn .btn{vertical-align:middle; margin:-5px 0 0 5px;}
=======
.delivered{ position:absolute; width:55px; height:55px; right:10px; bottom:10px; background:url(../images/pay.png) no-repeat; background-size:cover;}
@media(width:320px) {
.search_input{font-size: .775rem}
}
>>>>>>> 223c57b7fcaa2d97fe17dffa971ba325167e9af1
.delivered{ position:absolute; width:55px; height:55px; right:10px; bottom:10px; background:url(../images/pay.png) no-repeat; background-size:cover;}