diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-10-06 17:07:31 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-10-06 17:07:31 +0000 |
| commit | c762260612785edea6c5304002267eac7afe8805 (patch) | |
| tree | fca88a5c4041dfbda61fd0ed758e2fd2be97bc2c | |
| parent | 4299df0439d01f190aa7e27a2d49344844596e6a (diff) | |
| parent | bcd7686a194cfec013c394b7b49b4311299f2aa4 (diff) | |
| download | gitlab-ce-c762260612785edea6c5304002267eac7afe8805.tar.gz | |
Merge branch '38775-scrollable-tabs-on-admin' into 'master'
Scrollable tabs on top on Admin Jobs/Projects
Closes #38775
See merge request gitlab-org/gitlab-ce!14685
| -rw-r--r-- | app/views/admin/jobs/index.html.haml | 2 | ||||
| -rw-r--r-- | app/views/admin/projects/index.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/38775-scrollable-tabs-on-admin.yml | 5 |
3 files changed, 7 insertions, 2 deletions
diff --git a/app/views/admin/jobs/index.html.haml b/app/views/admin/jobs/index.html.haml index 0310498ae54..7066ed12b95 100644 --- a/app/views/admin/jobs/index.html.haml +++ b/app/views/admin/jobs/index.html.haml @@ -3,7 +3,7 @@ %div{ class: container_class } - .top-area + .top-area.scrolling-tabs-container.inner-page-scroll-tabs - build_path_proc = ->(scope) { admin_jobs_path(scope: scope) } = render "shared/builds/tabs", build_path_proc: build_path_proc, all_builds: @all_builds, scope: @scope diff --git a/app/views/admin/projects/index.html.haml b/app/views/admin/projects/index.html.haml index 3f202fbf4fe..4d8754afdd2 100644 --- a/app/views/admin/projects/index.html.haml +++ b/app/views/admin/projects/index.html.haml @@ -4,7 +4,7 @@ %div{ class: container_class } - .top-area + .top-area.scrolling-tabs-container.inner-page-scroll-tabs .prepend-top-default .search-holder = render 'shared/projects/search_form', autofocus: true, icon: true diff --git a/changelogs/unreleased/38775-scrollable-tabs-on-admin.yml b/changelogs/unreleased/38775-scrollable-tabs-on-admin.yml new file mode 100644 index 00000000000..65a66714bcb --- /dev/null +++ b/changelogs/unreleased/38775-scrollable-tabs-on-admin.yml @@ -0,0 +1,5 @@ +--- +title: Make tabs on top scrollable on admin dashboard +merge_request: 14685 +author: Takuya Noguchi +type: fixed |