Commit Graph

231 Commits

Author SHA1 Message Date
sentsin
3e2ad5e063 调整一些小冲突 2016-10-20 16:07:29 +08:00
sentsin
5038eebdf1 微调 2016-10-19 11:11:11 +08:00
sentsin
6dd796985e Merge branch 'master' of https://github.com/sentsin/layui 2016-10-19 11:09:39 +08:00
sentsin
f876e9512d 微调 2016-10-19 11:09:01 +08:00
贤心
5b1087adcb Merge pull request #1 from weianguo/master
解决两处与bootstrap冲突
2016-10-18 15:05:48 +08:00
魏安国
f5e301d4da 解决与bootstrap冲突,造成表单元素加粗 2016-10-18 15:00:41 +08:00
魏安国
85663092ac 解决与bootstrap冲突,造成年份下拉内容超出边界 2016-10-18 14:53:54 +08:00
魏安国
c4b5d37979 Merge pull request #1 from sentsin/master
拉取
2016-10-18 14:48:56 +08:00
sentsin
ed5abbc1bb 1.0.2 2016-10-18 08:35:35 +08:00
sentsin
7666ad6e5e 1.0.2 2016-10-18 08:25:10 +08:00
sentsin
60f2b8cf38 1.0.2 2016-10-18 08:24:37 +08:00
sentsin
0e202895f0 1.0.2 2016-10-18 08:23:17 +08:00
sentsin
e1d19e2e69 update logo 2016-10-17 02:56:47 +08:00
sentsin
377b89abf0 update 2016-10-16 20:32:35 +08:00
sentsin
965651fa5d 1.0.1 2016-10-15 18:04:38 +08:00
sentsin
010de34a3a put right 2016-10-15 18:01:03 +08:00
sentsin
c04b6b24f0 put right 2016-10-15 11:34:03 +08:00
sentsin
eefa3a5ae3 1.0.1 2016-10-15 10:37:24 +08:00
sentsin
9aca6f02f4 1.0.0 2016-10-14 18:22:51 +08:00
sentsin
760a76ea38 remove im-demo.html 2016-10-14 16:43:31 +08:00
sentsin
4fa2804680 add gitignore 2016-10-14 16:38:36 +08:00
sentsin
0fd2305082 remove layim 2016-10-14 16:30:57 +08:00
sentsin
acafbbd309 remove layim 2016-10-14 16:30:27 +08:00
sentsin
5817d10328 1.0.0 2016-10-14 16:23:52 +08:00
sentsin
f82fef5dd5 readme 2016-10-14 16:20:40 +08:00
sentsin
3b7889becd readme 2016-10-14 16:19:17 +08:00
贤心
6338b8f5be delete 2016-10-14 16:16:34 +08:00
贤心
e9d0e1bdb3 Update README.md
update doc
2016-09-13 05:04:02 +08:00
贤心
1496c17e4c Update README.md
update doc
2016-09-13 05:03:17 +08:00
sentsin
87dda532b1 update 2016-01-28 22:17:42 +08:00
sentsin
6c5e227f85 Create README.md 2016-01-10 10:25:37 +08:00