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

g5 merge 충돌 수정

Browse Source
This commit is contained in:
chicpro
2013-12-06 13:46:31 +09:00
parent 506640908b ad5a5327d6
commit 21b7c12dd8
21 changed files with 83 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
css/default.css
View File

@ -15,6 +15,7 @@ input, button {margin:0;padding:0;font-family:dotum;font-size:1em}
button {cursor:pointer}
textarea, select {font-family:dotum;font-size:1em}
select {margin:0}
p {margin:0;padding:10px 0;line-height:1.7em;word-break:break-all}
hr {display:none}
pre {overflow-x:scroll;font-size:1.1em}
@ -41,6 +42,12 @@ a:hover, a:focus, a:active {color:#000;text-decoration:underline}
#tnb a:focus, #tnb a:hover, #tnb a:active {text-decoration:none}
#tnb img {margin-right:3px}
/* 텍스트 크기 조절 */
#text_size {position:absolute;top:21px;left:340px;margin:0 0 10px;letter-spacing:-3px}
#text_size button {margin:0;padding:2px 2px 1px;border:1px solid #c3c6ca;background:transparent;vertical-align:middle;cursor:pointer}
.ts_up {font-size:1.167em !important}
.ts_up2 {font-size:1.3em !important}
/* gnb js off */
#gnb {position:relative;margin:-1px 0 0;border-top:1px dotted #dde4e9;border-bottom:1px solid #dde4e9;background:#ecf0f7}
#gnb h2 {position:absolute;font-size:0;line-height:0;overflow:hidden}
@ -75,16 +82,10 @@ a:hover, a:focus, a:active {color:#000;text-decoration:underline}
#aside {float:right;margin:0 0 0 -1px;width:210px;border-left:1px solid #dde4e9;background:#fff}
#container {z-index:4;position:relative;float:left;padding:25px 16px 15px 15px;width:728px;min-height:500px;height:auto !important;height:500px;border-right:1px solid #dde4e9;background:#fff;font-size:1em;zoom:1}
#container {z-index:4;position:relative;float:left;padding:15px 16px 15px 15px;width:728px;min-height:500px;height:auto !important;height:500px;border-right:1px solid #dde4e9;background:#fff;font-size:1em;zoom:1}
#container:after {display:block;visibility:hidden;clear:both;content:""}
#container_title {margin-bottom:20px;font-size:1.2em;font-weight:bold}
/* 텍스트 크기 조절 */
#text_size {position:absolute;top:-33px;left:-1px;letter-spacing:-3px}
#text_size button {margin:0;padding:0;border:0;background:transparent;vertical-align:middle;cursor:pointer}
.ts_up {font-size:1.167em !important}
.ts_up2 {font-size:1.3em !important}
/* 하단 레이아웃 */
#ft {min-width:970px;border-top:1px solid #dde4e9;background:#f2f5f9}
#ft h1 {position:absolute;font-size:0;line-height:0;overflow:hidden}
@ -189,19 +190,12 @@ a.btn_admin:focus, a.btn_admin:hover {text-decoration:none}
.tbl_frm01 table {width:100%;border-collapse:collapse;border-spacing:0}
.tbl_frm01 th {width:100px;padding:7px 13px;border:1px solid #e9e9e9;border-left:0;background:#f5f8f9;text-align:left}
.tbl_frm01 td {padding:7px 10px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;background:transparent}
.tbl_frm01 textarea, .tbl_frm01 .frm_input {height:22px;border:1px solid #b8c9c2;background:#f7f7f7;color:#000;vertical-align:middle;line-height:2em}
.tbl_frm01 textarea, .frm_input {height:22px;border:1px solid #e4eaec;background:#f7f7f7;color:#000;vertical-align:middle;line-height:2em}
.tbl_frm01 textarea {width:98%;height:100px}
/*
.tbl_frm01 #captcha {margin:0;padding:0;border:0;background:transparent}
.tbl_frm01 #captcha input {margin-left:5px;text-align:center}
*/
.tbl_frm01 a {text-decoration:none}
.tbl_frm01 .frm_info {display:block;padding:0 0 5px;line-height:1.4em}
.tbl_frm01 .frm_address {display:block;margin-top:5px}
.tbl_frm01 .frm_file {display:block;margin-bottom:5px}
fieldset .frm_input {height:22px;border:1px solid #b8c9c2;background:#f7f7f7;color:#000;vertical-align:middle;line-height:2em}
.tbl_frm01 .frm_info {display:block;padding:0 0 5px;line-height:1.4em}
/* 자료 없는 목록 */
.empty_table {padding:50px 0 !important;text-align:center}

18
css/mobile.css
View File

@ -14,6 +14,7 @@ input, button {margin:0;padding:0;font-size:1em}
input[type=text], input[type=password], input[type=submit], input[type=image], button {border-radius:0;font-size:1em;-webkit-appearance:none}
textarea, select {font-size:1em}
textarea {border-radius:0;-webkit-appearance:none}
select {margin:0}
p {margin:0;padding:1em 0;line-height:1.7em;word-break:break-all}
hr {display:none}
pre {overflow-x:scroll;font-size:1.1em}
@ -76,28 +77,25 @@ a:hover, a:focus, a:active {color:#000;text-decoration:underline}
/* 텍스트 크기 조절 */
#text_size {margin:0 0 10px;text-align:center}
#text_size button {margin:0;padding:0;border:0;background:transparent;vertical-align:middle}
#text_size button {margin:0;padding:2px 2px 1px;border:1px solid #c3c6ca;background:transparent;vertical-align:middle}
.ts_up {font-size:1.167em !important}
.ts_up2 {font-size:1.3em !important}
/* 하단 레이아웃 */
#gnb {border-top:1px solid #c3c7c5;border-bottom:1px solid #c3c7c5;background:#f0f4f8}
#gnb {border-top:1px solid #dde4e9;border-bottom:1px solid #dde4e9;background:#f0f4f8}
#gnb:after {display:block;visibility:hidden;clear:both;content:""}
#gnb h2 {width:0;height:0;font-size:0;line-height:0;overflow:hidden}
#gnb ul {border-top:1px solid #e7f1ed}
#gnb li {float:left;width:25%;border-bottom:1px solid #e7f1ed}
#gnb li {float:left;margin:0 0 -1px;width:25%;border-bottom:1px solid #dde4e9}
#gnb li ul {display:none}
#gnb li a {display:block;padding:10px 0;border-right:1px solid #e7f1ed;color:#000;text-align:center;text-decoration:none}
.gnb_empty {float:none !important;padding:30px 0;width:100% !important;text-align:center}
#ft {background:#484848}
#ft {;border-top:1px solid #dde4e9;background:#f2f5f9}
#ft h1 {width:0;height:0;font-size:0;line-height:0;overflow:hidden}
#ft img {display:none}
#ft_copy {background:#232323}
#ft_copy p {position:relative;padding:10px;color:#4a9ab8}
#ft_copy {background:#414141}
#ft_copy p {position:relative;padding:10px;color:#fff}
#ft_copy b {color:#fff}
#ft_copy a {color:#fff;text-decoration:none}
@ -163,7 +161,7 @@ a.btn_admin:focus, a.btn_admin:hover {text-decoration:none}
.tbl_frm01 {}
.tbl_frm01 th {padding:10px 0;width:90px;border:1px solid #e9e9e9;border-left:0;text-align:left}
.tbl_frm01 td {padding:10px 5px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;background:transparent}
.tbl_frm01 textarea, .frm_input {border:1px solid #b8c9c2;background:#f7f7f7;vertical-align:middle;line-height:1.8em;-webkit-appearance:none}
.tbl_frm01 textarea, .frm_input {border:1px solid #e4eaec;background:#f7f7f7;vertical-align:middle;line-height:1.8em;-webkit-appearance:none}
.tbl_frm01 textarea {width:100%;height:100px}
.tbl_frm01 a {text-decoration:none}
.tbl_frm01 .frm_address {display:block;margin-top:5px}