diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-05 03:07:49 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-05 03:07:49 +0300 |
commit | 77237c5a6b9044f58beabc54d3589e5fa09cbfba (patch) | |
tree | f43188047fe8955f6cf78e05ae9c2e8f6a019e0b /app/views/shared | |
parent | 2fd92f2dc784ade9cb4e1c33dd60cbfad7b86818 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/shared')
-rw-r--r-- | app/views/shared/_broadcast_message.html.haml | 10 | ||||
-rw-r--r-- | app/views/shared/milestones/_issuable.html.haml | 5 |
2 files changed, 8 insertions, 7 deletions
diff --git a/app/views/shared/_broadcast_message.html.haml b/app/views/shared/_broadcast_message.html.haml index c058b210688..bc4db672938 100644 --- a/app/views/shared/_broadcast_message.html.haml +++ b/app/views/shared/_broadcast_message.html.haml @@ -1,8 +1,10 @@ %div{ class: "broadcast-#{message.broadcast_type}-message #{opts[:preview] && 'preview'} js-broadcast-notification-#{message.id} d-flex", style: broadcast_message_style(message), dir: 'auto' } - %div + .flex-grow-1.text-right.pr-2 = sprite_icon('bullhorn', size: 16, css_class: 'vertical-align-text-top') + %div{ class: !fluid_layout && 'container-limited' } = render_broadcast_message(message) - - if message.notification? && opts[:preview].blank? - %button.js-dismiss-current-broadcast-notification.btn.btn-link.text-dark.pl-2.pr-2{ 'aria-label' => _('Close'), :type => 'button', data: { id: message.id } } - %i.fa.fa-times + .flex-grow-1.text-right{ style: 'flex-basis: 0' } + - if (message.notification? || message.dismissable?) && opts[:preview].blank? + %button.broadcast-message-dismiss.js-dismiss-current-broadcast-notification.btn.btn-link.pl-2.pr-2{ 'aria-label' => _('Close'), :type => 'button', data: { id: message.id } } + %i.fa.fa-times diff --git a/app/views/shared/milestones/_issuable.html.haml b/app/views/shared/milestones/_issuable.html.haml index 965c72b82ba..0adfe2f0c04 100644 --- a/app/views/shared/milestones/_issuable.html.haml +++ b/app/views/shared/milestones/_issuable.html.haml @@ -1,9 +1,8 @@ -# @project is present when viewing Project's milestone - project = @project || issuable.project -- namespace = @project_namespace || project.namespace.becomes(Namespace) - labels = issuable.labels - assignees = issuable.assignees -- base_url_args = [namespace, project] +- base_url_args = [project] - issuable_type_args = base_url_args + [issuable.class.table_name] - issuable_url_args = base_url_args + [issuable] @@ -17,7 +16,7 @@ = confidential_icon(issuable) = link_to issuable.title, issuable_url_args, title: issuable.title .issuable-detail - = link_to [namespace, project, issuable], class: 'issue-link' do + = link_to issuable_url_args, class: 'issue-link' do %span.issuable-number= issuable.to_reference - labels.each do |label| |