From 8b2b672a60b6e52109d673e5c125f1b1c1d201e5 Mon Sep 17 00:00:00 2001 From: Sev Furneaux Date: Mon, 18 Nov 2024 13:07:36 +0000 Subject: [PATCH] react/livequestions: remove title click and change button text --- changelog/_8467.md | 3 ++- .../scss/components_user_facing/_card.scss | 5 +++++ meinberlin/react/livequestions/LikeCard.jsx | 6 +++--- .../react/livequestions/QuestionModerator.jsx | 16 ++++++++-------- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/changelog/_8467.md b/changelog/_8467.md index 6adb6468fb..787359c82d 100644 --- a/changelog/_8467.md +++ b/changelog/_8467.md @@ -7,4 +7,5 @@ - Added new `LikeCard` component – Added `LikeCard` component to `QuestionModerator` and `QuestionUser` components - Style shortlist pill -– Style moderator buttons \ No newline at end of file +– Style moderator buttons +– Change moderator buttons text diff --git a/meinberlin/assets/scss/components_user_facing/_card.scss b/meinberlin/assets/scss/components_user_facing/_card.scss index 252a2f69e7..ddd3f561f2 100644 --- a/meinberlin/assets/scss/components_user_facing/_card.scss +++ b/meinberlin/assets/scss/components_user_facing/_card.scss @@ -27,6 +27,11 @@ text-decoration: underline; } +.card__header .title--no-underline:hover { + cursor: default; + text-decoration: none; +} + .card__link--hover { text-decoration: underline !important; // BO overide } diff --git a/meinberlin/react/livequestions/LikeCard.jsx b/meinberlin/react/livequestions/LikeCard.jsx index 2aecd9bfae..346586d5db 100644 --- a/meinberlin/react/livequestions/LikeCard.jsx +++ b/meinberlin/react/livequestions/LikeCard.jsx @@ -7,7 +7,7 @@ const likedTag = django.gettext('Liked') const likesTag = django.gettext('Likes') const addLikeTag = django.gettext('add like') const undoLikeTag = django.gettext('undo like') -const shortlistTag = django.gettext('on shortlist') +const bookmarkedTag = django.gettext('bookmarked') export default function LikeCard ({ title, @@ -22,7 +22,7 @@ export default function LikeCard ({ return (
-

{title}

+

{title}

{(category || isOnShortlist) && (
{category && ( @@ -30,7 +30,7 @@ export default function LikeCard ({ )} {isOnShortlist && ( - {shortlistTag} + {bookmarkedTag} )}
diff --git a/meinberlin/react/livequestions/QuestionModerator.jsx b/meinberlin/react/livequestions/QuestionModerator.jsx index 86deb7f5c1..415de3f985 100644 --- a/meinberlin/react/livequestions/QuestionModerator.jsx +++ b/meinberlin/react/livequestions/QuestionModerator.jsx @@ -101,8 +101,8 @@ export default class QuestionModerator extends React.Component { const doneText = django.gettext('mark as done') const addLiveText = django.gettext('added to live list') const removeLiveText = django.gettext('remove from live list') - const addShortlistText = django.gettext('added to shortlist') - const removeShortlistText = django.gettext('remove from shortlist') + const addBookmarkText = django.gettext('add bookmark') + const removeBookmarkText = django.gettext('remove bookmark') return ( <> @@ -124,8 +124,8 @@ export default class QuestionModerator extends React.Component { this.state.is_hidden && 'card__button--active' )} onClick={this.toggleIshidden.bind(this)} - aria-label={this.props.is_hidden ? hiddenText : undoHiddenText} - title={this.props.is_hidden ? hiddenText : undoHiddenText} + aria-label={this.props.is_hidden ? undoHiddenText : hiddenText} + title={this.props.is_hidden ? undoHiddenText : hiddenText} >