standard weui select gap (#328)

* standard weui select gap * replace weui cell snapshot
Tencent · Apr 18, 2016 · 14ee030 · 14ee030
1 parent aeccf03
commit 14ee030
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 14 deletions.
diff --git a/dist/example/index.html b/dist/example/index.html
@@ -412,7 +412,7 @@ <h1 class="page_title">Cell</h1>
         </div>
         <div class="weui_cell weui_cell_select weui_select_after">
             <div class="weui_cell_hd">
-                国家/地区
+                <label for="" class="weui_label">国家/地区</label>
             </div>
             <div class="weui_cell_bd weui_cell_primary">
                 <select class="weui_select" name="select2">

diff --git a/dist/example/snapshot/cell.png b/dist/example/snapshot/cell.png
diff --git a/dist/style/weui.css b/dist/style/weui.css
diff --git a/dist/style/weui.min.css b/dist/style/weui.min.css
diff --git a/src/example/fragment/cell.html b/src/example/fragment/cell.html
@@ -272,7 +272,7 @@ <h1 class="page_title">Cell</h1>
         </div>
         <div class="weui_cell weui_cell_select weui_select_after">
             <div class="weui_cell_hd">
-                国家/地区
+                <label for="" class="weui_label">国家/地区</label>
             </div>
             <div class="weui_cell_bd weui_cell_primary">
                 <select class="weui_select" name="select2">

diff --git a/src/example/snapshot/cell.png b/src/example/snapshot/cell.png
diff --git a/src/style/base/variable/weui_cell.less b/src/style/base/variable/weui_cell.less
@@ -6,6 +6,7 @@
 @weuiCellHeight: 44px;
 @weuiCellFontSize:17px;
 @weuiCellTipsFontSize:14px;
+@weuiCellLabelWidth:105px;
 
 @weuiCellLineHeight: unit((@weuiCellHeight - 2 * @weuiCellGapV) / @weuiCellFontSize); // 高度为44px，减去上下padding的行高
 @weuiCellsMarginTop:unit(20 / @weuiCellFontSize, em);
diff --git a/src/style/widget/weui_cell/weui_form/weui_form_common.less b/src/style/widget/weui_cell/weui_form/weui_form_common.less
@@ -2,7 +2,7 @@
 
 .weui_label{
   display:block;
-  width:3em;
+  width:@weuiCellLabelWidth;
 }
 .weui_input {
     width: 100%;
@@ -60,9 +60,6 @@
         color:@globalWarnColor;
         .weui_icon_warn{display:inline-block;}
     }
-    .weui_cell_hd {
-        padding-right: .3em;
-    }
     .weui_cell_ft{font-size:0;}
     .weui_icon_warn{
         display:none;

diff --git a/src/style/widget/weui_cell/weui_form/weui_select.less b/src/style/widget/weui_cell/weui_form/weui_select.less
@@ -29,6 +29,7 @@
     width: 100%;
     font-size: inherit;
     height: @weuiCellHeight;
+    line-height: @weuiCellHeight;
     position: relative;
     z-index: 1;
     padding-left: @weuiCellGapH;

diff --git a/src/style/widget/weui_cell/weui_form/weui_select_after.less b/src/style/widget/weui_cell/weui_form/weui_select_after.less
@@ -3,4 +3,7 @@
 
 .weui_select_after {
     padding-left:@weuiCellGapH;
+    .weui_select {
+        padding-left:0;
+    }
 }
diff --git a/src/style/widget/weui_cell/weui_form/weui_select_before.less b/src/style/widget/weui_cell/weui_form/weui_select_before.less
@@ -3,7 +3,10 @@
 
 .weui_select_before {
     padding-right:@weuiCellGapH;
-    .weui_select{width:auto;}
+    .weui_select {
+        width:@weuiCellLabelWidth;
+        box-sizing: border-box;
+    }
     .weui_cell_hd {
         position:relative;
         &:after {