From cd71e1142f99f2094bc7ab537c5dac3a808e1962 Mon Sep 17 00:00:00 2001 From: dlehdanakf Date: Tue, 7 Jul 2015 13:46:21 +0900 Subject: [PATCH 1/2] =?UTF-8?q?XEDITION=20=EB=A0=88=EC=9D=B4=EC=95=84?= =?UTF-8?q?=EC=9B=83=20.pagination=20=EB=B6=80=EB=B6=84=EC=9D=84=20.swiper?= =?UTF-8?q?-pagination=20=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- layouts/xedition/css/layout.css | 2 +- layouts/xedition/layout.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/layouts/xedition/css/layout.css b/layouts/xedition/css/layout.css index 714b7955b..9944a21b0 100644 --- a/layouts/xedition/css/layout.css +++ b/layouts/xedition/css/layout.css @@ -918,7 +918,7 @@ a:hover, a:active, a:focus { background-color: rgba(0, 0, 0, 0.2); cursor: pointer; } -.pagination { +.swiper-pagination { position: absolute; left: 0; text-align: center; diff --git a/layouts/xedition/layout.html b/layouts/xedition/layout.html index 4d2b9c91b..751748857 100644 --- a/layouts/xedition/layout.html +++ b/layouts/xedition/layout.html @@ -346,7 +346,7 @@ - +
@@ -529,7 +529,7 @@ jQuery(document).ready(function () { var swiper = new Swiper('.swiper-container', { autoplay: 6000, loop: true, - pagination: '.pagination', + pagination: '.swiper-pagination', paginationClickable: true }); jQuery('.swiper-button-next').on('click', function(e){ From 8c317aa81b22e7fab203df104b2f9624605f8ad2 Mon Sep 17 00:00:00 2001 From: dlehdanakf Date: Tue, 7 Jul 2015 15:38:07 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=ED=99=95=EB=8C=80=20=EA=B0=80=EB=8A=A5?= =?UTF-8?q?=ED=95=98=EB=8F=84=EB=A1=9D=20user-scalable=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20=EB=B0=8F=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=ED=8C=9D?= =?UTF-8?q?=EC=97=85=EC=B0=BD=EC=97=90=20=EB=A1=9C=EA=B7=B8=EC=9D=B8?= =?UTF-8?q?=EC=9C=A0=EC=A7=80=20=EB=B2=84=ED=8A=BC=20=ED=81=B4=EB=A6=AD?= =?UTF-8?q?=EC=8B=9C=20=EB=82=98=ED=83=80=EB=82=98=EB=8A=94=20=EA=B2=BD?= =?UTF-8?q?=EA=B3=A0=EC=B0=BD=20=EB=AA=A8=EB=B0=94=EC=9D=BC=20=EB=8C=80?= =?UTF-8?q?=EC=9D=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- layouts/xedition/js/layout.js | 5 +++++ layouts/xedition/layout.html | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/layouts/xedition/js/layout.js b/layouts/xedition/js/layout.js index e7cfd8c67..0f9bbabe4 100644 --- a/layouts/xedition/js/layout.js +++ b/layouts/xedition/js/layout.js @@ -126,6 +126,11 @@ time: 3000 }); } + + // Login help, warning + $("#warning").on('click', function(e){ + $(this).css('display', 'none'); + }); // Scroll to top var scrollToTop = function() { diff --git a/layouts/xedition/layout.html b/layouts/xedition/layout.html index 751748857..61ecbed39 100644 --- a/layouts/xedition/layout.html +++ b/layouts/xedition/layout.html @@ -1,5 +1,5 @@ -{Context::addHtmlHeader('')} +{Context::addHtmlHeader('')} @@ -477,6 +477,7 @@ {$lang->keep_signed}
+

{str_replace('\n\n', '
', $lang->about_keep_signed)}