tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire
2022-08-25 05:07:39 +02:00
parent 5a3d09dc8e 861b35dd54
commit 2d1d4210f9
67 changed files with 1420 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/admin/roles/_form.html.haml
View File

@@ -13,7 +13,7 @@
= f.input :position, wrapper: :with_label, input_html: { max: current_user.role.position - 1 }
.fields-group
= f.input :color, wrapper: :with_label, input_html: { placeholder: '#000000' }
= f.input :color, wrapper: :with_label, input_html: { placeholder: '#000000', type: 'color' }
%hr.spacer/