diff options
| author | Phil Hughes <me@iamphill.com> | 2017-06-23 07:36:41 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-06-23 07:36:41 +0000 |
| commit | 8fa464e63826b1b196e3ecd31ccea56007d3d30c (patch) | |
| tree | 9969aecff6ba3ae53d2fe7fb094cae12d618aa9e | |
| parent | f09aa6b755043e9bba1eb7ae8f1ae45adc5df136 (diff) | |
| parent | 6695cd9d6e5c3f56ac0626d6db565199223666b3 (diff) | |
| download | gitlab-ce-8fa464e63826b1b196e3ecd31ccea56007d3d30c.tar.gz | |
Merge branch '34120-environment-detail-bug' into 'master'
Fix mobile environment detail view
Closes #34120
See merge request !12382
| -rw-r--r-- | app/assets/stylesheets/pages/environments.scss | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/pipelines.scss | 2 | ||||
| -rw-r--r-- | app/views/projects/deployments/_deployment.html.haml | 17 |
3 files changed, 11 insertions, 9 deletions
diff --git a/app/assets/stylesheets/pages/environments.scss b/app/assets/stylesheets/pages/environments.scss index 89bd437b362..1046ebfa2e2 100644 --- a/app/assets/stylesheets/pages/environments.scss +++ b/app/assets/stylesheets/pages/environments.scss @@ -83,6 +83,7 @@ .avatar { float: none; + margin-right: 0; } } diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss index a85ba3a5955..9637d26e56d 100644 --- a/app/assets/stylesheets/pages/pipelines.scss +++ b/app/assets/stylesheets/pages/pipelines.scss @@ -133,7 +133,7 @@ overflow: hidden; display: inline-block; white-space: nowrap; - vertical-align: top; + vertical-align: middle; text-overflow: ellipsis; } diff --git a/app/views/projects/deployments/_deployment.html.haml b/app/views/projects/deployments/_deployment.html.haml index 9b2ec9ae41c..26f3c297260 100644 --- a/app/views/projects/deployments/_deployment.html.haml +++ b/app/views/projects/deployments/_deployment.html.haml @@ -3,24 +3,25 @@ .table-mobile-header{ role: 'rowheader' } ID %strong.table-mobile-content ##{deployment.iid} - .table-section.section-40{ role: 'gridcell' } + .table-section.section-30{ role: 'gridcell' } .table-mobile-header{ role: 'rowheader' } Commit = render 'projects/deployments/commit', deployment: deployment - .table-section.section-15.build-column{ role: 'gridcell' } + .table-section.section-25.build-column{ role: 'gridcell' } .table-mobile-header{ role: 'rowheader' } Job - if deployment.deployable - = link_to [@project.namespace.becomes(Namespace), @project, deployment.deployable], class: 'build-link table-mobile-content' do - #{deployment.deployable.name} (##{deployment.deployable.id}) - - if deployment.user - by - = user_avatar(user: deployment.user, size: 20) + .table-mobile-content + = link_to [@project.namespace.becomes(Namespace), @project, deployment.deployable], class: 'build-link' do + #{deployment.deployable.name} (##{deployment.deployable.id}) + - if deployment.user + by + = user_avatar(user: deployment.user, size: 20) .table-section.section-15{ role: 'gridcell' } .table-mobile-header{ role: 'rowheader' } Created %span.table-mobile-content= time_ago_with_tooltip(deployment.created_at) .table-section.section-20.table-button-footer{ role: 'gridcell' } - .btn-group.table-action-button + .btn-group.table-action-buttons = render 'projects/deployments/actions', deployment: deployment = render 'projects/deployments/rollback', deployment: deployment |