Merge branch 'Alpha' into Bagel-O-Themes

Signed-off-by: Nathan Sparrow <[email protected]>
DismalShadowX · Apr 28, 2024 · 50f952f · 50f952f
2 parents 6e35916 + e9035d7
commit 50f952f
Show file tree

Hide file tree

Showing 6 changed files with 10,368 additions and 3 deletions.
diff --git a/app/javascript/styles/mastodon-bird-ui/layout-multiple-columns.css b/app/javascript/styles/mastodon-bird-ui/layout-multiple-columns.css
diff --git a/app/javascript/styles/mastodon-bird-ui/layout-single-column.css b/app/javascript/styles/mastodon-bird-ui/layout-single-column.css
diff --git a/app/validators/status_length_validator.rb b/app/validators/status_length_validator.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class StatusLengthValidator < ActiveModel::Validator
-  MAX_CHARS = 500
+  MAX_CHARS = 4242
   URL_PLACEHOLDER_CHARS = 23
   URL_PLACEHOLDER = 'x' * 23
 

diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -949,7 +949,7 @@ en:
       delete: Delete
       edit_preset: Edit warning preset
       empty: You haven't defined any warning presets yet.
-      title: Manage warning presets
+      title: Warning presets
     webhooks:
       add_new: Add endpoint
       delete: Delete
@@ -1766,8 +1766,8 @@ en:
   tags:
     does_not_match_previous_name: does not match the previous name
   themes:
-    contrast: Mastodon (High contrast)
     default: Mastodon (Dark)
+    contrast: Mastodon (High contrast)
     mastodon-light: Mastodon (Light)
     tangerineui: Tangerine UI
     tangerineui-purple: Tangerine UI (Purple)

diff --git a/config/navigation.rb b/config/navigation.rb
@@ -59,6 +59,7 @@
       s.item :dashboard, safe_join([fa_icon('tachometer fw'), t('admin.dashboard.title')]), admin_dashboard_path, if: -> { current_user.can?(:view_dashboard) }
       s.item :settings, safe_join([fa_icon('cogs fw'), t('admin.settings.title')]), admin_settings_path, if: -> { current_user.can?(:manage_settings) }, highlights_on: %r{/admin/settings}
       s.item :rules, safe_join([fa_icon('gavel fw'), t('admin.rules.title')]), admin_rules_path, highlights_on: %r{/admin/rules}, if: -> { current_user.can?(:manage_rules) }
+      s.item :warning_presets, safe_join([fa_icon('warning fw'), t('admin.warning_presets.title')]), admin_warning_presets_path, highlights_on: %r{/admin/warning_presets}, if: -> { current_user.can?(:manage_rules) }
       s.item :roles, safe_join([fa_icon('vcard fw'), t('admin.roles.title')]), admin_roles_path, highlights_on: %r{/admin/roles}, if: -> { current_user.can?(:manage_roles) }
       s.item :announcements, safe_join([fa_icon('bullhorn fw'), t('admin.announcements.title')]), admin_announcements_path, highlights_on: %r{/admin/announcements}, if: -> { current_user.can?(:manage_announcements) }
       s.item :custom_emojis, safe_join([fa_icon('smile-o fw'), t('admin.custom_emojis.title')]), admin_custom_emojis_path, highlights_on: %r{/admin/custom_emojis}, if: -> { current_user.can?(:manage_custom_emojis) }

diff --git a/config/themes.yml b/config/themes.yml
@@ -8,3 +8,4 @@ mastodon-bird-ui-dark: styles/mastodon-bird-ui-dark.scss
 mastodon-bird-ui-light: styles/mastodon-bird-ui-light.scss
 mastodon-bird-ui-contrast: styles/mastodon-bird-ui-contrast.scss
 mastodon-bird-ui-accessible: styles/mastodon-bird-ui-accessible.scss
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,3 +8,4 @@ mastodon-bird-ui-dark: styles/mastodon-bird-ui-dark.scss
		mastodon-bird-ui-light: styles/mastodon-bird-ui-light.scss
		mastodon-bird-ui-contrast: styles/mastodon-bird-ui-contrast.scss
		mastodon-bird-ui-accessible: styles/mastodon-bird-ui-accessible.scss