From: Alexander Ebert Date: Wed, 24 Aug 2016 10:08:45 +0000 (+0200) Subject: Added support for pagination bottom X-Git-Tag: 3.0.0_Beta_1~532 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a6b83753d0a199b55c2a7e401b43b91ac3774186;p=GitHub%2FWoltLab%2FWCF.git Added support for pagination bottom --- diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Message/Reply.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Message/Reply.js index 722c486b79..d16fa10947 100644 --- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Message/Reply.js +++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Message/Reply.js @@ -280,9 +280,14 @@ define(['Ajax', 'Core', 'EventHandler', 'Language', 'Dom/ChangeListener', 'Dom/U elementId = DomUtil.identify(this._container.nextElementSibling); } else { + var insertBefore = this._container; + if (insertBefore.previousElementSibling && insertBefore.previousElementSibling.classList.contains('messageListPagination')) { + insertBefore = insertBefore.previousElementSibling; + } + //noinspection JSUnresolvedVariable - DomUtil.insertHtml(data.returnValues.template, this._container, 'before'); - elementId = DomUtil.identify(this._container.previousElementSibling); + DomUtil.insertHtml(data.returnValues.template, insertBefore, 'before'); + elementId = DomUtil.identify(insertBefore.previousElementSibling); } // update last post time diff --git a/wcfsetup/install/files/style/ui/message.scss b/wcfsetup/install/files/style/ui/message.scss index e0bd88b562..1f5ce953c1 100644 --- a/wcfsetup/install/files/style/ui/message.scss +++ b/wcfsetup/install/files/style/ui/message.scss @@ -1,14 +1,14 @@ .messageList { &:not(.messageReducedList) { @include screen-md-up { - border-bottom: 1px solid $wcfContentBorder; border-top: 1px solid $wcfContentBorder; > li { + border-bottom: 1px solid $wcfContentBorder; padding: 30px 0; - &:not(:last-child) { - border-bottom: 1px solid $wcfContentBorder; + &.messageListPagination:last-child { + border-bottom-width: 0; } } }