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-05-29 09:06:13 +09:00
parent 93848e4819 b1dcfd185c
commit 158eccb534
104 changed files with 10830 additions and 654 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
css/admin.css
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}

2
css/default.css
View File

@ -2,7 +2,7 @@
/* 초기화 */
html {overflow-y:scroll}
body {margin:0;padding:0;background:#f9fafe;font-size:0.75em;font-family:"dotum"}
body {margin:0;padding:0;background:#f9fafe;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}

16
css/mobile.css
View File

@ -2,22 +2,14 @@
/* 초기화 */
html {overflow-y:scroll}
body {margin:0;padding:0;background:#fff;color:#000;font-size:1em;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}
header ul, nav ul, footer ul {margin:0;padding:0;list-style:none}
<<<<<<< HEAD
label, input, select, img {vertical-align:middle}
input {margin:0;padding:0;border-radius:0;font-family:"dotum"}
button {border-radius:0;font-size:1em;font-family:"dotum"}
input[type=text],
input[type=password],
input[type=submit],
input[type=image],
button {border-radius:0 !important;font-size:1em} /* 모바일에서만 사용 */
p {margin:0;padding:10px 0;line-height:1.7em;word-break:break-all}
=======
legend {position:absolute;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden}
label, input, select, img {vertical-align:middle}
input,button {margin:0;padding:0}
@ -25,7 +17,7 @@ input[type=text], input[type=password], input[type=submit], input[type=image], b
select, textarea {font-size:1em}
textarea {border-radius:0;-webkit-appearance:none}
p {margin:0;padding:1em 0;line-height:1.7em;word-break:break-all}
>>>>>>> g4s
hr {display:none}
pre {overflow-x:scroll;font-size:1.1em}
a:link,