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-05 16:34:18 +09:00
parent 3efeae844f 6b7142565e
commit e0d487199a
16 changed files with 91 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
skin/board/basic/style.css
View File

@ -158,7 +158,7 @@ html.no-overflowscrolling #autosave_pop {height:auto;max-height:10000px !importa
/* 게시판 읽기 */
#bo_v {margin-bottom:20px;padding-bottom:20px}
#bo_v_table {position:absolute;top:0;right:15px;margin:0;padding:0 5px;height:25px;background:#565e60;color:#fff;font-weight:bold;line-height:2.2em}
#bo_v_table {position:absolute;top:0;right:16px;margin:0;padding:0 5px;height:25px;background:#ff3061;color:#fff;font-weight:bold;line-height:2.2em}
#bo_v_title {padding:10px 0;font-size:1.2em}
@ -225,7 +225,7 @@ html.no-overflowscrolling #autosave_pop {height:auto;max-height:10000px !importa
#bo_v_sns li {float:left;margin:0 5px 0 0}
/* 게시판 댓글 */
#bo_vc {margin:0 0 20px;padding:20px 20px 10px;border-top:1px solid #cfded8;border-bottom:1px solid #cfded8;background:#f5f6fa}
#bo_vc {margin:0 0 20px;padding:20px 20px 10px;border:1px solid #e5e8ec;background:#f5f8f9}
#bo_vc h2 {margin-bottom:10px}
#bo_vc article {padding:0 0 10px;border-top:1px dotted #ccc}
#bo_vc header {position:relative;padding:15px 0 5px}

4
skin/board/gallery/style.css
View File

@ -151,7 +151,7 @@ html.no-overflowscrolling #autosave_pop {height:auto;max-height:10000px !importa
/* 게시판 읽기 */
#bo_v {margin-bottom:20px;padding-bottom:20px}
#bo_v_table {position:absolute;top:0;right:15px;margin:0;padding:0 5px;height:25px;background:#565e60;color:#fff;font-weight:bold;line-height:2.2em}
#bo_v_table {position:absolute;top:0;right:16px;margin:0;padding:0 5px;height:25px;background:#565e60;color:#fff;font-weight:bold;line-height:2.2em}
#bo_v_title {padding:10px 0;font-size:1.2em}
@ -218,7 +218,7 @@ html.no-overflowscrolling #autosave_pop {height:auto;max-height:10000px !importa
#bo_v_sns li {float:left;margin:0 5px 0 0}
/* 게시판 댓글 */
#bo_vc {margin:0 0 20px;padding:20px 20px 10px;border-top:1px solid #cfded8;border-bottom:1px solid #cfded8;background:#f5f6fa}
#bo_vc {margin:0 0 20px;padding:20px 20px 10px;border:1px solid #e5e8ec;background:#f5f8f9}
#bo_vc h2 {margin-bottom:10px}
#bo_vc article {padding:0 0 10px;border-top:1px dotted #ccc}
#bo_vc header {position:relative;padding:15px 0 5px}

2
skin/latest/basic/style.css
View File

