kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Re-jig banner callout markup for new design

Browse source
This commit is contained in:
Luke Bennett 2018-03-29 14:20:04 +01:00
parent 4847acd81d
commit 91df6c2270
No known key found for this signature in database
GPG key ID: A738E9C68D3BF31A
2 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/views/shared/_auto_devops_callout.html.haml
View file

@ -2,13 +2,13 @@
.banner-graphic .banner-graphic
= custom_icon('icon_autodevops') = custom_icon('icon_autodevops')
.prepend-top-10.prepend-left-10.append-bottom-10 .banner-body.prepend-top-10.prepend-left-10.append-bottom-10
%h5= s_('AutoDevOps|Auto DevOps (Beta)') %h5= s_('AutoDevOps|Auto DevOps (Beta)')
%p= s_('AutoDevOps|It will automatically build, test, and deploy your application based on a predefined CI/CD configuration.') %p= s_('AutoDevOps|It will automatically build, test, and deploy your application based on a predefined CI/CD configuration.')
%p %p
- link = link_to(s_('AutoDevOps|Auto DevOps documentation'), help_page_path('topics/autodevops/index.md'), target: '_blank', rel: 'noopener noreferrer') - link = link_to(s_('AutoDevOps|Auto DevOps documentation'), help_page_path('topics/autodevops/index.md'), target: '_blank', rel: 'noopener noreferrer')
= s_('AutoDevOps|Learn more in the %{link_to_documentation}').html_safe % { link_to_documentation: link } = s_('AutoDevOps|Learn more in the %{link_to_documentation}').html_safe % { link_to_documentation: link }
.prepend-top-10 .banner-buttons
= link_to s_('AutoDevOps|Enable in settings'), project_settings_ci_cd_path(@project, anchor: 'js-general-pipeline-settings'), class: 'btn js-close-callout' = link_to s_('AutoDevOps|Enable in settings'), project_settings_ci_cd_path(@project, anchor: 'js-general-pipeline-settings'), class: 'btn js-close-callout'
%button.btn-transparent.banner-close.close.js-close-callout{ type: 'button', %button.btn-transparent.banner-close.close.js-close-callout{ type: 'button',

18
app/views/shared/milestones/_deprecation_message.html.haml
View file

@ -1,14 +1,12 @@
.milestone-deprecation-message.prepend-top-default.prepend-left-default .banner-callout.compact.milestone-deprecation-message.js-milestone-deprecation-message.prepend-top-20
.illustration.inline= image_tag 'illustrations/milestone_removing-page.svg', class: 'append-right-default' .banner-graphic= image_tag 'illustrations/milestone_removing-page.svg'
.inline.vertical-align-middle .banner-body.prepend-left-10.append-right-10
%strong= _('This page will be removed in a future release.') %h5.prepend-top-0= _('This page will be removed in a future release.')
%p.append-bottom-default.prepend-top-5 %p= _('Use group milestones to manage issues from multiple projects in the same milestone.')
= _('Use group milestones to manage issues from multiple projects in the same milestone.') = button_tag _('Promote these project milestones into a group milestone.'), class: 'btn-link js-popover-link text-align-left'
%br .banner-buttons.prepend-top-20= link_to _('Learn more'), help_page_url('user/project/milestones/index', anchor: 'promoting-project-milestones-to-group-milestones'), class: 'btn btn-default', target: '_blank'
= button_tag _('Promote these project milestones into a group milestone.'), class: 'btn-link popover-link prepend-left-0'
%div= link_to _('Learn more'), help_page_url('user/project/milestones/index', anchor: 'promoting-project-milestones-to-group-milestones'), class: 'btn btn-default', target: '_blank'
%template.milestone-deprecation-message-template %template.js-milestone-deprecation-message-template
.milestone-popover-body .milestone-popover-body
%ol.milestone-popover-instructions-list.append-bottom-0 %ol.milestone-popover-instructions-list.append-bottom-0
%li= _('Click any <strong>project name</strong> in the project list below to navigate to the project milestone.').html_safe %li= _('Click any <strong>project name</strong> in the project list below to navigate to the project milestone.').html_safe