From 67f82775268f57be5506031e65e3155a2618bef9 Mon Sep 17 00:00:00 2001 From: Ondřej Hruška Date: Sat, 23 Sep 2017 23:11:02 +0200 Subject: Add secondary toot button (opt-in) (#153) Add secondary toot button + other toot button enhancements. Squashing so it's easy to revert if needed. --- .../glitch/components/local_settings/page/index.js | 19 +++++++++++++++++++ app/javascript/glitch/reducers/local_settings.js | 1 + 2 files changed, 20 insertions(+) (limited to 'app/javascript/glitch') diff --git a/app/javascript/glitch/components/local_settings/page/index.js b/app/javascript/glitch/components/local_settings/page/index.js index cb041c0b8..338d86333 100644 --- a/app/javascript/glitch/components/local_settings/page/index.js +++ b/app/javascript/glitch/components/local_settings/page/index.js @@ -16,6 +16,7 @@ const messages = defineMessages({ layout_auto: { id: 'layout.auto', defaultMessage: 'Auto' }, layout_desktop: { id: 'layout.desktop', defaultMessage: 'Desktop' }, layout_mobile: { id: 'layout.single', defaultMessage: 'Mobile' }, + side_arm_none: { id: 'settings.side_arm.none', defaultMessage: 'None' }, }); @injectIntl @@ -61,6 +62,24 @@ export default class LocalSettingsPage extends React.PureComponent { > +
+

+ + + +
), ({ onChange, settings }) => ( diff --git a/app/javascript/glitch/reducers/local_settings.js b/app/javascript/glitch/reducers/local_settings.js index 386d59ceb..813e130ca 100644 --- a/app/javascript/glitch/reducers/local_settings.js +++ b/app/javascript/glitch/reducers/local_settings.js @@ -52,6 +52,7 @@ const initialState = ImmutableMap({ layout : 'auto', stretch : true, navbar_under : false, + side_arm : 'none', collapsed : ImmutableMap({ enabled : true, auto : ImmutableMap({ -- cgit