g4s merge 충돌 수정

This commit is contained in:
chicpro
2013-05-29 09:06:13 +09:00
104 changed files with 10830 additions and 654 deletions

View File

@ -2,7 +2,7 @@
/* 초기화 */
html {overflow-y:scroll}
body {margin:0;padding:0;background:#f5f6fa;font-size:0.75em;font-family:"dotum"}
body {margin:0;padding:0;background:#f5f6fa;color:#000;font-size:0.75em;font-family:"dotum"}
html, h1, h2, h3, h4, h5, h6, form, fieldset, img {margin:0;padding:0;border:0}
h1, h2, h3, h4, h5, h6 {font-size:1em;font-family:"dotum"}
article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section {display:block}