treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

[Glitch] Change sidebar text in web UI 

Port b9fd7571ae to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
main-rebase-security-fix
Eugen Rochko 2024-06-14 15:04:20 +02:00 committed by Claire
parent 395b9011ee
commit eccec92496
3 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/javascript/flavours/glitch/components/server_banner.jsx
View File

@ -42,10 +42,12 @@ class ServerBanner extends PureComponent {
return ( return (
<div className='server-banner'> <div className='server-banner'>
<div className='server-banner__introduction'> <div className='server-banner__introduction'>
<FormattedMessage id='server_banner.introduction' defaultMessage='{domain} is part of the decentralized social network powered by {mastodon}.' values={{ domain: <strong>{domain}</strong>, mastodon: <a href='https://joinmastodon.org' target='_blank'>Mastodon</a> }} /> <FormattedMessage id='server_banner.is_one_of_many' defaultMessage='{domain} is one of the many independent Mastodon servers you can use to participate in the fediverse.' values={{ domain: <strong>{domain}</strong>, mastodon: <a href='https://joinmastodon.org' target='_blank'>Mastodon</a> }} />
</div> </div>
<ServerHeroImage blurhash={server.getIn(['thumbnail', 'blurhash'])} src={server.getIn(['thumbnail', 'url'])} className='server-banner__hero' /> <Link to='/about'>
<ServerHeroImage blurhash={server.getIn(['thumbnail', 'blurhash'])} src={server.getIn(['thumbnail', 'url'])} className='server-banner__hero' />
</Link>
<div className='server-banner__description'> <div className='server-banner__description'>
{isLoading ? ( {isLoading ? (
@ -84,10 +86,6 @@ class ServerBanner extends PureComponent {
)} )}
</div> </div>
</div> </div>
<hr className='spacer' />
<Link className='button button--block button-secondary' to='/about'><FormattedMessage id='server_banner.learn_more' defaultMessage='Learn more' /></Link>
</div> </div>
); );
} }

6
app/javascript/flavours/glitch/features/ui/components/sign_in_banner.jsx
View File

@ -22,7 +22,8 @@ const SignInBanner = () => {
if (sso_redirect) { if (sso_redirect) {
return ( return (
<div className='sign-in-banner'> <div className='sign-in-banner'>
<p><FormattedMessage id='sign_in_banner.text' defaultMessage='Login to follow profiles or hashtags, favorite, share and reply to posts. You can also interact from your account on a different server.' /></p> <p><strong><FormattedMessage id='sign_in_banner.mastodon_is' defaultMessage="Mastodon is the best way to keep up with what's happening." /></strong></p>
<p><FormattedMessage id='sign_in_banner.follow_anyone' defaultMessage='Follow anyone across the fediverse and see it all in chronological order. No algorithms, ads, or clickbait in sight.' /></p>
<a href={sso_redirect} data-method='post' className='button button--block button-tertiary'><FormattedMessage id='sign_in_banner.sso_redirect' defaultMessage='Login or Register' /></a> <a href={sso_redirect} data-method='post' className='button button--block button-tertiary'><FormattedMessage id='sign_in_banner.sso_redirect' defaultMessage='Login or Register' /></a>
</div> </div>
); );
@ -44,7 +45,8 @@ const SignInBanner = () => {
return ( return (
<div className='sign-in-banner'> <div className='sign-in-banner'>
<p><FormattedMessage id='sign_in_banner.text' defaultMessage='Login to follow profiles or hashtags, favorite, share and reply to posts. You can also interact from your account on a different server.' /></p> <p><strong><FormattedMessage id='sign_in_banner.mastodon_is' defaultMessage="Mastodon is the best way to keep up with what's happening." /></strong></p>
<p><FormattedMessage id='sign_in_banner.follow_anyone' defaultMessage='Follow anyone across the fediverse and see it all in chronological order. No algorithms, ads, or clickbait in sight.' /></p>
{signupButton} {signupButton}
<a href='/auth/sign_in' className='button button--block button-tertiary'><FormattedMessage id='sign_in_banner.sign_in' defaultMessage='Login' /></a> <a href='/auth/sign_in' className='button button--block button-tertiary'><FormattedMessage id='sign_in_banner.sign_in' defaultMessage='Login' /></a>
</div> </div>

15
app/javascript/flavours/glitch/styles/components.scss
View File

@ -952,9 +952,15 @@ body > [data-popper-placement] {
padding: 10px; padding: 10px;
p { p {
font-size: 15px;
line-height: 22px;
color: $darker-text-color; color: $darker-text-color;
margin-bottom: 20px; margin-bottom: 20px;
strong {
font-weight: 700;
}
a { a {
color: $secondary-text-color; color: $secondary-text-color;
text-decoration: none; text-decoration: none;
@ -9517,14 +9523,14 @@ noscript {
} }
.server-banner { .server-banner {
padding: 20px 0;
&__introduction { &__introduction {
font-size: 15px;
line-height: 22px;
color: $darker-text-color; color: $darker-text-color;
margin-bottom: 20px; margin-bottom: 20px;
strong { strong {
font-weight: 600; font-weight: 700;
} }
a { a {
@ -9552,6 +9558,9 @@ noscript {
} }
&__description { &__description {
font-size: 15px;
line-height: 22px;
color: $darker-text-color;
margin-bottom: 20px; margin-bottom: 20px;
} }