diff options
| -rw-r--r-- | app/controllers/settings/preferences_controller.rb | 2 | ||||
| -rw-r--r-- | app/lib/user_settings_decorator.rb | 10 | ||||
| -rw-r--r-- | app/models/user.rb | 10 | ||||
| -rwxr-xr-x | app/views/layouts/application.html.haml | 18 | ||||
| -rw-r--r-- | app/views/settings/preferences/show.html.haml | 2 | ||||
| -rw-r--r-- | config/locales/simple_form.en.yml | 4 |
6 files changed, 45 insertions, 1 deletions
diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb index ab1796f58..52753e890 100644 --- a/app/controllers/settings/preferences_controller.rb +++ b/app/controllers/settings/preferences_controller.rb @@ -35,6 +35,8 @@ class Settings::PreferencesController < Settings::BaseController :setting_hide_stats, :setting_hide_captions, :setting_larger_menus, + :setting_larger_buttons, + :setting_larger_drawer, :setting_gently_kobolds, :setting_user_is_kobold, diff --git a/app/lib/user_settings_decorator.rb b/app/lib/user_settings_decorator.rb index 855a06fea..f2a4d9c9f 100644 --- a/app/lib/user_settings_decorator.rb +++ b/app/lib/user_settings_decorator.rb @@ -20,6 +20,8 @@ class UserSettingsDecorator user.settings['rawr_federated'] = rawr_federated_preference if change?('setting_rawr_federated') user.settings['hide_stats'] = hide_stats_preference if change?('setting_hide_stats') user.settings['larger_menus'] = larger_menus_preference if change?('setting_larger_menus') + user.settings['larger_buttons'] = larger_buttons_preference if change?('setting_larger_buttons') + user.settings['larger_drawer'] = larger_drawer_preference if change?('setting_larger_drawer') user.settings['gently_kobolds'] = gently_kobolds_preference if change?('setting_gently_kobolds') user.settings['user_is_kobold'] = user_is_kobold_preference if change?('setting_user_is_kobold') @@ -52,6 +54,14 @@ class UserSettingsDecorator boolean_cast_setting 'setting_larger_menus' end + def larger_buttons_preference + boolean_cast_setting 'setting_larger_buttons' + end + + def larger_drawer_preference + boolean_cast_setting 'setting_larger_drawer' + end + def gently_kobolds_preference boolean_cast_setting 'setting_gently_kobolds' end diff --git a/app/models/user.rb b/app/models/user.rb index f6f164c0b..ac900d011 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -109,6 +109,8 @@ class User < ApplicationRecord :disable_color, :hide_captions, :larger_menus, + :larger_buttons, + :larger_drawer, :gently_kobolds, :user_is_kobold, @@ -217,6 +219,14 @@ class User < ApplicationRecord settings.larger_menus || false end + def setting_larger_buttons + settings.larger_buttons || false + end + + def setting_larger_drawer + settings.larger_drawer || false + end + def setting_gently_kobolds settings.gently_kobolds || false end diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 8533fba76..01ae25389 100755 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -59,5 +59,23 @@ .dropdown--active .dropdown__content > ul > li > a { padding: 14px 0 !important; font-size: 14px !important } + - if current_account&.user&.setting_larger_buttons + :css + .drawer { min-width: 350px !important } + .status__action-bar .icon-button, + .detailed-status__action-bar .icon-button, + .composer--options .icon-button + { + font-size: 24px !important; + height: 24px !important; + width: 24px !important; + line-height: 24px !important; + margin-right: 24px; + } + + - if current_account&.user&.setting_larger_drawer + :css + .drawer { min-width: 400px !important } + %body{ class: body_classes } = content_for?(:content) ? yield(:content) : yield diff --git a/app/views/settings/preferences/show.html.haml b/app/views/settings/preferences/show.html.haml index f3ae65c94..945384204 100644 --- a/app/views/settings/preferences/show.html.haml +++ b/app/views/settings/preferences/show.html.haml @@ -59,6 +59,8 @@ = f.input :setting_system_font_ui, as: :boolean, wrapper: :with_label = f.input :setting_hide_captions, as: :boolean, wrapper: :with_label = f.input :setting_larger_menus, as: :boolean, wrapper: :with_label + = f.input :setting_larger_buttons, as: :boolean, wrapper: :with_label + = f.input :setting_larger_drawer, as: :boolean, wrapper: :with_label .fields-group = f.input :setting_unfollow_modal, as: :boolean, wrapper: :with_label diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 6ca47ee24..1904e6e70 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -110,7 +110,9 @@ en: setting_hide_stats: Hide statistics on public pages setting_disable_color: Ignore text color formatting setting_hide_captions: Hide media captions - setting_larger_menus: Increase size of menu items and spacing + setting_larger_menus: Increase size and spacing of menu items + setting_larger_buttons: Increase size and spacing of action buttons + setting_larger_drawer: Increase width of compose drawer column setting_gently_kobolds: Gently the kobolds setting_user_is_kobold: I am a kobold setting_aggregate_reblogs: Group repeats in timelines |