Fixed context buttons in recent activity box

diff --git a/com.woltlab.wcf/templates/boxRecentActivity.tpl b/com.woltlab.wcf/templates/boxRecentActivity.tpl
index c488a57f354d77e4366b12fb3fc974517d3e585c..ae8012e8a2e4ab03199addbf12d89701c87f39f9 100644 (file)
--- a/com.woltlab.wcf/templates/boxRecentActivity.tpl
+++ b/com.woltlab.wcf/templates/boxRecentActivity.tpl
@@ -1,20 +1,20 @@
 <section class="section sectionContainerList dashboardBoxRecentActivity" id="dashboardBoxRecentActivity">
        <header class="sectionHeader">
                <h2 class="sectionTitle">{lang}wcf.user.recentActivity{/lang}</h2>
-               
+       </header>
+       
+       {assign var='__events' value=$eventList->getObjects()}
+       {assign var='__lastEvent' value=$__events|end}
+       <ul id="recentActivities" class="containerList recentActivityList" data-last-event-time="{@$lastEventTime}" data-last-event-id="{if $__lastEvent}{@$__lastEvent->eventID}{else}0{/if}">
                {if $canFilterByFollowedUsers}
-                       <nav class="jsMobileNavigation buttonGroupNavigation jsOnly jsRecentActivitySwitchContext">
+                       <li class="containerListButtonGroup jsOnly jsRecentActivitySwitchContext">
                                <ul class="buttonGroup">
                                        <li><a href="#" class="button small{if !$filteredByFollowedUsers} active{/if}">{lang}wcf.user.recentActivity.scope.all{/lang}</a></li>
                                        <li><a href="#" class="button small{if $filteredByFollowedUsers} active{/if}">{lang}wcf.user.recentActivity.scope.followedUsers{/lang}</a></li>
                                </ul>
-                       </nav>
+                       </li>
                {/if}
-       </header>
-       
-       {assign var='__events' value=$eventList->getObjects()}
-       {assign var='__lastEvent' value=$__events|end}
-       <ul id="recentActivities" class="containerList recentActivityList" data-last-event-time="{@$lastEventTime}" data-last-event-id="{if $__lastEvent}{@$__lastEvent->eventID}{else}0{/if}">
+               
                {include file='recentActivityListItem'}
        </ul>
 </section>

diff --git a/com.woltlab.wcf/templates/userProfileLikes.tpl b/com.woltlab.wcf/templates/userProfileLikes.tpl
index bf0b8b8b50528204e8ce994364c7cab7f519330d..3183e9a037ab358ea937dc8c6d04ad1f3d49c21d 100644 (file)
--- a/com.woltlab.wcf/templates/userProfileLikes.tpl
+++ b/com.woltlab.wcf/templates/userProfileLikes.tpl
@@ -18,7 +18,7 @@
 </script>
 
 <ul id="likeList" class="containerList recentActivityList likeList" data-last-like-time="{@$lastLikeTime}">
-       <li class="likeTypeSelection">
+       <li class="containerListButtonGroup likeTypeSelection">
                <ul class="buttonGroup" id="likeType">
                        <li><a class="button small active" data-like-type="received">{lang}wcf.like.likesReceived{/lang}</a></li>
                        <li><a class="button small" data-like-type="given">{lang}wcf.like.likesGiven{/lang}</a></li>

diff --git a/wcfsetup/install/files/style/layout/containerList.scss b/wcfsetup/install/files/style/layout/containerList.scss
index 5908b2ad55eadabf804a535f9c93cacc9a9e972d..c5ebccab43b91d1961e632c06d8632af6ed82da9 100644 (file)
--- a/wcfsetup/install/files/style/layout/containerList.scss
+++ b/wcfsetup/install/files/style/layout/containerList.scss
@@ -49,6 +49,22 @@
                }
        }
        
+       &.containerListButtonGroup {
+               text-align: right;
+               
+               &:hover {
+                       background-color: transparent;
+               }
+               
+               > .buttonGroup {
+                       display: inline-flex;
+                       
+                       &:not(:first-child) {
+                               margin-left: 5px;
+                       }
+               }
+       }
+       
        @include screen-md-down {
                .hasMobileNavigation > .containerHeadline > h3 {
                        padding-right: 30px;

diff --git a/wcfsetup/install/files/style/layout/content.scss b/wcfsetup/install/files/style/layout/content.scss
index 62f112c31e0fe537048fd572fa19ec23474fdbcd..036de4d1a6c4dca1054b52eab73c4f1a8a6054ae 100644 (file)
--- a/wcfsetup/install/files/style/layout/content.scss
+++ b/wcfsetup/install/files/style/layout/content.scss
@@ -130,16 +130,6 @@
                margin-top: 0;
        }
        
-       .sectionHeader {
-               position: relative;
-               
-               .buttonGroupNavigation {
-                       position: absolute;
-                       right: 0;
-                       top: 4px;
-               }
-       }
-       
        .sectionTitle {
                color: $wcfContentHeadlineText;
                

diff --git a/wcfsetup/install/files/style/layout/print.scss b/wcfsetup/install/files/style/layout/print.scss
index 340707d1cff815d931ddd8ecf7af25697cd68e01..a651a61b53b0c9c0c444fabfcad2c4ead59494aa 100644 (file)
--- a/wcfsetup/install/files/style/layout/print.scss
+++ b/wcfsetup/install/files/style/layout/print.scss
@@ -51,7 +51,7 @@
        /* user profile */
        .userProfileCoverPhoto,
        .userProfileButtonContainer,
-       .likeTypeSelection {
+       .containerListButtonGroup {
                display: none !important;
        }
        

diff --git a/wcfsetup/install/files/style/ui/userProfile.scss b/wcfsetup/install/files/style/ui/userProfile.scss
index 5593d79442ac00be04ff2a7845454dc9057d1f2f..e25a9a1bac2dfd468509486abcb4feff8f8a85f9 100644 (file)
--- a/wcfsetup/install/files/style/ui/userProfile.scss
+++ b/wcfsetup/install/files/style/ui/userProfile.scss
@@ -138,24 +138,6 @@
        }
 }
 
-.likeList {
-       > .likeTypeSelection {
-               text-align: right;
-               
-               &:hover {
-                       background-color: transparent;
-               }
-               
-               > .buttonGroup {
-                       display: inline-flex;
-                       
-                       &:not(:first-child) {
-                               margin-left: 5px;
-                       }
-               }
-       }
-}
-
 /* using `dl` + `.inlineDataList` to prevent styles applied to the
    data list provided by the `userInformation` template */
 .userProfilePreview dl.inlineDataList {