From a06e7bc3fb04614e4114a3e655cd4fb4cf39e05d Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Tue, 18 Jun 2019 16:26:10 +0200 Subject: Change plaintext icon in composer options --- app/javascript/flavours/glitch/features/compose/components/options.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/javascript/flavours') diff --git a/app/javascript/flavours/glitch/features/compose/components/options.js b/app/javascript/flavours/glitch/features/compose/components/options.js index 0c94f5514..ed52b1997 100644 --- a/app/javascript/flavours/glitch/features/compose/components/options.js +++ b/app/javascript/flavours/glitch/features/compose/components/options.js @@ -232,7 +232,7 @@ class ComposerOptions extends ImmutablePureComponent { const contentTypeItems = { plain: { - icon: 'align-left', + icon: 'file-text', name: 'text/plain', text: , }, -- cgit From ed2f0f6152912499a731581174a08335cc6ff099 Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Mon, 17 Jun 2019 21:01:22 +0200 Subject: Fix bottom margin of lists in toots --- app/javascript/flavours/glitch/styles/components/status.scss | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'app/javascript/flavours') diff --git a/app/javascript/flavours/glitch/styles/components/status.scss b/app/javascript/flavours/glitch/styles/components/status.scss index ee4440e89..fa115f21b 100644 --- a/app/javascript/flavours/glitch/styles/components/status.scss +++ b/app/javascript/flavours/glitch/styles/components/status.scss @@ -33,6 +33,12 @@ .status__content__text, .e-content { + + & > ul, + & > ol { + margin-bottom: 20px; + } + h1, h2, h3, h4, h5 { margin-top: 20px; margin-bottom: 20px; -- cgit From f4b008906dcfc3333ec533884aa10b65f8ae41a2 Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Sun, 16 Jun 2019 21:04:09 +0200 Subject: Change preferences link in local settings modal from sliders to cog for consistency --- .../flavours/glitch/features/local_settings/navigation/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/javascript/flavours') diff --git a/app/javascript/flavours/glitch/features/local_settings/navigation/index.js b/app/javascript/flavours/glitch/features/local_settings/navigation/index.js index c583c4863..01368abad 100644 --- a/app/javascript/flavours/glitch/features/local_settings/navigation/index.js +++ b/app/javascript/flavours/glitch/features/local_settings/navigation/index.js @@ -74,7 +74,7 @@ export default class LocalSettingsNavigation extends React.PureComponent { active={index === 5} href={ preferencesLink } index={5} - icon='sliders' + icon='cog' title={intl.formatMessage(messages.preferences)} /> Date: Tue, 18 Jun 2019 18:23:08 +0200 Subject: [Glitch] Completely hide toots matched by “irreversible” filters even if they got to the client MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/javascript/flavours/glitch/actions/notifications.js | 5 +++++ app/javascript/flavours/glitch/selectors/index.js | 6 ++++++ 2 files changed, 11 insertions(+) (limited to 'app/javascript/flavours') diff --git a/app/javascript/flavours/glitch/actions/notifications.js b/app/javascript/flavours/glitch/actions/notifications.js index 57fecf63d..2107503db 100644 --- a/app/javascript/flavours/glitch/actions/notifications.js +++ b/app/javascript/flavours/glitch/actions/notifications.js @@ -62,9 +62,14 @@ export function updateNotifications(notification, intlMessages, intlLocale) { let filtered = false; if (notification.type === 'mention') { + const dropRegex = regexFromFilters(filters.filter(filter => filter.get('irreversible'))); const regex = regexFromFilters(filters); const searchIndex = notification.status.spoiler_text + '\n' + unescapeHTML(notification.status.content); + if (dropRegex && dropRegex.test(searchIndex)) { + return; + } + filtered = regex && regex.test(searchIndex); } diff --git a/app/javascript/flavours/glitch/selectors/index.js b/app/javascript/flavours/glitch/selectors/index.js index d1a88a2fc..2d4f3f7b4 100644 --- a/app/javascript/flavours/glitch/selectors/index.js +++ b/app/javascript/flavours/glitch/selectors/index.js @@ -78,6 +78,12 @@ export const makeGetStatus = () => { return null; } + const dropRegex = (accountReblog || accountBase).get('id') !== me && regexFromFilters(filters.filter(filter => filter.get('irreversible'))); + + if (dropRegex && dropRegex.test(statusBase.get('reblog') ? statusReblog.get('search_index') : statusBase.get('search_index'))) { + return null; + } + const regex = (accountReblog || accountBase).get('id') !== me && regexFromFilters(filters); let filtered = false; -- cgit From bb9459774d17d88fdd975c251481051041e28a56 Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Wed, 19 Jun 2019 15:16:18 +0200 Subject: Add NavigationBar to getting started column in single-column mode Fixes #1131 --- app/javascript/flavours/glitch/features/getting_started/index.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'app/javascript/flavours') diff --git a/app/javascript/flavours/glitch/features/getting_started/index.js b/app/javascript/flavours/glitch/features/getting_started/index.js index f669220e3..36a445dca 100644 --- a/app/javascript/flavours/glitch/features/getting_started/index.js +++ b/app/javascript/flavours/glitch/features/getting_started/index.js @@ -14,6 +14,7 @@ import { List as ImmutableList } from 'immutable'; import { createSelector } from 'reselect'; import { fetchLists } from 'flavours/glitch/actions/lists'; import { preferencesLink, signOutLink } from 'flavours/glitch/util/backend_links'; +import NavigationBar from '../compose/components/navigation_bar'; import LinkFooter from 'flavours/glitch/features/ui/components/link_footer'; const messages = defineMessages({ @@ -165,7 +166,8 @@ const NAVIGATION_PANEL_BREAKPOINT = 600 + (285 * 2) + (10 * 2);
- + {!multiColumn && } + {multiColumn && } {navItems} {listItems} -- cgit From 38d28824475056766c97385b66f4e04a5123e3a2 Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Wed, 19 Jun 2019 15:41:17 +0200 Subject: Fix NavigationBar styling --- .../features/compose/components/navigation_bar.js | 20 +++++++++++--------- .../flavours/glitch/styles/components/drawer.scss | 17 ++++++++++------- 2 files changed, 21 insertions(+), 16 deletions(-) (limited to 'app/javascript/flavours') diff --git a/app/javascript/flavours/glitch/features/compose/components/navigation_bar.js b/app/javascript/flavours/glitch/features/compose/components/navigation_bar.js index 3148434f1..f6bfbdd1e 100644 --- a/app/javascript/flavours/glitch/features/compose/components/navigation_bar.js +++ b/app/javascript/flavours/glitch/features/compose/components/navigation_bar.js @@ -20,16 +20,18 @@ export default class NavigationBar extends ImmutablePureComponent { - - @{this.props.account.get('acct')} - +
+ + @{this.props.account.get('acct')} + - { profileLink !== undefined && ( - - )} + { profileLink !== undefined && ( + + )} +
); }; diff --git a/app/javascript/flavours/glitch/styles/components/drawer.scss b/app/javascript/flavours/glitch/styles/components/drawer.scss index f054ddbc0..0e50482f6 100644 --- a/app/javascript/flavours/glitch/styles/components/drawer.scss +++ b/app/javascript/flavours/glitch/styles/components/drawer.scss @@ -163,18 +163,15 @@ .drawer--account { padding: 10px; color: $darker-text-color; + display: flex; + align-items: center; - & > a { + a { color: inherit; text-decoration: none; } - & > .avatar { - float: left; - margin-right: 10px; - } - - & > .acct { + .acct { display: block; color: $secondary-text-color; font-weight: 500; @@ -184,6 +181,12 @@ } } +.navigation-bar__profile { + flex: 1 1 auto; + margin-left: 8px; + overflow: hidden; +} + .drawer--results { background: $ui-base-color; overflow-x: hidden; -- cgit