diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-05-25 21:27:00 +0200 |
|---|---|---|
| committer | multiple creatures <dev@multiple-creature.party> | 2019-11-19 15:31:27 -0600 |
| commit | e9a90ca12a000b058a8ffa7d6876912cc36ec5cc (patch) | |
| tree | b2489406ffaa9a4e89fc3b3d479e78b6e9b4bed9 /config | |
| parent | f3d88f0c27d3f281444095aea2caa2ef303fb04c (diff) | |
Add responsive panels to the single-column layout (#10820)
* Add responsive panels to the single-column layout * Fixes * Fix not being able to save the preference * Fix code style issues * Set max-height on the compose textarea and add a link to relationship manager
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/simple_form.en.yml | 7 | ||||
| -rw-r--r-- | config/settings.yml | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index cb387d6bf..f039f6193 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -28,6 +28,7 @@ en: password: Use at least 8 characters phrase: Will be matched regardless of casing in text or content warning of a roar scopes: Which APIs the application will be allowed to access. If you select a top-level scope, you don't need to select individual ones. + setting_advanced_layout: The advanced UI consists of multiple customizable columns setting_aggregate_reblogs: Do not show new repeats for roars that have been recently repeated (only affects newly-received repeats) setting_default_content_type_html_html: "<strong><strong>Bold</strong></strong>, <u><u>Underline</u></u>, <em><em>Italic</em></em>, <code><code>Console</code></code>, ..." setting_default_content_type_markdown_html: "<strong>**Bold**</strong>, <u>_Underline_</u>, <em>*Italic*</em>, <code>`Console`</code>, ..." @@ -42,7 +43,8 @@ en: setting_hide_network: Who in your pack and who joins your pack will not be shown on your profile setting_noindex: Affects your public profile and roar pages setting_show_application: The application you use to roar will be displayed in the detailed view of your roars - setting_skin: Reskins the selected Monsterpit flavour + setting_skin: Reskins the selected Mastodon flavour + setting_theme: Affects how Mastodon looks when you're logged in from any device. username: Your username will be unique on %{domain} whole_word: When the keyword or phrase is alphanumeric only, it will only be applied if it matches the whole word featured_tag: @@ -113,6 +115,7 @@ en: otp_attempt: Two-factor code password: Password phrase: Keyword or phrase + setting_advanced_layout: Enable advanced web interface setting_aggregate_reblogs: Group repeats in timelines setting_auto_play_gif: Auto-play animated GIFs setting_boost_modal: Show confirmation dialog before repeating @@ -175,8 +178,8 @@ en: setting_noindex: Opt-out of search engine indexing setting_reduce_motion: Reduce motion in animations setting_show_application: Disclose application used to send roars - setting_skin: Skin setting_system_font_ui: Use system's default font + setting_theme: Site theme setting_unfollow_modal: Show confirmation dialog before unfollowing someone severity: Severity type: Import type diff --git a/config/settings.yml b/config/settings.yml index 70aadd574..b0d3dfa3a 100644 --- a/config/settings.yml +++ b/config/settings.yml @@ -35,6 +35,7 @@ defaults: &defaults flavour: 'glitch' skin: 'default' aggregate_reblogs: true + advanced_layout: true notification_emails: follow: false reblog: false |