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/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' ? '' :
}
+ {status.get('activity_pub_type') === 'Article' ? '' : }
{mentionsPlaceholder}
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 && (
);
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 32dab8ede..de5d4dad7 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",
diff --git a/app/javascript/styles/macaron/diff.scss b/app/javascript/styles/macaron/diff.scss
index d4089e007..c4c94392c 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;
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 039ff2022..a6371e476 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;
- }
}
}
@@ -712,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,
- h2 {
- font-weight: 700;
- font-size: 18px;
- }
-
- h2 {
- font-size: 16px;
- }
-
- 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 {
@@ -801,13 +796,9 @@
}
&.mention {
- &:hover {
- text-decoration: none;
-
span {
text-decoration: underline;
}
- }
}
.fa {
@@ -1107,6 +1098,7 @@
.status__action-bar-dropdown {
height: 23.15px;
width: 23.15px;
+ margin-right: 18px;
}
.detailed-status__action-bar-dropdown {
@@ -6039,3 +6031,14 @@ noscript {
height: 100px;
bottom: 0;
}
+
+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;
+ }
+ }
+}
\ No newline at end of file