random-mirrors
/
gab-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://code.gab.com/gab/social/gab-social into develop

This commit is contained in:
Rob Colbert 2019-07-23 19:38:25 -04:00
parent 90ad01d133 a272a640b8
commit 4680d5521a
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/admin/account_actions_controller.rb
View File

@ -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

5
app/javascript/styles/gabsocial/components.scss
View File

@ -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;
}
}
}

2
app/javascript/styles/gabsocial/components/user-panel.scss
View File

@ -1,6 +1,6 @@
.user-panel {
display: flex;
width: 265px;
width: 285px;
flex-direction: column;
overflow-y: hidden;
@include gab-container-standards();