fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-22 05:15:29 +09:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' of github.com:xpressengine/xe-core into develop

Browse source
This commit is contained in:
bnu 2015-07-07 17:39:22 +09:00
commit a8317de256
3 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
layouts/xedition/css/layout.css
View file

@ -918,7 +918,7 @@ a:hover, a:active, a:focus {
background-color: rgba(0, 0, 0, 0.2); background-color: rgba(0, 0, 0, 0.2);
cursor: pointer; cursor: pointer;
} }
.pagination { .swiper-pagination {
position: absolute; position: absolute;
left: 0; left: 0;
text-align: center; text-align: center;

5
layouts/xedition/js/layout.js
View file

@ -127,6 +127,11 @@
}); });
} }
// Login help, warning
$("#warning").on('click', function(e){
$(this).css('display', 'none');
});
// Scroll to top // Scroll to top
var scrollToTop = function() { var scrollToTop = function() {
var link = $('.btn_top'); var link = $('.btn_top');

7
layouts/xedition/layout.html
View file

@ -1,5 +1,5 @@
<!--// META --> <!--// META -->
{Context::addHtmlHeader('<meta name="viewport" content="width=device-width, user-scalable=no">')} {Context::addHtmlHeader('<meta name="viewport" content="width=device-width, user-scalable=yes">')}
<!--// LANG --> <!--// LANG -->
<load target="./lang" /> <load target="./lang" />
@ -346,7 +346,7 @@
</div> </div>
<!-- END:슬라이드 --> <!-- END:슬라이드 -->
<!-- Add Pagination --> <!-- Add Pagination -->
<div class="pagination"></div> <div class="swiper-pagination"></div>
<div class="swiper-button left"><button type="button" class="swiper-button-prev"><i class="xi-angle-left"></i></button></div> <div class="swiper-button left"><button type="button" class="swiper-button-prev"><i class="xi-angle-left"></i></button></div>
<div class="swiper-button right"><button type="button" class="swiper-button-next"><i class="xi-angle-right"></i></button></div> <div class="swiper-button right"><button type="button" class="swiper-button-next"><i class="xi-angle-right"></i></button></div>
</div> </div>
@ -477,6 +477,7 @@
<span class="checkbox"></span> {$lang->keep_signed} <span class="checkbox"></span> {$lang->keep_signed}
</label> </label>
<div id="warning"> <div id="warning">
<p style="text-align:right;"><i class="xi-close"></i></p>
<p>{str_replace('\n\n', '<br />', $lang->about_keep_signed)}</p> <p>{str_replace('\n\n', '<br />', $lang->about_keep_signed)}</p>
<div class="edge"></div> <div class="edge"></div>
</div> </div>
@ -529,7 +530,7 @@ jQuery(document).ready(function () {
var swiper = new Swiper('.swiper-container', { var swiper = new Swiper('.swiper-container', {
autoplay: 6000, autoplay: 6000,
loop: true, loop: true,
pagination: '.pagination', pagination: '.swiper-pagination',
paginationClickable: true paginationClickable: true
}); });
jQuery('.swiper-button-next').on('click', function(e){ jQuery('.swiper-button-next').on('click', function(e){