diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2017-02-14 22:55:13 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2017-02-14 22:55:13 +0000 |
| commit | ad649c34cb4419bfdfce6edd101a805822395156 (patch) | |
| tree | 25be15f0df5b9c58600d7faa4cd0d67d4e2245a0 | |
| parent | b4c00ae43dda8e32061539f3177a4294a706efc9 (diff) | |
| parent | 334cd746b3870b59bdd608dddebf4662cef5fc2c (diff) | |
| download | gitlab-ce-ad649c34cb4419bfdfce6edd101a805822395156.tar.gz | |
Merge branch 'master' into 'master'
Fix smaller height of Activity header page
Closes #27631
See merge request !8952
| -rw-r--r-- | app/views/dashboard/_activity_head.html.haml | 15 | ||||
| -rw-r--r-- | changelogs/unreleased/27631-fix-small-height-of-activity-header-page.yml | 4 |
2 files changed, 12 insertions, 7 deletions
diff --git a/app/views/dashboard/_activity_head.html.haml b/app/views/dashboard/_activity_head.html.haml index 02b94beee92..68a46f61eb7 100644 --- a/app/views/dashboard/_activity_head.html.haml +++ b/app/views/dashboard/_activity_head.html.haml @@ -1,7 +1,8 @@ -%ul.nav-links - %li{ class: ("active" unless params[:filter]) }> - = link_to activity_dashboard_path, class: 'shortcuts-activity', data: {placement: 'right'} do - Your Projects - %li{ class: ("active" if params[:filter] == 'starred') }> - = link_to activity_dashboard_path(filter: 'starred'), data: {placement: 'right'} do - Starred Projects +.top-area + %ul.nav-links + %li{ class: ("active" unless params[:filter]) }> + = link_to activity_dashboard_path, class: 'shortcuts-activity', data: {placement: 'right'} do + Your Projects + %li{ class: ("active" if params[:filter] == 'starred') }> + = link_to activity_dashboard_path(filter: 'starred'), data: {placement: 'right'} do + Starred Projects diff --git a/changelogs/unreleased/27631-fix-small-height-of-activity-header-page.yml b/changelogs/unreleased/27631-fix-small-height-of-activity-header-page.yml new file mode 100644 index 00000000000..59da28964f7 --- /dev/null +++ b/changelogs/unreleased/27631-fix-small-height-of-activity-header-page.yml @@ -0,0 +1,4 @@ +--- +title: "Fix small height of activity header page" +merge_request: 8952 +author: Pavel Sorokin |