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

merge 충돌 처리

Browse Source
This commit is contained in:
whitedot
2013-06-13 11:31:56 +09:00
parent c0d2b4ca7d
commit 80c20cc73f
36 changed files with 399 additions and 398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
css/admin.css
View File

@ -378,7 +378,6 @@ fieldset .btn_submit:focus {height:21px;background:#555;line-height:1.7em}
.btn_add {margin-bottom:10px;text-align:right}
.btn_add a {display:inline-block;padding:0 15px;height:30px;border:0;background:#ff3061;color:#fff;text-decoration:none;line-height:2.5em;vertical-align:middle}
.btn_add .btn_add_optional {background:#617d46 !important}
/* 필수입력 */
.required {background:url('../img/wrest.gif') #f6f9fa top right no-repeat !important}
@ -424,8 +423,10 @@ fieldset button {padding:0 15px;height:23px;border:0;background:#617d46;color:#f
#sort_mb {width:800px}
#sort_sodr {width:600px}
/* 테이블 */
table {margin-bottom:10px;width:100%;border-collapse:collapse;border-spacing:0}
caption {padding:10px 0 15px;font-weight:bold;text-align:left}
@ -509,8 +510,7 @@ td {padding:8px 5px 6px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9
.visit_bar {position:relative}
.visit_bar span {position:absolute;top:-8px;left:0;height:15px;background:#ddd}
/* 공통 */
.tr_bg {background:#fafeef}
.tr_bg td {border-bottom:1px solid #d8e6b6 !important}
.tr_bg {background:#f5f6fa}
.td_chk {width:30px;text-align:center}
.td_num {width:60px;text-align:center}