diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-07 11:10:40 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-07 11:10:40 +0200 |
| commit | 6c1d5c5c9c6b0b52741a5bd72a91042d473c390a (patch) | |
| tree | 69e902e8ecbcf23988fd684c9310a99f33f90456 /app | |
| parent | 66eca7d3ba90d88c7214c1ac305788919708f688 (diff) | |
| download | gitlab-ce-6c1d5c5c9c6b0b52741a5bd72a91042d473c390a.tar.gz | |
Fix project page with activity as default home page
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 6 | ||||
| -rw-r--r-- | app/views/projects/_activity.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/show.html.haml | 6 |
3 files changed, 11 insertions, 3 deletions
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index 64db6a85ded..6ab01b3e1b2 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -331,3 +331,9 @@ pre.light-well { padding: 10px 15px; margin: 0; } + +.project-show-activity { + .activity-filter-block { + margin-top: -1px; + } +} diff --git a/app/views/projects/_activity.html.haml b/app/views/projects/_activity.html.haml index 86133768d77..1261f6254d7 100644 --- a/app/views/projects/_activity.html.haml +++ b/app/views/projects/_activity.html.haml @@ -1,5 +1,5 @@ = render 'projects/last_push' -.gray-content-block +.gray-content-block.activity-filter-block - if current_user %ul.nav.nav-pills.event_filter.pull-right %li diff --git a/app/views/projects/show.html.haml b/app/views/projects/show.html.haml index d575891fd46..d5c4ee71978 100644 --- a/app/views/projects/show.html.haml +++ b/app/views/projects/show.html.haml @@ -65,9 +65,11 @@ %section - if prefer_readme? - = render 'projects/readme' + .project-show-readme + = render 'projects/readme' - else - = render 'projects/activity' + .project-show-activity + = render 'projects/activity' - if current_user |