Merge branch 'master' of https://github.com/sentsin/layui

wei-shujie · Oct 19, 2016 · 6dd7969 · 6dd7969
2 parents f876e95 + 5b1087a
commit 6dd7969
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/css/layui.css b/src/css/layui.css
@@ -134,7 +134,7 @@ a cite{font-style: normal; *cursor:pointer;}
 
 .layui-form-item{margin-bottom: 15px; clear: both; *zoom: 1;}
 .layui-form-item:after{content:'\20'; clear: both; *zoom: 1; display: block; height:0;}
-.layui-form-label{position: relative; float: left; display: block; padding: 9px 15px;  width: 80px; line-height: 20px; text-align: right;}
+.layui-form-label{position: relative; float: left; display: block; padding: 9px 15px;  width: 80px; font-weight:normal;line-height: 20px; text-align: right;}
 .layui-form-item .layui-inline{margin-bottom: 5px; margin-right: 10px;}
 .layui-input-block, .layui-input-inline{position: relative;}
 .layui-input-block{margin-left: 110px; min-height: 36px;}

diff --git a/src/css/modules/laydate/laydate.css b/src/css/modules/laydate/laydate.css
@@ -9,7 +9,7 @@
 
 #layuicss-laydatecss{display:none; position: absolute; width:1989px;}
 
-.laydate_body .laydate_box, .laydate_body .laydate_box *{margin:0; padding:0;}
+.laydate_body .laydate_box, .laydate_body .laydate_box *{margin:0; padding:0;box-sizing:content-box;}
 .laydate-icon,
 .laydate-icon-default,
 .laydate-icon-danlan,