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

g4s merge 충돌 수정

Browse Source
This commit is contained in:
chicpro
2013-06-11 11:50:52 +09:00
parent ee4d8330bd ee6cf60767
commit 97f186cfb1
7 changed files with 96 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
css/admin.css
View File

@ -75,7 +75,6 @@ h2 {font-size:1.2em}
#qnb {float:right;margin:0;padding:0;list-style:none}
#qnb li {margin-bottom:20px}
#qnb a {display:block;width:40px;font-size:0.9em;text-align:center;letter-spacing:-0.1em}
#qnb a:focus, #qnb a:hover, #qnb a:active {text-decoration:none}
@ -319,8 +318,7 @@ strong.sodr_nonpay {display:block;padding:5px 0;text-align:right}
#anc_pricecompare_engine dt a {font-weight:bold}
#anc_pricecompare_engine dd {margin:0 0 30px}
#anc_pricecompare_engine li {margin:5px 0}
#anc_pricecompare_engine li {margin:5px 0}
/* 화면낭독기 사용자용 */
#hd_login_msg {position:absolute;top:0;left:0;width:1px;height:1px;overflow:hidden}
@ -476,8 +474,9 @@ td {padding:8px 5px 6px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9
#point_mng {margin-top:50px}
/* 회원메일발송 목록 */
.td_test, .td_send {width:50px;text-align:center}
.td_mng {width:110px;text-align:center}
.td_smallmng {width:60px;text-align:center}
.td_mng {width:100px;text-align:center}
.td_smallmng {width:50px;text-align:center}
/* 투표관리 목록 */
.td_etc {width:80px;text-align:center}
/* 게시판관리 목록 */
@ -566,6 +565,15 @@ td {padding:8px 5px 6px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9
.sv_on {display:block !important;position:absolute;top:10px;left:20px;width:auto;height:auto !important}
.sv_nojs .sv {display:block}
/* 셀렉트 스타일 UL */
.sel_wrap {position:relative;width:100px}
.sel_btn {width:100px;height:25px;border:1px solid #000;background:#333;color:#fff}
.sel_ul {display:none;position:absolute;top:10px;right:-20px;margin:0;padding:0;width:88px;border:1px solid #999;border-bottom:0;background:#fff;list-style:none}
.sel_on {display:block;z-index:2}
.sel_li {border-bottom:1px solid #999}
.sel_a {display:block;height:23px;text-align:center;line-height:2em !important;line-height:1.9em}
.sel_a:focus, .sel_a:hover {background:#f5f6fa;text-decoration:none}
/* pagination */
.pg_wrap {clear:both;margin:0 0 20px;padding-top:20px;text-align:center}
.pg {display:inline-block;border:1px solid #ddd;letter-spacing:-4px}