diff options
| author | Kushal Pandya <kushalspandya@gmail.com> | 2019-06-28 09:21:06 +0000 |
|---|---|---|
| committer | Kushal Pandya <kushalspandya@gmail.com> | 2019-06-28 09:21:06 +0000 |
| commit | a80f871a3d9b7ce9de2e1d563eac52ccd12945f4 (patch) | |
| tree | 46cff5f189c734eb246c6343d9609819449eb001 | |
| parent | fad63d9eebb651c2bccfb17596461fef88437419 (diff) | |
| parent | 0fb00b2d4dc3cdd003fca7a51b0e86f8af76f459 (diff) | |
| download | gitlab-ce-a80f871a3d9b7ce9de2e1d563eac52ccd12945f4.tar.gz | |
Merge branch '62968-environment-details-header-border-misaligned' into 'master'
Resolve "Environment details header border misaligned"
Closes #62968
See merge request gitlab-org/gitlab-ce!30011
| -rw-r--r-- | app/views/projects/environments/show.html.haml | 28 | ||||
| -rw-r--r-- | changelogs/unreleased/62968-environment-details-header-border-misaligned.yml | 5 |
2 files changed, 18 insertions, 15 deletions
diff --git a/app/views/projects/environments/show.html.haml b/app/views/projects/environments/show.html.haml index d59b2d4fb01..c13a47b0b09 100644 --- a/app/views/projects/environments/show.html.haml +++ b/app/views/projects/environments/show.html.haml @@ -31,21 +31,19 @@ = button_to stop_project_environment_path(@project, @environment), class: 'btn btn-danger has-tooltip', method: :post do = s_('Environments|Stop environment') - .row.top-area.adjust - .col-md-7 - %h3.page-title= @environment.name - .col-md-5 - .nav-controls - = render 'projects/environments/terminal_button', environment: @environment - = render 'projects/environments/external_url', environment: @environment - = render 'projects/environments/metrics_button', environment: @environment - - if can?(current_user, :update_environment, @environment) - = link_to _('Edit'), edit_project_environment_path(@project, @environment), class: 'btn' - - if can?(current_user, :stop_environment, @environment) - = button_tag class: 'btn btn-danger', type: 'button', data: { toggle: 'modal', - target: '#stop-environment-modal' } do - = sprite_icon('stop') - = s_('Environments|Stop') + .top-area + %h3.page-title= @environment.name + .nav-controls.ml-auto.my-2 + = render 'projects/environments/terminal_button', environment: @environment + = render 'projects/environments/external_url', environment: @environment + = render 'projects/environments/metrics_button', environment: @environment + - if can?(current_user, :update_environment, @environment) + = link_to _('Edit'), edit_project_environment_path(@project, @environment), class: 'btn' + - if can?(current_user, :stop_environment, @environment) + = button_tag class: 'btn btn-danger', type: 'button', data: { toggle: 'modal', + target: '#stop-environment-modal' } do + = sprite_icon('stop') + = s_('Environments|Stop') .environments-container - if @deployments.blank? diff --git a/changelogs/unreleased/62968-environment-details-header-border-misaligned.yml b/changelogs/unreleased/62968-environment-details-header-border-misaligned.yml new file mode 100644 index 00000000000..749fe6a9cb0 --- /dev/null +++ b/changelogs/unreleased/62968-environment-details-header-border-misaligned.yml @@ -0,0 +1,5 @@ +--- +title: Resolve Environment details header border misaligned +merge_request: 30011 +author: +type: fixed |