From: Marcel Werk <burntime@woltlab.com>
Date: Fri, 12 Feb 2016 11:53:44 +0000 (+0100)
Subject: Fixed margins in recent activity list
X-Git-Tag: 3.0.0_Beta_1~2030^2~89
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9305f3f9947eefd6e0ab7130314cf0fdd89b2d30;p=GitHub%2FWoltLab%2FWCF.git

Fixed margins in recent activity list
---

diff --git a/com.woltlab.wcf/templates/recentActivityListItem.tpl b/com.woltlab.wcf/templates/recentActivityListItem.tpl
index 34f36fb4e8..a6be32e527 100644
--- a/com.woltlab.wcf/templates/recentActivityListItem.tpl
+++ b/com.woltlab.wcf/templates/recentActivityListItem.tpl
@@ -9,12 +9,12 @@
 						<a href="{link controller='User' object=$event->getUserProfile()}{/link}" class="userLink" data-user-id="{@$event->getUserProfile()->userID}">{$event->getUserProfile()->username}</a>
 						<small class="separatorLeft">{@$event->time|time}</small>
 					</h3> 
-					<p>{@$event->getTitle()}</p>
+					<div>{@$event->getTitle()}</div>
 					<small class="containerContentType">{lang}wcf.user.recentActivity.{@$event->getObjectTypeName()}{/lang}</small>
 				</div>
 				
-				<div>{@$event->getDescription()}</div>
+				<div class="containerContent">{@$event->getDescription()}</div>
 			</div>
 		</div>
 	</li>
-{/foreach}
\ No newline at end of file
+{/foreach}
diff --git a/com.woltlab.wcf/templates/userProfileLikeItem.tpl b/com.woltlab.wcf/templates/userProfileLikeItem.tpl
index bd2e8e5ce1..791320e9a3 100644
--- a/com.woltlab.wcf/templates/userProfileLikeItem.tpl
+++ b/com.woltlab.wcf/templates/userProfileLikeItem.tpl
@@ -9,12 +9,12 @@
 						<a href="{link controller='User' object=$like->getUserProfile()}{/link}" class="userLink" data-user-id="{@$like->getUserProfile()->userID}">{$like->getUserProfile()->username}</a>
 						<small class="separatorLeft">{@$like->time|time}</small>
 					</h3> 
-					<p>{@$like->getTitle()}</p>
+					<div>{@$like->getTitle()}</div>
 					<small class="containerContentType">{lang}wcf.like.objectType.{@$like->getObjectTypeName()}{/lang}</small>
 				</div>
 				
-				<div>{@$like->getDescription()}</div>
+				<div class="containerContent">{@$like->getDescription()}</div>
 			</div>
 		</div>
 	</li>
-{/foreach}
\ No newline at end of file
+{/foreach}
diff --git a/wcfsetup/install/files/style/layout/content.scss b/wcfsetup/install/files/style/layout/content.scss
index 79f4ef721e..4d644e75fe 100644
--- a/wcfsetup/install/files/style/layout/content.scss
+++ b/wcfsetup/install/files/style/layout/content.scss
@@ -29,14 +29,6 @@
 			> li:not(:last-child) {
 				margin-right: 10px;
 			}
-			
-			.labelList {
-				display: inline-flex;
-				
-				.label {
-					top: -1px;
-				}
-			}
 		}
 		
 		> li {
diff --git a/wcfsetup/install/files/style/ui/label.scss b/wcfsetup/install/files/style/ui/label.scss
index 333e1d127a..9abd5ca74c 100644
--- a/wcfsetup/install/files/style/ui/label.scss
+++ b/wcfsetup/install/files/style/ui/label.scss
@@ -3,6 +3,8 @@
 .labelList {
 	@extend .inlineList;
 	
+	display: inline-flex;
+	
 	> li {
 		&:not(:first-child) {
 			.label {
@@ -19,6 +21,10 @@
 				border-bottom-right-radius: 0;
 			}
 		}
+		
+		.label {
+			top: -1px;
+		}
 	}
 }