From fdcbfcefe7e5c8d90e3317a40d70da4dba782cac Mon Sep 17 00:00:00 2001 From: =?utf8?q?Joshua=20R=C3=BCsweg?= Date: Thu, 27 Sep 2018 22:40:29 +0200 Subject: [PATCH] Make reputation in the message sidebar fit the style See #2508 --- com.woltlab.wcf/templates/messageSidebar.tpl | 22 ++++----------- .../install/files/style/ui/reactions.scss | 28 ------------------- wcfsetup/install/lang/de.xml | 2 +- wcfsetup/install/lang/en.xml | 2 +- 4 files changed, 8 insertions(+), 46 deletions(-) diff --git a/com.woltlab.wcf/templates/messageSidebar.tpl b/com.woltlab.wcf/templates/messageSidebar.tpl index 8fca5c5b3e..c1034d8a1b 100644 --- a/com.woltlab.wcf/templates/messageSidebar.tpl +++ b/com.woltlab.wcf/templates/messageSidebar.tpl @@ -44,22 +44,6 @@
{@$userProfile->getRank()->getImage()}
{/if} {/if} - - {if MODULE_LIKE && MESSAGE_SIDEBAR_ENABLE_LIKES_RECEIVED && !$isReply} -
- {assign var=overallReactionCount value=$userProfile->positiveReactionsReceived - $userProfile->negativeReactionsReceived} - - {if $overallReactionCount > 0} - {$overallReactionCount|shortUnit} - {elseif $overallReactionCount < 0} - {assign var=overallReactionCount value=$overallReactionCount*-1} - {$overallReactionCount|shortUnit} - {else} - {$overallReactionCount|shortUnit} - {/if} - -
- {/if} {if !$isReply && MODULE_TROPHY && $__wcf->session->getPermission('user.profile.trophy.canSeeTrophies') && ($userProfile->isAccessible('canViewTrophies') || $userProfile->userID == $__wcf->session->userID) && $userProfile->getSpecialTrophies()|count}
@@ -97,6 +81,12 @@
{content} + {if MODULE_LIKE && MESSAGE_SIDEBAR_ENABLE_LIKES_RECEIVED && !$isReply} + {assign var=overallReactionCount value=$userProfile->positiveReactionsReceived - $userProfile->negativeReactionsReceived} +
{lang}wcf.like.likesReceived{/lang}
+
{#$overallReactionCount}
+ {/if} + {if MESSAGE_SIDEBAR_ENABLE_ACTIVITY_POINTS && $userProfile->activityPoints}
{lang}wcf.user.activityPoint{/lang}
{#$userProfile->activityPoints}
diff --git a/wcfsetup/install/files/style/ui/reactions.scss b/wcfsetup/install/files/style/ui/reactions.scss index 27a74dcc7a..f56b5ec8a8 100644 --- a/wcfsetup/install/files/style/ui/reactions.scss +++ b/wcfsetup/install/files/style/ui/reactions.scss @@ -140,34 +140,6 @@ li.reactCountButton:hover { } } -.reactionStatusContainer { - margin-top: 10px; - - .positiveReactionCount { - color: $wcfStatusSuccessText; - - .fa { - color: $wcfStatusSuccessText; - } - } - - .negativeReactionCount { - color: $wcfStatusErrorText; - - .fa { - color: $wcfStatusErrorText; - } - } - - .neutralReactionCount { - color: $wcfStatusSuccessText; - - .fa { - color: $wcfStatusSuccessText; - } - } -} - .box.reactionReputationBox { &.positiveReactionReputationBox { background-color: $wcfStatusSuccessBackground; diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml index 864924ea3d..069d7c6833 100644 --- a/wcfsetup/install/lang/de.xml +++ b/wcfsetup/install/lang/de.xml @@ -3135,7 +3135,7 @@ E-Mail-Adresse: {@$emailAddress} {* this line ends with a space *} - + username}]]> diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml index 8c2d28da68..04f2c51c76 100644 --- a/wcfsetup/install/lang/en.xml +++ b/wcfsetup/install/lang/en.xml @@ -3082,7 +3082,7 @@ Email: {@$emailAddress} {* this line ends with a space *} - + username}]]> -- 2.20.1