From 9b22e2c3fa6da2da65420de0bb63262496cdbd1f Mon Sep 17 00:00:00 2001 From: Emma Winston Date: Fri, 6 Sep 2019 19:10:32 +0100 Subject: [PATCH 1/8] correct border colour of account header fields from green to purple --- app/javascript/styles/macaron/diff.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/javascript/styles/macaron/diff.scss b/app/javascript/styles/macaron/diff.scss index d513dbdee..59d61bbd6 100644 --- a/app/javascript/styles/macaron/diff.scss +++ b/app/javascript/styles/macaron/diff.scss @@ -1037,6 +1037,10 @@ a.status-card.compact:hover { border-bottom: 1px solid lighten($purple, 8%); } +.account__header__fields dl { + border-bottom: 1px solid lighten($purple, 8%); +} + @media screen and (max-width: 600px) { .public-layout .public-account-header__bar { background: $blue; From b6f84d7c669ee0f9abe752293c189701c7d64f69 Mon Sep 17 00:00:00 2001 From: Emma Winston Date: Sat, 7 Sep 2019 14:35:33 +0100 Subject: [PATCH 2/8] Fix inconsistent link underlining --- app/javascript/styles/mastodon/components.scss | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 7ec5b4260..a9fa6bd40 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -324,12 +324,6 @@ color: $lighter-text-color; font-weight: 500; text-decoration: underline; - - &:hover, - &:active, - &:focus { - text-decoration: none; - } } } @@ -801,13 +795,9 @@ } &.mention { - &:hover { - text-decoration: none; - span { text-decoration: underline; } - } } .fa { From 58805e7432b554a4ea990e396604917e0bb28974 Mon Sep 17 00:00:00 2001 From: Emma Winston Date: Tue, 10 Sep 2019 20:43:19 +0100 Subject: [PATCH 3/8] Correct local-only indicator spacing - fixes issue #8 --- app/javascript/styles/mastodon/components.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 7ec5b4260..8926a2bf8 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -1107,6 +1107,7 @@ .status__action-bar-dropdown { height: 23.15px; width: 23.15px; + margin-right: 18px; } .detailed-status__action-bar-dropdown { From 4ba1695ae3be81f255b385ced3c77bdb9ac783c2 Mon Sep 17 00:00:00 2001 From: Darius Kazemi Date: Tue, 10 Sep 2019 14:07:46 -0700 Subject: [PATCH 4/8] Indicate version number in link footer. --- app/javascript/mastodon/features/ui/components/link_footer.js | 2 +- app/javascript/mastodon/locales/en.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/javascript/mastodon/features/ui/components/link_footer.js b/app/javascript/mastodon/features/ui/components/link_footer.js index ecb0a23a8..9f77c5781 100644 --- a/app/javascript/mastodon/features/ui/components/link_footer.js +++ b/app/javascript/mastodon/features/ui/components/link_footer.js @@ -25,7 +25,7 @@ const LinkFooter = ({ withHotkeys }) => ( values={{ github: {repository} (v{version}) }} /> hometown-fork/hometown }} />

diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json index 77ae2809a..c01f799c2 100644 --- a/app/javascript/mastodon/locales/en.json +++ b/app/javascript/mastodon/locales/en.json @@ -145,7 +145,7 @@ "getting_started.directory": "Profile directory", "getting_started.documentation": "Documentation", "getting_started.heading": "Getting started", - "getting_started.hometown_open_source_notice": "Hometown is also open source, at {hometown}.", + "getting_started.hometown_open_source_notice": "Hometown is also open source, at {hometown} (v1.0.2).", "getting_started.invite": "Invite people", "getting_started.open_source_notice": "Mastodon is open source software. You can contribute or report issues on GitHub at {github}.", "getting_started.security": "Security", From e5cd6d0cda77f6a6b71580ba86c11c04124acdbd Mon Sep 17 00:00:00 2001 From: Emma Winston Date: Thu, 12 Sep 2019 18:16:59 +0100 Subject: [PATCH 5/8] Corrects syntax for spoiler tags to valid HTML (fixes #10) --- app/javascript/mastodon/components/status_content.js | 2 +- app/javascript/styles/mastodon/components.scss | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/app/javascript/mastodon/components/status_content.js b/app/javascript/mastodon/components/status_content.js index 3ac03b728..ec517508d 100644 --- a/app/javascript/mastodon/components/status_content.js +++ b/app/javascript/mastodon/components/status_content.js @@ -223,7 +223,7 @@ export default class StatusContent extends React.PureComponent {
} + {status.get('activity_pub_type') === 'Article' ? '' : }

{mentionsPlaceholder} diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 8926a2bf8..7aaa52d95 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -6027,3 +6027,14 @@ noscript { padding: 0.35rem; } } + +div.status__content, +div.status__content--with-action, +div.status__content--with-spoiler { + p { + span.show_more_button { + display: block; + margin: 0.25rem 0 0 0; + } + } +} From f10703ae073097c876595e8e7e710dc59691d25e Mon Sep 17 00:00:00 2001 From: Emma Winston Date: Fri, 13 Sep 2019 22:37:40 +0100 Subject: [PATCH 6/8] Remove share intent button for local-only posts - closes #12 --- app/javascript/mastodon/components/status_action_bar.js | 2 +- .../mastodon/features/status/components/action_bar.js | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/javascript/mastodon/components/status_action_bar.js b/app/javascript/mastodon/components/status_action_bar.js index 27c2b4665..c21ba218c 100644 --- a/app/javascript/mastodon/components/status_action_bar.js +++ b/app/javascript/mastodon/components/status_action_bar.js @@ -245,7 +245,7 @@ class StatusActionBar extends ImmutablePureComponent { replyTitle = intl.formatMessage(messages.replyAll); } - const shareButton = ('share' in navigator) && status.get('visibility') === 'public' && ( + const shareButton = ('share' in navigator) && status.get('visibility') === 'public' && federated && ( ); diff --git a/app/javascript/mastodon/features/status/components/action_bar.js b/app/javascript/mastodon/features/status/components/action_bar.js index 3e511b7a6..2783d215d 100644 --- a/app/javascript/mastodon/features/status/components/action_bar.js +++ b/app/javascript/mastodon/features/status/components/action_bar.js @@ -16,6 +16,7 @@ const messages = defineMessages({ reblog_private: { id: 'status.reblog_private', defaultMessage: 'Boost to original audience' }, cancel_reblog_private: { id: 'status.cancel_reblog_private', defaultMessage: 'Unboost' }, cannot_reblog: { id: 'status.cannot_reblog', defaultMessage: 'This post cannot be boosted' }, + local_only: { id: 'status.local_only', defaultMessage: 'This post is only visible by other users of your instance' }, favourite: { id: 'status.favourite', defaultMessage: 'Favourite' }, mute: { id: 'status.mute', defaultMessage: 'Mute @{name}' }, muteConversation: { id: 'status.mute_conversation', defaultMessage: 'Mute conversation' }, @@ -138,6 +139,7 @@ class ActionBar extends React.PureComponent { const publicStatus = ['public', 'unlisted'].includes(status.get('visibility')); const mutingConversation = status.get('muted'); + const federated = !status.get('local_only'); let menu = []; @@ -175,7 +177,7 @@ class ActionBar extends React.PureComponent { } } - const shareButton = ('share' in navigator) && status.get('visibility') === 'public' && ( + const shareButton = ('share' in navigator) && status.get('visibility') === 'public' && federated && (
); From 7d7712e1ba41ecf6101cc015309ab8225b1d773c Mon Sep 17 00:00:00 2001 From: Darius Kazemi Date: Fri, 13 Sep 2019 20:27:32 -0700 Subject: [PATCH 7/8] Fixing header CSS for rich text statuses Making the headers larger in font size, and differentiating the h1 and h2 headers. --- app/javascript/styles/mastodon/components.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 2c0f0beb7..3088424fd 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -727,14 +727,14 @@ margin-bottom: 20px; } - h1, - h2 { + h1 { font-weight: 700; - font-size: 18px; + font-size: 22px; } h2 { - font-size: 16px; + font-weight: 700; + font-size: 20px; } h3, From f0b1c82d22681a886bab87f15aa49ab732abbdd2 Mon Sep 17 00:00:00 2001 From: Darius Kazemi Date: Mon, 16 Sep 2019 15:41:33 -0700 Subject: [PATCH 8/8] Namespace the rich text CSS --- .../styles/mastodon/components.scss | 133 +++++++++--------- 1 file changed, 67 insertions(+), 66 deletions(-) diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index f14b23f56..9e5d91c1d 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -706,80 +706,81 @@ height: 20px; margin: -3px 0 0; } + .status__content__text { + p, + pre, + blockquote { + margin-bottom: 20px; + white-space: pre-wrap; - p, - pre, - blockquote { - margin-bottom: 20px; - white-space: pre-wrap; - - &:last-child { - margin-bottom: 2px; + &:last-child { + margin-bottom: 2px; + } } - } - h1, - h2, - h3, - h4, - h5 { - margin-top: 20px; - margin-bottom: 20px; - } - - h1 { - font-weight: 700; - font-size: 22px; - } - - h2 { - font-weight: 700; - font-size: 20px; - } - - h3, - h4, - h5 { - font-weight: 500; - } - - blockquote { - padding-left: 10px; - border-left: 3px solid $darker-text-color; - color: $darker-text-color; - white-space: normal; - - p:last-child { - margin-bottom: 0; + h1, + h2, + h3, + h4, + h5 { + margin-top: 20px; + margin-bottom: 20px; } - } - b, - strong { - font-weight: 700; - } - - em, - i { - font-style: italic; - } - - ul, - ol { - margin-left: 1em; - margin-bottom: 1em; - - p { - margin: 0; + h1 { + font-weight: 700; + font-size: 22px; } - } - ul { - list-style-type: disc; - } + h2 { + font-weight: 700; + font-size: 20px; + } - ol { - list-style-type: decimal; + h3, + h4, + h5 { + font-weight: 500; + } + + blockquote { + padding-left: 10px; + border-left: 3px solid $darker-text-color; + color: $darker-text-color; + white-space: normal; + + p:last-child { + margin-bottom: 0; + } + } + + b, + strong { + font-weight: 700; + } + + em, + i { + font-style: italic; + } + + ul, + ol { + margin-left: 1em; + margin-bottom: 1em; + + p { + margin: 0; + } + } + + ul { + list-style-type: disc; + } + + ol { + list-style-type: decimal; + } } a {