[maud] make features optional

* remove themes
* use setting

Signed-off-by: lindwurm <lindwurm.q@gmail.com>

Author: lindwurm

app/controllers/settings/preferences_controller.rb

@@ -54,6 +54,8 @@ def user_settings_params
       :setting_use_pending_items,
       :setting_trends,
       :setting_crop_images,
+      :setting_bigger_publish,
+      :setting_wider_column,
       notification_emails: %i(follow follow_request reblog favourite mention digest report pending_account trending_tag),
       interactions: %i(must_be_follower must_be_following must_be_following_dm)
     )

app/helpers/application_helper.rb

@@ -172,6 +172,8 @@ def body_classes
     output << "theme-#{current_theme.parameterize}"
     output << 'system-font' if current_account&.user&.setting_system_font_ui
     output << (current_account&.user&.setting_reduce_motion ? 'reduce-motion' : 'no-reduce-motion')
+    output << 'bigger-publish' if current_account&.user&.setting_bigger_publish
+    output << 'wider-column' if current_account&.user&.setting_wider_column
     output << 'rtl' if locale_direction == 'rtl'
     output.reject(&:blank?).join(' ')
   end

app/javascript/styles/application.scss

@@ -27,5 +27,8 @@
 @import 'mastodon/rtl';
 @import 'mastodon/accessibility';
 
-@import 'mods/announcements.scss';
-@import 'mods/custom.scss';
+@import 'mods/announcements';
+@import 'mods/custom';
+
+@import 'mods/bigger-publish';
+@import 'mods/wider-column';

app/javascript/styles/enable-big-and-wide.scss

@@ -1,4 +1,5 @@
-.compose-form__publish {
+.bigger-publish {
+  .compose-form__publish {
     display: contents;
   }
   .compose-form__publish-button-wrapper {
@@ -11,4 +12,5 @@
       height: 100%;
       width: 100%;
       font-size: 80%;
-  }
+  }
+}

app/javascript/styles/enable-big-publish.scss

@@ -41,32 +41,34 @@ $column-bp-5: 2560px;
   }
 }
 
-.columns-area > div {
-  @include c6 {
-    width: 16.667%;
-    max-width: 16.667%;
+.wider-column {
+  .columns-area > div {
+    @include c6 {
+      width: 16.667%;
+      max-width: 16.667%;
+    }
+    @include c5 {
+      width: 20%;
+      max-width: 20%;
+    }
+    @include c4 {
+      width: 25%;
+      max-width: 25%;
+    }
+    @include c3 {
+      width: 33.333%;
+      max-width: 33.333%;
+    }
+    @include c2 {
+      width: 50%;
+      max-width: 50%;
+    }
   }
-  @include c5 {
-    width: 20%;
-    max-width: 20%;
-  }
-  @include c4 {
-    width: 25%;
-    max-width: 25%;
-  }
-  @include c3 {
-    width: 33.333%;
-    max-width: 33.333%;
-  }
-  @include c2 {
-    width: 50%;
-    max-width: 50%;
-  }
-}
 
-.columns-area > div > .column,
-.columns-area > div > .mastodon-column-container > .column {
-  @include c1 {
-    width: 100%;
-  }
+  .columns-area > div > .column,
+  .columns-area > div > .mastodon-column-container > .column {
+    @include c1 {
+      width: 100%;
+    }
+  }    
 }

app/javascript/styles/enable-wide-column.scss

@@ -38,6 +38,8 @@ def process_update
     user.settings['use_pending_items']   = use_pending_items_preference if change?('setting_use_pending_items')
     user.settings['trends']              = trends_preference if change?('setting_trends')
     user.settings['crop_images']         = crop_images_preference if change?('setting_crop_images')
+    user.settings['bigger_publish']      = bigger_publish_preference if change?('setting_bigger_publish')
+    user.settings['wider_column']        = wider_column_preference if change?('setting_wider_column')
   end
 
   def merged_notification_emails
@@ -132,6 +134,14 @@ def crop_images_preference
     boolean_cast_setting 'setting_crop_images'
   end
 
+  def bigger_publish_preference
+    boolean_cast_setting 'setting_bigger_publish'
+  end
+
+  def wider_column_preference
+    boolean_cast_setting 'setting_wider_column'
+  end
+
   def boolean_cast_setting(key)
     ActiveModel::Type::Boolean.new.cast(settings[key])
   end

…/javascript/styles/mods/big-publish.scss …vascript/styles/mods/bigger-publish.scssapp/javascript/styles/mods/big-publish.scss renamed to app/javascript/styles/mods/bigger-publish.scss app/javascript/styles/mods/big-publish.scss renamed to app/javascript/styles/mods/bigger-publish.scss

@@ -130,6 +130,7 @@ class User < ApplicationRecord
            :expand_spoilers, :default_language, :aggregate_reblogs, :show_application,
            :advanced_layout, :use_blurhash, :use_pending_items, :trends, :crop_images,
            :disable_swiping,
+           :bigger_publish, :wider_column,
            to: :settings, prefix: :setting, allow_nil: false
 
   attr_reader :invite_code, :sign_in_token_attempt