diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb index 6cb1b64e8..13839297c 100644 --- a/app/controllers/settings/preferences_controller.rb +++ b/app/controllers/settings/preferences_controller.rb @@ -56,7 +56,6 @@ class Settings::PreferencesController < Settings::BaseController :setting_crop_images, :setting_always_send_emails, :setting_place_tab_bar_at_bottom, - :setting_show_tab_bar_label, notification_emails: %i(follow follow_request reblog favourite mention report pending_account trending_tag appeal), interactions: %i(must_be_follower must_be_following must_be_following_dm) ) diff --git a/app/javascript/styles/y-zu-dark b/app/javascript/styles/y-zu-dark new file mode 160000 index 000000000..a58c699a6 --- /dev/null +++ b/app/javascript/styles/y-zu-dark @@ -0,0 +1 @@ +Subproject commit a58c699a605784b3318f54717bfaaa804db4d2f3 diff --git a/app/javascript/styles/y-zu-light b/app/javascript/styles/y-zu-light new file mode 160000 index 000000000..a5c228314 --- /dev/null +++ b/app/javascript/styles/y-zu-light @@ -0,0 +1 @@ +Subproject commit a5c22831445f5669315434f7df49c3c1e1f70d20 diff --git a/app/lib/user_settings_decorator.rb b/app/lib/user_settings_decorator.rb index 5a919e3d4..6f4ee75bd 100644 --- a/app/lib/user_settings_decorator.rb +++ b/app/lib/user_settings_decorator.rb @@ -142,10 +142,6 @@ class UserSettingsDecorator boolean_cast_setting 'setting_place_tab_bar_at_bottom' end - def show_tab_bar_label_preference - boolean_cast_setting 'setting_show_tab_bar_label' - end - def boolean_cast_setting(key) ActiveModel::Type::Boolean.new.cast(settings[key]) end