forgetest5
/
bee-table7
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge

This commit is contained in:
yangchch6 2019-04-26 09:40:56 +08:00
parent e85e352698
commit a0b295eb67
5 changed files with 60 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
demo/index.js
View File

File diff suppressed because one or more lines are too long

4
dist/demo.css vendored
View File

@ -670,16 +670,12 @@
padding-top: 0px; padding-top: 0px;
padding-bottom: 0px; } padding-bottom: 0px; }
<<<<<<< HEAD
.demo0501 .u-table .u-row-hover .opt-btns button { .demo0501 .u-table .u-row-hover .opt-btns button {
border-radius: 5px; } border-radius: 5px; }
.demo0501 .u-table .u-row-hover .opt-btns button:first-child { .demo0501 .u-table .u-row-hover .opt-btns button:first-child {
margin-right: 10px; } margin-right: 10px; }
.demo0501 .u-table .u-table-row td { .demo0501 .u-table .u-table-row td {
=======
.demo0502 .u-table-row td {
>>>>>>> master
padding: 5px 8px; } padding: 5px 8px; }
.demo0501 .u-table .u-table-row td input { .demo0501 .u-table .u-table-row td input {
font-size: 12px; font-size: 12px;

6
dist/demo.css.map vendored
View File

File diff suppressed because one or more lines are too long

118
dist/demo.js vendored
View File

File diff suppressed because one or more lines are too long

6
dist/demo.js.map vendored
View File

File diff suppressed because one or more lines are too long