firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

g5 merge 충돌수정

Browse Source
This commit is contained in:
chicpro
2014-01-03 14:35:35 +09:00
parent 5afc9eab34 b2251d9ea8
commit f26b0c838b
23 changed files with 101 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
css/admin.css
View File

@ -139,8 +139,10 @@ h3 {margin:0 20px}
.btn_confirm02 a {display:inline-block;padding:0 15px;height:30px;background:#617d46;color:#fff;text-decoration:none;line-height:2.5em;vertical-align:middle}
.btn_confirm02 a:focus {background:#555}
.btn_confirm03 {clear:both;margin-top:10px;text-align:right}
.btn_submit {background:#ff3061;cursor:pointer}
.btn_confirm .btn_submit {padding:0 15px;border:0;height:30px;color:#fff}
.btn_cancel {display:inline-block;padding:0 15px;height:30px;border:0;background:#617d46;color:#fff;text-decoration:none;line-height:2.5em;vertical-align:middle}