floraachy/layui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1 from weianguo/master

Browse Source 
解决两处与bootstrap冲突
This commit is contained in:
贤心 2016-10-18 15:05:48 +08:00 committed by GitHub
commit 5b1087adcb
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/css/layui.css
View File

@ -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;}

2
src/css/modules/laydate/laydate.css
View File

@ -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,