From: Joshua Rüsweg <josh@bastelstu.be>
Date: Sun, 9 Sep 2018 11:21:20 +0000 (+0200)
Subject: Remove button view from reaction summary list
X-Git-Tag: 5.2.0_Alpha_1~674^2~1
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f7ab933b3a3d64d12999778b7839e6b4570978c3;p=GitHub%2FWoltLab%2FWCF.git

Remove button view from reaction summary list
See #2508
---

diff --git a/com.woltlab.wcf/templates/reactionSummaryList.tpl b/com.woltlab.wcf/templates/reactionSummaryList.tpl
index f9108f15f9..8a70bae2fb 100644
--- a/com.woltlab.wcf/templates/reactionSummaryList.tpl
+++ b/com.woltlab.wcf/templates/reactionSummaryList.tpl
@@ -2,7 +2,7 @@
 	<ul class="reactionSummaryList{if $isTiny|isset && $isTiny} reactionSummaryListTiny{/if} jsOnly" data-object-type="{$objectType}" data-object-id="{$objectID}">
 		{if $reactionData[$objectID]|isset && $reactionData[$objectID]->getReactions()|is_array}
 			{foreach from=$reactionData[$objectID]->getReactions() key=reactionTypeID item=reaction}
-				<li class="reactCountButton jsTooltip" data-reaction-type-id="{$reactionTypeID}" title="{lang}wcf.reactions.summary.listReactions{/lang}">{@$reaction[renderedReactionIcon]} <span class="reactionCount">{$reaction[reactionCount]|shortUnit}</span></li>
+				<li class="reactCountButton jsTooltip" data-reaction-type-id="{$reactionTypeID}" title="{lang}wcf.reactions.summary.listReactions{/lang}"><span class="reactionCount">{$reaction[reactionCount]|shortUnit}</span> {@$reaction[renderedReactionIcon]}</li>
 			{/foreach}
 		{/if}
 	</ul>
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Reaction/CountButtons.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Reaction/CountButtons.js
index b1be5b74a5..c8673d98c1 100644
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Reaction/CountButtons.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Reaction/CountButtons.js
@@ -130,7 +130,6 @@ define(
 						// create element 
 						var createdElement = elCreate('li');
 						createdElement.className = 'reactCountButton';
-						createdElement.innerHTML = REACTION_TYPES[key].renderedIcon + ' '; 
 						elData(createdElement, 'reaction-type-id', key);
 						
 						var countSpan = elCreate('span');
@@ -138,6 +137,8 @@ define(
 						countSpan.innerHTML = StringUtil.shortUnit(data[key]);
 						createdElement.appendChild(countSpan);
 						
+						createdElement.innerHTML = createdElement.innerHTML + REACTION_TYPES[key].renderedIcon;
+						
 						summaryList.appendChild(createdElement);
 						
 						this._initReactionCountButton(createdElement, objectId);
diff --git a/wcfsetup/install/files/style/ui/reactions.scss b/wcfsetup/install/files/style/ui/reactions.scss
index 622950087d..6be622e99b 100644
--- a/wcfsetup/install/files/style/ui/reactions.scss
+++ b/wcfsetup/install/files/style/ui/reactions.scss
@@ -26,8 +26,14 @@
 }
 
 img.reactionType {
-	width: 16px;
-	height: 16px;
+	width: 24px;
+	height: 24px;
+}
+
+.reactionSummaryList {
+	span.reactionCount::after {
+		content: ' × ';
+	}
 }
 
 .reactionPopoverContent {
@@ -85,14 +91,12 @@ img.reactionType {
 
 li.reactCountButton {
 	display: inline;
-	padding: 10px;
+	padding: 5px;
 	cursor: pointer;
-	background-color: $wcfSidebarBackground;
 	color: $wcfContentDimmedText;
 }
 
 li.reactCountButton:hover {
-	background-color: darken($wcfSidebarBackground, 5);
 	color: $wcfContentText;
 }