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:
chicpro
2013-09-04 09:19:54 +09:00
parent 0d16cefbd0 305a5d7db9
commit 2288c87a9b
29 changed files with 336 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
css/admin.css
View File

@ -27,21 +27,16 @@ h2 {font-size:1.2em}
#hd h1, #hd h2 {position:absolute;font-size:0;line-height:0;overflow:hidden}
#hd_wrap {z-index:11;position:relative;margin:0 auto;width:1000px}
#logo {position:relative;height:70px}
#logo img {position:absolute;top:15px;left:0}
#logo img {position:absolute;top:13px;left:0}
#tnb {z-index:2;position:absolute;top:1px;right:0;zoom:1}
#tnb {z-index:2;position:absolute;top:20px;right:0;zoom:1}
#tnb:after {display:block;visibility:hidden;clear:both;content:""}
#tnb {float:right;margin:0;padding:0;zoom:1}
#tnb:after {display:block;visibility:hidden;clear:both;content:""}
#tnb li {float:left}
#tnb a {display:block;position:relative;width:68px;height:68px;color:#e0e0e0;font-size:0.95em;text-decoration:none}
#tnb li {float:left;margin:0 0 0 1px}
#tnb a {display:block;position:relative;padding:0 15px;height:33px;background:#383a3f;color:#e0e0e0;text-decoration:none;line-height:2.8em}
#tnb a:focus, #tnb a:hover {background:#fff;color:#383a3f}
#tnb span {position:absolute;bottom:10px;left:0;width:100%;text-align:center}
#tnb_modify {background:url('../adm/img/tnb_modify.jpg')}
#tnb_chome_cf {background:url('../adm/img/tnb_chome_cf.jpg')}
#tnb_chome {background:url('../adm/img/tnb_chome.jpg')}
#tnb_shome_cf {background:url('../adm/shop_admin/img/tnb_shome_cf.jpg')}
#tnb_shome {background:url('../adm/shop_admin/img/tnb_shome.jpg')}
#tnb_logout {background:url('../adm/img/tnb_logout.jpg')}
/* gnb js off */
#gnb {z-index:12;background:#383a3f}
@ -65,28 +60,24 @@ h2 {font-size:1.2em}
.gnb_js .gnb_1dli_on a {float:none;background:#fff;color:#000}
.gnb_js .gnb_2dul {display:none;position:absolute;top:35px}
.gnb_js .gnb_2dli a {display:inline-block;float:none !important;padding:0 10px;width:161px;text-align:left}
.gnb_js .gnb_2dli a:focus, .gnb_js .gnb_2dli a:hover {background:#484848;color:#fff}
.gnb_1dli_over .gnb_2dul {display:block;left:-1px;width:181px;border:1px solid #c3c7c5;border-top:0;background:#fff}
.gnb_1dli_over2 .gnb_2dul {display:block;right:-1px;width:181px;border:1px solid #c3c7c5;border-top:0;background:#fff}
.gnb_js .gnb_grp_style {background:#f7f7f7 !important}
.gnb_js .gnb_grp_style:focus, .gnb_js .gnb_grp_style:hover {background:#484848 !important}
.gnb_js .gnb_grp_div {border-top:1px solid #eee}
/* 중간 레이아웃 */
#wrapper {z-index:5;margin:30px auto;width:1000px;min-height:630px;height:auto !important;height:630px;zoom:1}
#wrapper:after {display:block;visibility:hidden;clear:both;content:""}
#qnb {float:right;margin:0;padding:0;list-style:none}
#qnb li {margin-bottom:20px}
#qnb a {display:block;width:40px;font-size:0.95em;text-align:center;letter-spacing:-0.1em}
#qnb a:focus, #qnb a:hover, #qnb a:active {text-decoration:none}
#qnb img {margin-bottom:5px}
#container {z-index:4;position:relative;float:left;width:942px}
#container {z-index:4;position:relative}
/* 텍스트 크기 조절 */
#text_size {position:absolute;top:0;right:0}
#text_size button {padding:0 10px;height:30px;background:#000;color:#fff;cursor:pointer}
#text_size button {padding:0 10px;height:30px;border:0;background:#000;color:#fff;cursor:pointer}
/* 하단 레이아웃 */
#ft {margin:20px 0;padding:5px 0;border-top:1px solid #d0d6d8}
@ -471,7 +462,7 @@ thead th input {vertical-align:top} /* middle 로 하면 게시판 읽기에서
thead a {color:#fff}
tfoot th {border-top:1px solid #666;border-bottom:1px solid #666;background:#484848;color:#fff}
tfoot td {border-color:#666;background:#484848;color:#fff;font-weight:bold;text-align:center}
td {padding:8px 5px 6px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;line-height:1.5em;word-break:break-all}
td {padding:8px 5px 6px;border:1px solid #e9e9e9;line-height:1.5em;word-break:break-all}
.bo_sideview td {padding:6px 4px} /* 사이드뷰 사용하는 테이블 셀 패딩값 */
/* 내용 없는 테이블 */
.empty_table {padding:100px 0;text-align:center}
@ -558,7 +549,9 @@ td {padding:8px 5px 6px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9
.tr_bg {background:#f5f6fa}
.td_addr {text-align:left !important}
.td_boolean {width:50px;text-align:center}
.td_chk {width:30px;text-align:center}
.td_smallstat {width:50px;text-align:center}
.td_num {width:60px;text-align:center}
.td_smallnum {width:40px;text-align:center}
@ -579,7 +572,6 @@ td {padding:8px 5px 6px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9
.td_payby {width:80px;text-align:center}
.td_postal {width:60px;text-align:center}
.td_bigpostal {width:140px;text-align:center}
.td_tdiv {border-bottom:1px solid #c9c9c9 !important}
.txt_true {color:#e8180c}
.txt_false {color:#ccc}