diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-01-25 21:58:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-25 21:58:31 +0100 |
| commit | 7acf26e7778f8bb2b62c61904547dec75723c203 (patch) | |
| tree | 036948c5d0eb01bf9ae18d612d965ac9c9b89fae /app/views | |
| parent | 368d6fe54f94ad2ecd2a1c1e7e5a2359dc37ad30 (diff) | |
| parent | 20934363492db6a33bf89726444c7a41eaa8d854 (diff) | |
Merge pull request #2094 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/auth/confirmations/new.html.haml | 2 | ||||
| -rw-r--r-- | app/views/settings/featured_tags/index.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/auth/confirmations/new.html.haml b/app/views/auth/confirmations/new.html.haml index a294d3cb5..a98257873 100644 --- a/app/views/auth/confirmations/new.html.haml +++ b/app/views/auth/confirmations/new.html.haml @@ -5,7 +5,7 @@ = render 'shared/error_messages', object: resource .fields-group - = f.input :email, autofocus: true, wrapper: :with_label, label: t('simple_form.labels.defaults.email'), input_html: { 'aria-label': t('simple_form.labels.defaults.email') }, hint: false + = f.input :email, autofocus: true, wrapper: :with_label, label: t('simple_form.labels.defaults.email'), input_html: { 'aria-label': t('simple_form.labels.defaults.email') }, readonly: current_user.present?, hint: current_user.present? && t('auth.confirmations.wrong_email_hint') .actions = f.button :button, t('auth.resend_confirmation'), type: :submit diff --git a/app/views/settings/featured_tags/index.html.haml b/app/views/settings/featured_tags/index.html.haml index 078abd788..3ead9d2e2 100644 --- a/app/views/settings/featured_tags/index.html.haml +++ b/app/views/settings/featured_tags/index.html.haml @@ -17,7 +17,7 @@ %hr.spacer/ - @featured_tags.each do |featured_tag| - .directory__tag{ class: params[:tag] == featured_tag.name ? 'active' : nil } + .directory__tag %div %h4 = fa_icon 'hashtag' |