From db065b3c0b78a8d2454990c4261b9f15bcacf1f1 Mon Sep 17 00:00:00 2001 From: mgabdev <> Date: Tue, 23 Jul 2019 15:12:43 -0400 Subject: [PATCH 1/2] Updated account action notification email checkbox false/off by default to not alert user via email --- app/controllers/admin/account_actions_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/admin/account_actions_controller.rb b/app/controllers/admin/account_actions_controller.rb index a2cea461..415b3de2 100644 --- a/app/controllers/admin/account_actions_controller.rb +++ b/app/controllers/admin/account_actions_controller.rb @@ -5,7 +5,7 @@ module Admin before_action :set_account def new - @account_action = Admin::AccountAction.new(type: params[:type], report_id: params[:report_id], send_email_notification: true) + @account_action = Admin::AccountAction.new(type: params[:type], report_id: params[:report_id], send_email_notification: false) @warning_presets = AccountWarningPreset.all end From a272a640b86172d4533d9e21d274ffe30dffd901 Mon Sep 17 00:00:00 2001 From: mgabdev <> Date: Tue, 23 Jul 2019 16:24:04 -0400 Subject: [PATCH 2/2] revert 713deb81 fixes: #61 --- app/javascript/styles/gabsocial/components.scss | 5 ++--- app/javascript/styles/gabsocial/components/user-panel.scss | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/javascript/styles/gabsocial/components.scss b/app/javascript/styles/gabsocial/components.scss index a7b3ebe7..01b543cd 100644 --- a/app/javascript/styles/gabsocial/components.scss +++ b/app/javascript/styles/gabsocial/components.scss @@ -1310,7 +1310,7 @@ a.account__display-name { } &__inner { - width: 265px; + width: 285px; pointer-events: auto; height: 100%; } @@ -1324,8 +1324,7 @@ a.account__display-name { flex-direction: column; @media screen and (min-width: 360px) { - margin: 0 20px; - padding: 0; + padding: 0 10px; } } } diff --git a/app/javascript/styles/gabsocial/components/user-panel.scss b/app/javascript/styles/gabsocial/components/user-panel.scss index 158eb4ea..29d2aad1 100644 --- a/app/javascript/styles/gabsocial/components/user-panel.scss +++ b/app/javascript/styles/gabsocial/components/user-panel.scss @@ -1,6 +1,6 @@ .user-panel { display: flex; - width: 265px; + width: 285px; flex-direction: column; overflow-y: hidden; @include gab-container-standards();