@ -3,7 +3,7 @@
/* 새글 스킨 (latest) */
.lt_pc {float:left;margin-left:20px}
.lt {position:relative;float:left;margin-bottom:20px;padding-bottom:10px;width:354px;height:150px;border-bottom:1px solid #ddd}
.lt {position:relative;float:left;margin-bottom:20px;padding-bottom:10px;width:354px;height:150px;border-bottom:1px solid #e9e9e9}
.lt ul {margin:0 0 10px;padding:0;list-style:none}
.lt li {padding:3px 0}
.lt .lt_title {display:block;padding:10px 0 8px}

25
skin/member/basic/style.css
View File

@ -85,7 +85,7 @@
/* 회원가입 약관 */
#fregister section {margin:0 0 20px;padding:20px 0;border-bottom:3px solid #eee}
#fregister h2 {margin:0 0 20px;text-align:center}
#fregister textarea {display:block;margin-bottom:10px;padding:5px;width:98%;height:150px;border:1px solid #d9d9d9;background:#f7f7f7}
#fregister textarea {display:block;margin-bottom:10px;padding:5px;width:98%;height:150px;border:1px solid #e9e9e9;background:#f7f7f7}
#fregister .fregister_agree {padding:10px 0 0;text-align:right}
#fregister .fregister_agree label {display:inline-block;margin-right:5px}
#fregister p {color:#e8180c;text-align:center}
@ -99,7 +99,7 @@
/* 회원가입 완료 */
#reg_result {padding:50px 0 0}
#reg_result #result_logo {margin-bottom:50px;text-align:center}
#reg_result #result_email {padding:10px 50px;border-top:1px solid #eee;border-bottom:1px solid #eee;background:#fff;line-height:2em}
#reg_result #result_email {padding:10px 50px;border-top:1px solid #e9e9e9;border-bottom:1px solid #dde4e9;background:#fff;line-height:2em}
#reg_result #result_email span {display:inline-block;width:150px}
#reg_result #result_email strong {color:#e8180c;font-size:1.2em}
#reg_result .btn_confirm {margin:50px 0}
@ -118,8 +118,8 @@
#mb_login #login_fs label {letter-spacing:-0.1em}
#mb_login #login_fs .login_id {position:absolute;top:26px;left:95px}
#mb_login #login_fs .login_pw {position:absolute;top:52px;left:95px}
#mb_login #login_fs .frm_input {display:block;margin:0 0 5px 80px}
#mb_login #login_fs .btn_submit {position:absolute;top:20px;left:335px;height:49px}
#mb_login #login_fs .frm_input {display:block;margin:0 0 5px 80px;width:162px}
#mb_login #login_fs .btn_submit {position:absolute;top:20px;right:95px;width:60px;height:53px}
#mb_login #login_info {margin:0 0 30px;padding:20px;border:1px solid #cfded8;background:#f5f6fa}
#mb_login #login_info div {text-align:right}
@ -140,10 +140,7 @@
/* 쪽지 */
#memo_view_contents {margin:0 auto 20px;width:90%}
#memo_view_contents h1 {position:absolute;font-size:0;line-height:0;overflow:hidden}
#memo_view_ul {margin:0;padding:0 0 10px;border-bottom:1px solid #eee;list-style:none}
.memo_view_li {position:relative;padding:5px 0}
.memo_view_subj {display:inline-block;width:65px}
#memo_view_ul a {}
#memo_view section p {padding:10px;min-height:150px;height:auto !important;height:150px;background:#fff}
#memo_write textarea {height:100px}
@ -155,18 +152,18 @@
/* 회원 패스워드 확인 */
#mb_confirm {margin:0 auto;padding:100px 0;width:500px}
#mb_confirm h1 {margin:0 0 20px;font-size:1.3em}
#mb_confirm p {padding:20px;border:1px solid #d9d9d9;border-bottom:0;background:#fff}
#mb_confirm p {padding:20px;border:1px solid #dde4e9;border-bottom:0;background:#fff}
#mb_confirm p strong {display:block}
#mb_confirm fieldset {margin:0 0 30px;padding:30px 0;border:1px solid #d9d9d9;background:#f5f6fa;text-align:center}
#mb_confirm fieldset {margin:0 0 30px;padding:30px 0;border:1px solid #e9e9e9;background:#f5f6fa;text-align:center}
#mb_confirm label {letter-spacing:-0.1em}
#mb_confirm_id {display:inline-block;margin-right:20px;font-weight:bold}
/* 비밀글 패스워드 확인 */
#pw_confirm {margin:0 auto;padding:100px 0;width:500px}
#pw_confirm h1 {margin:0 0 20px;font-size:1.3em}
#pw_confirm p {padding:20px;border:1px solid #d9d9d9;border-bottom:0;background:#fff}
#pw_confirm p {padding:20px;border:1px solid #dde4e9;border-bottom:0;background:#fff}
#pw_confirm p strong {display:block}
#pw_confirm fieldset {margin:0 0 30px;padding:30px 0;border:1px solid #d9d9d9;background:#f5f6fa;text-align:center}
#pw_confirm fieldset {margin:0 0 30px;padding:30px 0;border:1px solid #e9e9e9;background:#f5f6fa;text-align:center}
#pw_confirm label {letter-spacing:-0.1em}
#pw_confirm_id {display:inline-block;margin-right:20px;font-weight:bold}
@ -180,11 +177,11 @@
#profile h2 {margin:0}
/* 우편번호 검색 */
#post_code fieldset {margin:0 auto 10px;padding:15px 10px;width:87%;text-align:center}
#post_code dl {margin:0 auto 10px;padding:20px 10px;width:87%;border-right:1px solid #eee;border-bottom:1px solid #eee;background:#fff}
#post_code fieldset {margin:0 20px 10px;padding:15px 10px;text-align:center}
#post_code dl {margin:0 auto 10px;padding:20px 10px;width:87%;border:1px solid #dde4e9;background:#fff}
#post_code dt {margin-bottom:15px;color:#000}
#post_code dd {margin:0;padding:0}
#post_code ul {margin:0;padding:0;list-style:none}
#post_code li a {display:block;padding:8px 0 6px;border-bottom:1px solid #eee}
#post_code li a {display:block;padding:8px 0 6px;border-bottom:1px solid #}
#post_code p {margin:0 auto 30px;width:90%}
.post_code {display:inline-block;width:50px;color:#999}

1
skin/new/basic/new.skin.php
View File

@ -18,6 +18,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<label for="mb_id" class="sound_only">검색어<strong class="sound_only"> 필수</strong></label>
<input type="text" name="mb_id" value="<?php echo $mb_id ?>" id="mb_id" required class="frm_input required">
<input type="submit" value="검색" class="btn_submit">
<p>회원 아이디만 검색 가능</p>
</form>
<script>
/* 셀렉트 박스에서 자동 이동 해제

2
skin/new/basic/style.css
View File

@ -4,4 +4,4 @@
/* 최근게시물 스킨 (new) */
#new_sch {margin-bottom:10px;text-align:right}
#new_sch legend {position:absolute;margin:0;padding:0;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden}
#new_sch .btn_submit {height:22px}
#new_sch p {padding:5px 0 0;font-size:0.95em;text-align:right;letter-spacing:-0.1em}

7
skin/outlogin/basic/style.css
View File

@ -2,7 +2,7 @@
/* SIR 지운아빠 */
/* 아웃로그인 스킨 */
.ol {position:relative;padding:15px 15px 14px 14px}
.ol {position:relative;padding:15px 15px 14px 14px;border-bottom:1px solid #dde4e9}
.ol h2 {margin:0;padding:0;width:1px;height:1px;font-size:0;line-height:0;overflow:hidden}
.ol ul {margin:0;padding:0;list-style:none}
@ -41,6 +41,5 @@
#ol_after_pt {width:80px;margin-right:1px}
#ol_after_scrap {width:48px;line-height:2.6em !important}
#ol_after_ft {text-align:justify}
#ol_after_ft a {display:inline-block;width:88px;height:22px;background:#333;color:#fff;text-align:center;line-height:1.8em}
#ol_after_ft a:focus,
#ol_after_ft a:hover {text-decoration:none !important}
#ol_after_ft a {display:inline-block;width:88px;height:25px;background:#333;color:#fff;text-align:center;line-height:2.2em}
#ol_after_ft a:focus, #ol_after_ft a:hover {text-decoration:none !important}

23
skin/poll/basic/style.css
View File

@ -38,7 +38,7 @@
/* ### 기본 스타일 커스터마이징 끝 ### */
/* 설문조사 스킨 */
#poll {border-top:1px solid #e7f1ed}
#poll {border-bottom:1px solid #dde4e9}
#poll header {position:relative;padding:15px 14px 0}
#poll h2 {}
#poll header .btn_admin {margin-top:5px;width:158px;text-align:center}
@ -46,13 +46,14 @@
#poll ul {margin:0 0 10px;padding:5px 14px;list-style:none}
#poll li {padding:3px 0}
#poll footer {padding:0 14px 14px}
#poll footer input {width:88px;height:24px;border:0;background:#333;color:#fff;letter-spacing:-0.1em;vertical-align:top;cursor:pointer}
#poll footer a {display:inline-block;width:86px;height:22px;border:1px solid #ccc;background:#fafafa;text-align:center;line-height:2em}
#poll footer a:focus,
#poll footer a:hover {text-decoration:none !important}
#poll footer input {width:88px;height:27px;border:0;background:#333;color:#fff;letter-spacing:-0.1em;vertical-align:top;cursor:pointer}
#poll footer a {display:inline-block;width:86px;height:25px;border:1px solid #ccc;background:#fafafa;text-align:center;line-height:2.2em}
#poll footer a:focus, #poll footer a:hover {text-decoration:none !important}
/* 설문조사 결과 (새창) */
#poll_result section {padding:15px;width:87%;border-right:1px solid #eee;border-bottom:1px solid #eee;background:#fff}
#poll_result {}
#poll_result section {margin:0 20px 20px;padding:15px;border:1px solid #dde4e9;background:#fff}
#poll_result .tbl_wrap {margin:0}
#poll_result h2 {margin:0;padding:20px 0}
#poll_result a {}
#poll_result .sv_member,
@ -71,17 +72,17 @@
#poll_result_list p span {position:absolute;top:5px;right:5%;width:80px;color:#68999c;text-align:right}
.poll_result_graph {position:relative;margin-right:5%;height:5px;background:#eee}
.poll_result_graph span {position:absolute;top:0;left:0;height:5px;background:#565e60;font-size:0.1em}
#poll_result_cmt {margin:0 auto 20px}
#poll_result_cmt {}
#poll_result_cmt h2 {text-align:center}
#poll_result_cmt h3 {margin:0 auto 10px;padding-top:15px;width:93%}
#poll_result_cmt article {margin:0 18px 15px;border-bottom:1px solid #eee}
#poll_result_cmt h1 {margin:0;padding:0;height:0;border:0;font-size:0;line-height:0;overflow:hidden}
#poll_result_cmt h3 {margin:0 0 10px}
#poll_result_cmt article {margin:0 0 15px;border-bottom:1px solid #eee}
#poll_result_cmt h1 {position:absolute;margin:0;padding:0;border:0;font-size:0;text-indent:-9999em;line-height:0;overflow:hidden}
.poll_datetime {display:inline-block;margin-left:10px}
#poll_result_cmt p {padding:3px 0}
#poll_result_cmt fieldset {margin-bottom:0;text-align:left}
#poll_result_cmt fieldset p {margin:0 0 15px;padding:3px 0 0px;text-align:left}
#poll_result_cmt footer {text-align:right}
#poll_result_wcmt {margin-bottom:10px;width:93%}
#poll_result_wcmt {margin:0 0 10px}
.poll_cmt_del a {display:inline-block;padding-bottom:10px}
#poll_result_oth {margin:0 auto 20px;width:93%}
#poll_result_oth h2 {padding:0 0 10px}

11
skin/popular/basic/style.css
View File

@ -2,12 +2,11 @@
/* SIR 지운아빠 */
/* 인기검색어 */
#popular {background:#515151}
#popular div {margin:0 auto;width:980px;zoom:1}
#popular {border-bottom:1px dotted #dde4e9}
#popular div {margin:0 auto;width:970px;zoom:1}
#popular div:after {display:block;visibility:hidden;clear:both;content:""}
#popular h2 {float:left;padding:10px 45px 10px 0;color:#fff}
#popular h2 {float:left;padding:10px 45px 10px 0}
#popular ul {float:left;margin:0;padding:0;list-style:none}
#popular li {float:left}
#popular a {display:inline-block;padding:10px;color:#fff;text-decoration:none}
#popular a:focus,
#popular a:hover {background:#333;color:#fff}
#popular a {display:inline-block;padding:10px;text-decoration:none}
#popular a:focus, #popular a:hover {}

15
skin/visit/basic/style.css
View File

@ -2,13 +2,12 @@
/* SIR 지운아빠 */
/* 방문자 집계 */
#visit {background:#444}
#visit div {margin:0 auto;width:980px;zoom:1}
#visit {border-bottom:1px dotted #dde4e9}
#visit div {margin:0 auto;width:970px;zoom:1}
#visit div:after {display:block;visibility:hidden;clear:both;content:""}
#visit h2 {float:left;padding:10px 45px 10px 0;color:#fff}
#visit h2 {float:left;padding:10px 45px 10px 0}
#visit dl {float:left;margin:0 0 0 10px;padding:0}
#visit dt {float:left;margin:0;padding:10px 0 10px;color:#fff}
#visit dd {float:left;margin:0 30px 0 0;padding:10px;color:#fff}
#visit a {display:inline-block;padding:10px;color:#fff;text-decoration:none}
#visit a:focus,
#visit a:hover {background:#333;color:#fff}
#visit dt {float:left;margin:0;padding:10px 0 10px}
#visit dd {float:left;margin:0 30px 0 0;padding:10px}
#visit a {display:inline-block;padding:10px;text-decoration:none}
#visit a:focus, #visit a:hover {}