From 7dfd5afb6a51fadd94ceb2dc5f8b1668c535ab5f Mon Sep 17 00:00:00 2001
From: Marcel Werk <burntime@woltlab.com>
Date: Sun, 21 Aug 2016 22:13:10 +0200
Subject: [PATCH] Fixed context buttons in recent activity box

---
 .../templates/boxRecentActivity.tpl            | 16 ++++++++--------
 com.woltlab.wcf/templates/userProfileLikes.tpl |  2 +-
 .../files/style/layout/containerList.scss      | 16 ++++++++++++++++
 .../install/files/style/layout/content.scss    | 10 ----------
 wcfsetup/install/files/style/layout/print.scss |  2 +-
 .../install/files/style/ui/userProfile.scss    | 18 ------------------
 6 files changed, 26 insertions(+), 38 deletions(-)

diff --git a/com.woltlab.wcf/templates/boxRecentActivity.tpl b/com.woltlab.wcf/templates/boxRecentActivity.tpl
index c488a57f35..ae8012e8a2 100644
--- 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 bf0b8b8b50..3183e9a037 100644
--- 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 5908b2ad55..c5ebccab43 100644
--- 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 62f112c31e..036de4d1a6 100644
--- 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 340707d1cf..a651a61b53 100644
--- 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 5593d79442..e25a9a1bac 100644
--- 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 {
-- 
2.20.1