diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-11-01 23:48:53 +0300 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-11-01 23:48:53 +0300 |
| commit | e54dd249aa7abcdd2c6c888f45399028cb64bb97 (patch) | |
| tree | fe008f050181dda890b4bf1f3097cd0fb178ed2a | |
| parent | 5230f3de33552b64fa3c056dbff7218aa43fc933 (diff) | |
| parent | 78f779b952c156837a3126945580257e7c7d8b86 (diff) | |
Merge branch 'jivl-mobile-friendly-table-runners' into 'master'
Mobile-friendly table on Admin Runners
Closes #33848
See merge request gitlab-org/gitlab-ce!15134
| -rw-r--r-- | app/assets/stylesheets/pages/runners.scss | 7 | ||||
| -rw-r--r-- | app/views/admin/runners/index.html.haml | 33 | ||||
| -rw-r--r-- | changelogs/unreleased/jivl-mobile-friendly-table-runners.yml | 5 |
3 files changed, 29 insertions, 16 deletions
diff --git a/app/assets/stylesheets/pages/runners.scss b/app/assets/stylesheets/pages/runners.scss index 6cac37a4e28..5fb97b13470 100644 --- a/app/assets/stylesheets/pages/runners.scss +++ b/app/assets/stylesheets/pages/runners.scss @@ -50,3 +50,10 @@ font-size: 11px; } } + +@media (max-width: $screen-md-max) { + .runners-content { + width: 100%; + overflow: auto; + } +} diff --git a/app/views/admin/runners/index.html.haml b/app/views/admin/runners/index.html.haml index 76f4a817744..4965dffab9d 100644 --- a/app/views/admin/runners/index.html.haml +++ b/app/views/admin/runners/index.html.haml @@ -52,22 +52,23 @@ %br - if @runners.any? - .table-holder - %table.table - %thead - %tr - %th Type - %th Runner token - %th Description - %th Version - %th Projects - %th Jobs - %th Tags - %th= link_to 'Last contact', admin_runners_path(params.slice(:search).merge(sort: 'contacted_asc')) - %th + .runners-content + .table-holder + %table.table + %thead + %tr + %th Type + %th Runner token + %th Description + %th Version + %th Projects + %th Jobs + %th Tags + %th Last contact + %th - - @runners.each do |runner| - = render "admin/runners/runner", runner: runner - = paginate @runners, theme: "gitlab" + - @runners.each do |runner| + = render "admin/runners/runner", runner: runner + = paginate @runners, theme: "gitlab" - else .nothing-here-block No runners found diff --git a/changelogs/unreleased/jivl-mobile-friendly-table-runners.yml b/changelogs/unreleased/jivl-mobile-friendly-table-runners.yml new file mode 100644 index 00000000000..3448b003ee0 --- /dev/null +++ b/changelogs/unreleased/jivl-mobile-friendly-table-runners.yml @@ -0,0 +1,5 @@ +--- +title: Mobile-friendly table on Admin Runners +merge_request: +author: Takuya Noguchi +type: fixed |