root / chengxiang · 提交

转到一个项目

作者 王晓刚
提交 6beec89c920200029e9b63628499536ed6dc689e 2 个父辈 f846a0a6 9a9a5cc5

Merge branch 'master' of http://114.215.101.231:8099/root/chengxiang

内嵌 并排对比
正在显示 2 个修改的文件 包含 13 行增加 和 6 行删除
@@ -14,6 +14,11 @@ @@ -14,6 +14,11 @@
14 <!--<script type="text/javascript" src="__TMPL__/public/assets/assets/js/jquery-2.1.0.js"></script>--> 14 <!--<script type="text/javascript" src="__TMPL__/public/assets/assets/js/jquery-2.1.0.js"></script>-->
15 <link rel="stylesheet" href="__TMPL__/public/assets/assets/css/jquery-weui.css"> 15 <link rel="stylesheet" href="__TMPL__/public/assets/assets/css/jquery-weui.css">
16 <title>{$title}</title> 16 <title>{$title}</title>
  17 + <style>
  18 + .title{
  19 + margin: 0rem 0 0 0;
  20 + }
  21 + </style>
17 </head> 22 </head>
18 <body> 23 <body>
19 24
@@ -891,7 +891,7 @@ @@ -891,7 +891,7 @@
891 } 891 }
892 } 892 }
893 .toolbar .toolbar-inner { 893 .toolbar .toolbar-inner {
894 - height: 2.2rem; 894 + height: 1.2rem;
895 display: -webkit-box; 895 display: -webkit-box;
896 display: -ms-flexbox; 896 display: -ms-flexbox;
897 display: flex; 897 display: flex;
@@ -904,7 +904,7 @@ @@ -904,7 +904,7 @@
904 padding: 0; 904 padding: 0;
905 font-size: .35rem; 905 font-size: .35rem;
906 font-weight: normal; 906 font-weight: normal;
907 - line-height: 2.2rem; 907 + line-height: 1.2rem;
908 color: #3d4145; 908 color: #3d4145;
909 text-align: center; 909 text-align: center;
910 white-space: nowrap; 910 white-space: nowrap;
@@ -913,8 +913,8 @@ @@ -913,8 +913,8 @@
913 position: absolute; 913 position: absolute;
914 right: 0; 914 right: 0;
915 box-sizing: border-box; 915 box-sizing: border-box;
916 - height: 2.2rem;  
917 - line-height: 2.2rem; 916 + height: 1.2rem;
  917 + line-height: 1.2rem;
918 color: #04BE02; 918 color: #04BE02;
919 z-index: 1; 919 z-index: 1;
920 padding: 0 .5rem; 920 padding: 0 .5rem;
@@ -930,7 +930,7 @@ @@ -930,7 +930,7 @@
930 color: #3d4145; 930 color: #3d4145;
931 -webkit-transition-duration: .3s; 931 -webkit-transition-duration: .3s;
932 transition-duration: .3s; 932 transition-duration: .3s;
933 - height: 8rem; 933 + height: 9rem;
934 background: #EFEFF4; 934 background: #EFEFF4;
935 -webkit-transform: translate3d(0, 100%, 0); 935 -webkit-transform: translate3d(0, 100%, 0);
936 transform: translate3d(0, 100%, 0); 936 transform: translate3d(0, 100%, 0);
@@ -979,6 +979,7 @@ @@ -979,6 +979,7 @@
979 width: 14rem; 979 width: 14rem;
980 } 980 }
981 .weui-picker-modal .picker-items { 981 .weui-picker-modal .picker-items {
  982 + margin-top:-30px;
982 display: -webkit-box; 983 display: -webkit-box;
983 display: -ms-flexbox; 984 display: -ms-flexbox;
984 display: flex; 985 display: flex;
@@ -1060,7 +1061,8 @@ @@ -1060,7 +1061,8 @@
1060 position: absolute; 1061 position: absolute;
1061 left: 0; 1062 left: 0;
1062 width: 100%; 1063 width: 100%;
1063 - top: 32%; 1064 +
  1065 + top: 50%;
1064 margin-top: -16px; 1066 margin-top: -16px;
1065 pointer-events: none; 1067 pointer-events: none;
1066 } 1068 }