From 6b52f0570ddb5ebf88c43aa0e4875f0359a948c3 Mon Sep 17 00:00:00 2001 From: whitedot Date: Wed, 7 Jul 2021 16:34:10 +0900 Subject: [PATCH 1/5] =?UTF-8?q?UI=20:=20=EC=B5=9C=EC=8B=A0=EA=B8=80=20?= =?UTF-8?q?=EC=8A=A4=ED=82=A8=20=EC=8A=A4=ED=83=80=EC=9D=BC=EC=8B=9C?= =?UTF-8?q?=ED=8A=B8=EC=97=90=EC=84=9C=20=EC=A4=91=EB=B3=B5=EB=90=98?= =?UTF-8?q?=EB=8A=94=20=EC=86=8D=EC=84=B1=EA=B0=92=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- skin/latest/basic/style.css | 2 +- theme/basic/skin/latest/basic/style.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/skin/latest/basic/style.css b/skin/latest/basic/style.css index 5e7edc809..7abc3fb45 100644 --- a/skin/latest/basic/style.css +++ b/skin/latest/basic/style.css @@ -7,7 +7,7 @@ .lat ul {padding:10px 0} .lat li {position:relative;line-height:18px;border-bottom:1px solid #e5ecee;margin-bottom:10px} -.lat li a {line-height:24px;font-weight:bold;font-size:1.2em;line-height:20px;vertical-align:middle} +.lat li a {font-weight:bold;font-size:1.2em;line-height:20px;vertical-align:middle} .lat li a:hover {color:#3a8afd} .lat li .fa-heart {color:#ff0000} .lat li .fa-lock {display:inline-block;line-height:14px;width:16px;font-size:0.833em;color:#4f818c;background:#cbe3e8;text-align:center;border-radius:2px;font-size:12px;border:1px solid #cbe3e8;vertical-align:middle} diff --git a/theme/basic/skin/latest/basic/style.css b/theme/basic/skin/latest/basic/style.css index 5e7edc809..7abc3fb45 100644 --- a/theme/basic/skin/latest/basic/style.css +++ b/theme/basic/skin/latest/basic/style.css @@ -7,7 +7,7 @@ .lat ul {padding:10px 0} .lat li {position:relative;line-height:18px;border-bottom:1px solid #e5ecee;margin-bottom:10px} -.lat li a {line-height:24px;font-weight:bold;font-size:1.2em;line-height:20px;vertical-align:middle} +.lat li a {font-weight:bold;font-size:1.2em;line-height:20px;vertical-align:middle} .lat li a:hover {color:#3a8afd} .lat li .fa-heart {color:#ff0000} .lat li .fa-lock {display:inline-block;line-height:14px;width:16px;font-size:0.833em;color:#4f818c;background:#cbe3e8;text-align:center;border-radius:2px;font-size:12px;border:1px solid #cbe3e8;vertical-align:middle} From c9fb4ff9d141cd89182189359810c44b479fb311 Mon Sep 17 00:00:00 2001 From: whitedot Date: Wed, 7 Jul 2021 16:46:06 +0900 Subject: [PATCH 2/5] =?UTF-8?q?UI=20:=20=EC=98=B5=EC=85=98=20=EC=97=86?= =?UTF-8?q?=EB=8A=94=20=EC=83=81=ED=92=88=EC=97=90=EC=84=9C=20=EC=88=98?= =?UTF-8?q?=EB=9F=89=20=EB=B3=80=EA=B2=BD=ED=95=A0=20=EB=95=8C=20UI=20?= =?UTF-8?q?=EC=9D=BC=EA=B4=80=EB=90=98=EA=B2=8C=20=ED=91=9C=EC=8B=9C?= =?UTF-8?q?=EB=90=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/shop.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/shop.js b/js/shop.js index f1281f4c3..da9dbba88 100644 --- a/js/shop.js +++ b/js/shop.js @@ -480,7 +480,7 @@ function price_calculate() } }); - $("#sit_tot_price").empty().html("총 금액 : "+number_format(String(total))+"원"); + $("#sit_tot_price").empty().html("총 금액 :"+number_format(String(total))+" 원"); $("#sit_tot_price").trigger("price_calculate", [total]); } From b8223d440931e5f258710be71dda90588daf1de8 Mon Sep 17 00:00:00 2001 From: loves2tu Date: Wed, 19 Jan 2022 06:16:31 +0000 Subject: [PATCH 3/5] =?UTF-8?q?=EA=B5=AC=EA=B8=80=20=ED=8C=90=EB=A7=A4?= =?UTF-8?q?=EC=9E=90=EC=84=BC=ED=84=B0=20=ED=94=BC=EB=93=9C=20=20-=20?= =?UTF-8?q?=EC=83=81=ED=92=88=20adult=20=EA=B4=80=EB=A0=A8=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shop/price/google_feed.php | 1 + 1 file changed, 1 insertion(+) diff --git a/shop/price/google_feed.php b/shop/price/google_feed.php index 642a97e2a..19b6b7bef 100644 --- a/shop/price/google_feed.php +++ b/shop/price/google_feed.php @@ -78,6 +78,7 @@ for ($i = 0; $row = sql_fetch_array($result); $i++) { $adult = "no"; foreach($cate_array as $key => $var) { + if(empty($var)) continue; if(in_array(1, $category_adult_array[$var])) { $adult = "yes"; } From ff74503bac1807b39cb4a61688bba44ece7c3385 Mon Sep 17 00:00:00 2001 From: seeoya Date: Mon, 24 Jan 2022 14:16:30 +0900 Subject: [PATCH 4/5] =?UTF-8?q?#155=20=EB=B2=84=ED=8A=BC=20=EC=8A=A4?= =?UTF-8?q?=ED=83=80=EC=9D=BC=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/default.css | 2 +- css/default_shop.css | 2 +- theme/basic/css/default.css | 2 +- theme/basic/css/default_shop.css | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/css/default.css b/css/default.css index 23aac5b1b..b32a453e0 100644 --- a/css/default.css +++ b/css/default.css @@ -272,7 +272,7 @@ a.btn_close {text-align:center;line-height:50px} a.btn_cancel {display:inline-block;background:#969696;color:#fff;text-decoration:none;vertical-align:middle} button.btn_cancel {display:inline-block;background:#969696;color:#fff;text-decoration:none;vertical-align:middle} .btn_cancel:hover {background:#aaa} -a.btn_frmline, button.btn_frmline {display:inline-block;padding:0 25px;height:40px;border:0;background:#434a54;border-radius:3px;color:#fff;text-decoration:none;vertical-align:top} /* 우편번호검색버튼 등 */ +a.btn_frmline, button.btn_frmline {display:inline-block;width:128px;padding:0 5px;height:40px;border:0;background:#434a54;border-radius:3px;color:#fff;text-decoration:none;vertical-align:top} /* 우편번호검색버튼 등 */ a.btn_frmline {} button.btn_frmline {font-size:1em} diff --git a/css/default_shop.css b/css/default_shop.css index a06fefcf4..1324ab663 100644 --- a/css/default_shop.css +++ b/css/default_shop.css @@ -329,7 +329,7 @@ a.btn_close {text-align:center;line-height:50px} a.btn_cancel {display:inline-block;background:#969696;color:#fff;text-decoration:none;vertical-align:middle} button.btn_cancel {display:inline-block;background:#969696;color:#fff;text-decoration:none;vertical-align:middle} .btn_cancel:hover {background:#aaa} -a.btn_frmline, button.btn_frmline {display:inline-block;padding:0 25px;height:40px;border:0;background:#434a54;border-radius:3px;color:#fff;text-decoration:none;vertical-align:top} /* 우편번호검색버튼 등 */ +a.btn_frmline, button.btn_frmline {display:inline-block;width:128px;padding:0 5px;height:40px;border:0;background:#434a54;border-radius:3px;color:#fff;text-decoration:none;vertical-align:top} /* 우편번호검색버튼 등 */ a.btn_frmline {} button.btn_frmline {font-size:1em} a.btn_frmline {line-height:24px} diff --git a/theme/basic/css/default.css b/theme/basic/css/default.css index ea1ff09d6..334b0b3c0 100644 --- a/theme/basic/css/default.css +++ b/theme/basic/css/default.css @@ -273,7 +273,7 @@ a.btn_close {text-align:center;line-height:50px} a.btn_cancel {display:inline-block;background:#969696;color:#fff;text-decoration:none;vertical-align:middle} button.btn_cancel {display:inline-block;background:#969696;color:#fff;text-decoration:none;vertical-align:middle} .btn_cancel:hover {background:#aaa} -a.btn_frmline, button.btn_frmline {display:inline-block;padding:0 25px;height:40px;border:0;background:#434a54;border-radius:3px;color:#fff;text-decoration:none;vertical-align:top} /* 우편번호검색버튼 등 */ +a.btn_frmline, button.btn_frmline {display:inline-block;width:128px;padding:0 5px;height:40px;border:0;background:#434a54;border-radius:3px;color:#fff;text-decoration:none;vertical-align:top} /* 우편번호검색버튼 등 */ a.btn_frmline {} button.btn_frmline {font-size:1em} diff --git a/theme/basic/css/default_shop.css b/theme/basic/css/default_shop.css index 3a2ada3ef..c29301c5e 100644 --- a/theme/basic/css/default_shop.css +++ b/theme/basic/css/default_shop.css @@ -329,7 +329,7 @@ a.btn_close {text-align:center;line-height:50px} a.btn_cancel {display:inline-block;background:#969696;color:#fff;text-decoration:none;vertical-align:middle} button.btn_cancel {display:inline-block;background:#969696;color:#fff;text-decoration:none;vertical-align:middle} .btn_cancel:hover {background:#aaa} -a.btn_frmline, button.btn_frmline {display:inline-block;padding:0 25px;height:40px;border:0;background:#434a54;border-radius:3px;color:#fff;text-decoration:none;vertical-align:top} /* 우편번호검색버튼 등 */ +a.btn_frmline, button.btn_frmline {display:inline-block;width:128px;padding:0 5px;height:40px;border:0;background:#434a54;border-radius:3px;color:#fff;text-decoration:none;vertical-align:top} /* 우편번호검색버튼 등 */ a.btn_frmline {} button.btn_frmline {font-size:1em} a.btn_frmline {line-height:24px} From 95964e3aec02c7ed2c0458e2be8f7cfde5ef1b80 Mon Sep 17 00:00:00 2001 From: seeoya Date: Wed, 2 Mar 2022 14:08:48 +0900 Subject: [PATCH 5/5] =?UTF-8?q?G5-40=20=EB=8B=A4=EC=9D=8C=20=EC=87=BC?= =?UTF-8?q?=ED=95=91=ED=95=98=EC=9A=B0=20URL=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/shop_admin/price.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adm/shop_admin/price.php b/adm/shop_admin/price.php index 067852bba..55859ca11 100644 --- a/adm/shop_admin/price.php +++ b/adm/shop_admin/price.php @@ -44,7 +44,7 @@ $pg_anchor = '