add 在weui_cells_form下的weui_btn_area会有默认的margin-top

omgdba · Oct 14, 2015 · 15605c8 · 15605c8
1 parent ca43c69
commit 15605c8
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 15 deletions.
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/style/base/variable/weui_cell.less b/src/style/base/variable/weui_cell.less
@@ -2,4 +2,6 @@
 @weuiCellBorderColor:#ECECEC;
 @weuiCellGapV:10px;
 @weuiCellGapH:15px;
-@weuiCellInnerGapH:.35em;
+@weuiCellInnerGapH:.35em;
+
+@weuiCellsMarginTop:.8em;
diff --git a/src/style/widget/weui_button/weui_button.less b/src/style/widget/weui_button/weui_button.less
@@ -36,15 +36,13 @@ button, input {
 }
 
 .weui_btn.weui_btn_inline + .weui_btn.weui_btn_inline {
-    margin-top: auto;
     margin-top: auto;
     margin-left: @weuiBtnDefaultGap;
 }
 
 .weui_btn_area {
     margin-left: 15px;
     margin-right: 15px;
-    font-size: 0;
     &.weui_btn_area_inline {
         -webkit-display: flex;
         display: flex;
@@ -57,10 +55,18 @@ button, input {
             &:last-child {
                 margin-right: 0;
             }
-            //hack for IE9
+        }
+
+        // hack for WinPhone7
+        letter-spacing: -1em ~"\9";
+        .weui_btn{
             display: inline-block ~"\9";
             width: 48.5% ~"\9";
-            margin-right: 1.5% ~"\9";
+            margin-right: 3% ~"\9";
+            letter-spacing: 0 ~"\9";
         }
     }
+    .weui_cells_form + & {
+        margin-top: @weuiCellsMarginTop;
+    }
 }
diff --git a/src/style/widget/weui_cell/weui_cell_global.less b/src/style/widget/weui_cell/weui_cell_global.less
@@ -14,7 +14,7 @@
     }
 }
 .weui_cells {
-    margin-top: .8em;
+    margin-top: @weuiCellsMarginTop;
     background-color: @weuiCellBg;
     line-height: 1.45;
     font-size: 16px; //cell中间有效高度23px，跟客户端默认图标尺寸一致
@@ -33,7 +33,7 @@
 }
 
 .weui_cells_title {
-    margin-top: .8em;
+    margin-top: @weuiCellsMarginTop;
     padding-left: @weuiCellGapH;
     padding-right: @weuiCellGapH;
     color: @globalTextColor;