Commit 6bcbad7d authored by Mark Florian's avatar Mark Florian

Merge branch...

Merge branch '233665-replace-bootstrap-alerts-in-app/views/shared/_no_password.html.haml' into 'master'

Replace bootstrap alerts in app/views/shared/_no_password.html.haml

Closes #233665

See merge request gitlab-org/gitlab!41397
parents a54acc66 3d2d8cd6
- if show_no_password_message? - if show_no_password_message?
.no-password-message.alert.alert-warning .no-password-message.gl-alert.gl-alert-warning
- translation_params = { protocol: gitlab_config.protocol.upcase, set_password_link: link_to_set_password } = sprite_icon('warning', size: 16, css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title')
- set_password_message = _("You won't be able to pull or push project code via %{protocol} until you %{set_password_link} on your account") % translation_params %button.js-close.gl-alert-dismiss{ type: 'button', 'aria-label': _('Dismiss') }
= set_password_message.html_safe = sprite_icon('close', size: 16, css_class: 'gl-icon')
.alert-link-group .gl-alert-body
= link_to _("Don't show again"), profile_path(user: {hide_no_password: true}), method: :put - translation_params = { protocol: gitlab_config.protocol.upcase, set_password_link: link_to_set_password }
| - set_password_message = _("You won't be able to pull or push project code via %{protocol} until you %{set_password_link} on your account") % translation_params
= link_to _('Remind later'), '#', class: 'hide-no-password-message' = set_password_message.html_safe
.gl-alert-actions
= link_to _('Remind later'), '#', class: 'hide-no-password-message btn gl-alert-action btn-info btn-md gl-button'
= link_to _("Don't show again"), profile_path(user: {hide_no_password: true}), method: :put, role: 'button', class: 'btn gl-alert-action btn-md btn-default gl-button btn-default-secondary'
---
title: Replace bootstrap alerts in app/views/shared/_no_password.html.haml
merge_request: 41397
author: Gilang Gumilar
type: changed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment