Skip to content

Commit 6876062

Browse files
committed
assets/js: fix alert close position and follow alert linebreak
1 parent 37083e4 commit 6876062

2 files changed

Lines changed: 11 additions & 11 deletions

File tree

adhocracy4/follows/static/follows/FollowButton.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const translated = {
1212
followingDescription: django.gettext(
1313
'Click to no longer be updated about this project via email.'
1414
),
15-
followAlert: django.gettext('From now on, we\'ll keep you updated on all changes. Make sure email notifications are enabled in your %(linkStart)s profile settings%(linkEnd)s'),
15+
followAlert: django.gettext('From now on, we\'ll keep you updated on all changes.<br/>Make sure email notifications are enabled in your %(linkStart)s profile settings%(linkEnd)s'),
1616
followingAlert: django.gettext('You will no longer be updated via email.'),
1717
follow: django.gettext('Follow'),
1818
following: django.gettext('Following')

adhocracy4/static/Alert.jsx

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,17 @@ const Alert = ({ type = 'info', title, message, htmlMessage, onClick, timeInMs }
3434
{htmlMessage
3535
? (<div dangerouslySetInnerHTML={{ __html: htmlMessage }} />)
3636
: (message)}
37-
{onClick && (
38-
<button
39-
type="button"
40-
className="alert__close"
41-
aria-label={closeTag}
42-
onClick={onClick}
43-
>
44-
<span className="fa fa-times" aria-hidden="true" />
45-
</button>
46-
)}
4737
</div>
38+
{onClick && (
39+
<button
40+
type="button"
41+
className="alert__close"
42+
aria-label={closeTag}
43+
onClick={onClick}
44+
>
45+
<span className="fa fa-times" aria-hidden="true" />
46+
</button>
47+
)}
4848
</div>
4949
)
5050
}

0 commit comments

Comments
 (0)