From dd118449c2e131b49220f3d32c08f47a37ea9596 Mon Sep 17 00:00:00 2001 From: ThibG Date: Sat, 11 May 2019 23:56:07 +0200 Subject: Fix incorrect reference to raw_content (it is raw_text instead) (#10753) --- app/javascript/mastodon/reducers/compose.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/javascript') diff --git a/app/javascript/mastodon/reducers/compose.js b/app/javascript/mastodon/reducers/compose.js index 85cbdfb17..708272591 100644 --- a/app/javascript/mastodon/reducers/compose.js +++ b/app/javascript/mastodon/reducers/compose.js @@ -331,7 +331,7 @@ export default function compose(state = initialState, action) { })); case REDRAFT: return state.withMutations(map => { - map.set('text', action.raw_content || unescapeHTML(expandMentions(action.status))); + map.set('text', action.raw_text || unescapeHTML(expandMentions(action.status))); map.set('in_reply_to', action.status.get('in_reply_to_id')); map.set('privacy', action.status.get('visibility')); map.set('media_attachments', action.status.get('media_attachments')); -- cgit From 3e15a845c19eedc0b153df54654ab177bf6c61ce Mon Sep 17 00:00:00 2001 From: nzws Date: Sun, 12 May 2019 12:15:42 +0900 Subject: Fix some colors in light theme (#10754) * Fix typo in light theme * Fix background color of empty column --- app/javascript/styles/mastodon-light/diff.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'app/javascript') diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss index de03cf1a6..48236a286 100644 --- a/app/javascript/styles/mastodon-light/diff.scss +++ b/app/javascript/styles/mastodon-light/diff.scss @@ -162,7 +162,7 @@ .actions-modal ul li:not(:empty) a:focus button, .actions-modal ul li:not(:empty) a:hover, .actions-modal ul li:not(:empty) a:hover button, -.admin-wrapper .sidebar ul ul a.selected, +.admin-wrapper .sidebar ul li a.selected, .simple_form .block-button, .simple_form .button, .simple_form button { @@ -230,6 +230,7 @@ .empty-column-indicator, .error-column { color: $primary-text-color; + background: $white; } // Change the default colors used on some parts of the profile pages -- cgit From cd534830adab89300703904ffe87894dec8e2f95 Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Sun, 12 May 2019 19:11:08 +0200 Subject: Fix text color of some formatted elements in notifications --- app/javascript/flavours/glitch/styles/components/status.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/javascript') diff --git a/app/javascript/flavours/glitch/styles/components/status.scss b/app/javascript/flavours/glitch/styles/components/status.scss index fb031258f..b43931a5f 100644 --- a/app/javascript/flavours/glitch/styles/components/status.scss +++ b/app/javascript/flavours/glitch/styles/components/status.scss @@ -653,7 +653,7 @@ .muted { .status__content p, .status__content a, - .status__content_text { + .status__content__text { color: $dark-text-color; } -- cgit From 87d16698c27b80e3bb8b20f5ff20ee6a07655fab Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Mon, 13 May 2019 15:01:00 +0200 Subject: Fix rich text styling on public pages --- app/javascript/flavours/glitch/styles/components/status.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'app/javascript') diff --git a/app/javascript/flavours/glitch/styles/components/status.scss b/app/javascript/flavours/glitch/styles/components/status.scss index b43931a5f..62f0a815f 100644 --- a/app/javascript/flavours/glitch/styles/components/status.scss +++ b/app/javascript/flavours/glitch/styles/components/status.scss @@ -31,7 +31,8 @@ } } - .status__content__text { + .status__content__text, + .e-content { h1, h2, h3, h4, h5 { margin-top: 20px; margin-bottom: 20px; -- cgit From 4bab7d7640a72ffeb04c104a93ad6d3d5700c712 Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Mon, 13 May 2019 15:06:09 +0200 Subject: Fix rich text style in reply indicator --- .../glitch/styles/components/composer.scss | 65 +++++++++++++++++++++- 1 file changed, 63 insertions(+), 2 deletions(-) (limited to 'app/javascript') diff --git a/app/javascript/flavours/glitch/styles/components/composer.scss b/app/javascript/flavours/glitch/styles/components/composer.scss index bb333d35f..ba517a2ab 100644 --- a/app/javascript/flavours/glitch/styles/components/composer.scss +++ b/app/javascript/flavours/glitch/styles/components/composer.scss @@ -124,10 +124,71 @@ white-space: pre-wrap; padding-top: 5px; - p { + p, pre, blockquote { margin-bottom: 20px; + white-space: pre-wrap; - &:last-child { margin-bottom: 0 } + &:last-child { + margin-bottom: 0; + } + } + + 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 $inverted-text-color; + color: $inverted-text-color; + white-space: normal; + + p:last-child { + margin-bottom: 0; + } + } + + b, strong { + font-weight: 700; + } + + em, i { + font-style: italic; + } + + sub { + font-size: smaller; + text-align: sub; + } + + ul, ol { + margin-left: 1em; + + p { + margin: 0; + } + } + + ul { + list-style-type: disc; + } + + ol { + list-style-type: decimal; } a { -- cgit From 4ab094d35ec59c792da890aface6caeede135511 Mon Sep 17 00:00:00 2001 From: Neil Moore Date: Wed, 15 May 2019 00:53:23 -0400 Subject: Adds click-able div that expands status (#10733) (#10766) The clickable div is positioned under the account avatar and covers all empty space below it to the end of the status. --- app/javascript/mastodon/components/status.js | 1 + app/javascript/styles/mastodon/components.scss | 9 +++++++++ 2 files changed, 10 insertions(+) (limited to 'app/javascript') diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js index 95ca4a548..42535ea68 100644 --- a/app/javascript/mastodon/components/status.js +++ b/app/javascript/mastodon/components/status.js @@ -356,6 +356,7 @@ class Status extends ImmutablePureComponent { {prepend}
+
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index 834563ee9..906ee9849 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -1412,6 +1412,15 @@ a.account__display-name { width: 48px; } +.status__expand { + width: 68px; + position: absolute; + left: 0; + top: 0; + height: 100%; + cursor: pointer; +} + .muted { .status__content p, .status__content a { -- cgit