From 0cae72796945354c93055781bd5ae3031c007e78 Mon Sep 17 00:00:00 2001 From: whitedot Date: Mon, 14 Jan 2013 10:47:12 +0900 Subject: [PATCH 1/4] =?UTF-8?q?merge=20=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- head.sub.php | 9 --------- 1 file changed, 9 deletions(-) diff --git a/head.sub.php b/head.sub.php index a3f8393a0..380996e3a 100644 --- a/head.sub.php +++ b/head.sub.php @@ -1,10 +1,7 @@ >>>>>> 43c0282f463b6fd895a835ca3e71da6b0844328c $begin_time = get_microtime(); if (!isset($g4['title'])) @@ -53,15 +50,9 @@ header("Pragma: no-cache"); // HTTP/1.0 <?=$g4['title']?> -<<<<<<< HEAD -"> - -"> -======= "> "> ->>>>>>> 43c0282f463b6fd895a835ca3e71da6b0844328c "> From 0ce3006c134433544fcc652714d529d7c49c7f4b Mon Sep 17 00:00:00 2001 From: whitedot Date: Mon, 14 Jan 2013 13:07:49 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20=EC=95=84?= =?UTF-8?q?=EC=9B=83=EB=A1=9C=EA=B7=B8=EC=9D=B8=EC=8A=A4=ED=82=A8=20?= =?UTF-8?q?=EC=9E=91=EC=97=85=20=EC=A4=91,=20adm/img=20=EB=B3=B5=EA=B5=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/img/logo.png | Bin 0 -> 1475 bytes adm/img/logo_bg.png | Bin 0 -> 420 bytes adm/img/top_bg.png | Bin 0 -> 146 bytes css/default.css | 10 +++++----- 4 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 adm/img/logo.png create mode 100644 adm/img/logo_bg.png create mode 100644 adm/img/top_bg.png diff --git a/adm/img/logo.png b/adm/img/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..f95a9f3709a9ba77d7558012a4b4f3323404c75e GIT binary patch literal 1475 zcmV;!1w8tRP)%Dmcq^LSNVgVQdRe3_n_?&|vL{no27*4k{Dnko7HKTWJy1|s-r zBBZP!Xzw**NFayrxkAgcF2cn3%(DxL#y(R+8%%F;u?-2o3S) zD#C$8LRx#53I55%5N(ZIKZv2DC_q9(jK>HkLEY}QT_)@${7ksTxDAr)U|2{cW)f6z zKq0k}S9`cm>h9F@1;V$4n?P^@yrwN9W)ic6Tu954dc4o1e48UYMfgLITLf|{F(ZHh zR+Apu783iA@JK~*(m9n^nb=KGORthPkJt;k>mf1e7~Fj?RY=OUZG`O*M(zmqC^1PY z6i`DpR)9ymn5crYj0wUh^#4S-z-s5lsd4`s!kIK!Vt-4i6(wqg!8JzAK)UoyBB@Ej zY4|=0WcP^vS#})jnM}qS@hIUNC6h5lU~(8(2U+YsQ*iAP;V)(Nn}jD4NPR3wVY>j? zgp<@1OVE-19EiELi}0OLMI%!xnKd{i1kk z+AStEBZxJ@nfL%(6OKUJH4H1NUS_{v3sS1Yq>b%@mrb!6j>1Y_QEbYx+99zC#l1Tz zz6=r@=SAwZeIg1yOH$J^c7MGR`Wj+#YXYljnAlv&gjSSng;JW+lpjRVXGv;BBp%EN zH8~h~fy)TqVmm>J#MG!Ba5TNN6QXjZN-RVyC2s6wHC+kMj#XS;b{p6)pn8Q8>vH!- zA-5mm#yrQOd06osU~_f8cUo*Ss%S0@9akzlq-K~Dmf#jN`$CDy!+3S*lTgejq^6)tWs0#D&WY1soXW+4^^g93H88pe4n?!?+G6eju5WH zD*A2Bi>&4&32NuYd7p4CPzi3wD#5aNgB4u&{Yj<9eu*XO0_1NXb$`#7N=A^2y8b%e zl}mzd>>mlgDz*Cs#l_oL?Or=b7=!|itaqT=%7HO=Yb(U?7)kCbtn&P#IB{ufUNDs1 zYo~^tNQFuxW&@M6Vw*G&+Rg`vwUz6#ZBiGpEbBgV@@f!US&dW{k!CImu(5GNr6E+PN`002ovPDHLkV1j~hsQ3T? literal 0 HcmV?d00001 diff --git a/adm/img/logo_bg.png b/adm/img/logo_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..8b5c19f66a972712345405c53b59f3ac85bad810 GIT binary patch literal 420 zcmV;V0bBlwP)SlpR?2*VK?z_o#^}&2mM8;w*>E zNtVCbMlh+@^MOTinkhh(9KbnBv%YJQrH1ZF#8Hx3SI0@;Jy|E|@ahn$-TymX2fA)!xV~7NnF4r(l+5 zTQN#wHd|{9UfVWiAsB-(_#eE>c-`*@2YsK}J$7QX?+m#BBa9IL0t^6v7Jvm?0o88+ O0000|6H_V+Po~-c6`6RtIEGZ*O1gB>Jn_-9XK6_(DG5ml2b%sf8}jY^|Nr9A te~V8THf7AXQ7<6vDJvzvLQdfT!~0VLug~NM76SD%c)I$ztaD0e0sx-XGi3k( literal 0 HcmV?d00001 diff --git a/css/default.css b/css/default.css index eb022d291..85a7056e8 100644 --- a/css/default.css +++ b/css/default.css @@ -117,7 +117,7 @@ a {color:#000;text-decoration:none} #ol_submit {position:absolute;top:42px;right:12px;width:60px;height:24px;border:1px solid #b7b7b7;background:#fff;font-size:1em;font-weight:bold;letter-spacing:-0.1em;line-height:2em} /* 아웃로그인 후 */ #ol_after {width:219px;color:#000;font-size:0.75em} -#ol_after_hd {padding:15px 0 13px;border-bottom:1px solid #efeada;text-align:center} +#ol_after_hd {padding:15px 0 13px;border-bottom:1px solid #ddd;text-align:center} #ol_after_hd a {color:#ff3061} #ol_after ul {margin:0;padding:0;zoom:1} #ol_after ul:after {display:block;visibility:hidden;clear:both;content:""} @@ -125,11 +125,11 @@ a {color:#000;text-decoration:none} #ol_after_rec {background:#fff} #ol_after_rec a {display:inline-block;position:relative;width:60px;height:60px;vertical-align:top} #ol_after_rec span {position:absolute;top:0;left:0;width:100%;height:100%;background:#fff} -#ol_after_rec strong {position:absolute;top:35px;left:0;width:100%;color:#777;text-align:center} -#ol_after_rec #ol_after_pt {width:97px;border-right:1px solid #efeada;border-left:1px solid #efeada} -#ol_after_ft {border-top:1px solid #efeada;text-align:center} +#ol_after_rec strong {position:absolute;top:35px;left:0;width:100%;text-align:center} +#ol_after_rec #ol_after_pt {width:97px;border-right:1px solid #ddd;border-left:1px solid #ddd} +#ol_after_ft {border-top:1px solid #ddd;text-align:center} #ol_after_ft a {display:inline-block;padding:7px 0 !important;text-align:center} -#ol_after_info {width:109px;border-right:1px solid #efeada} +#ol_after_info {width:109px;border-right:1px solid #ddd} #ol_after_logout {width:109px} /* 설문조사 */