diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-05-22 17:18:07 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-05-22 17:18:07 +0000 |
| commit | 33eb47d7daf7907b82bf5119e3438fea0dea22f4 (patch) | |
| tree | 5ee7a28fdad9d525d761d89495a0032e779f6ab1 | |
| parent | 9ba8512c08b796746ba2de8610e829b0e1283d73 (diff) | |
| parent | 2c33dd0c3282a9dee3dc0e595d81d1b683add5f9 (diff) | |
| download | gitlab-ce-33eb47d7daf7907b82bf5119e3438fea0dea22f4.tar.gz | |
Merge branch '32570-project-activity-tab-border' into 'master'
32570 Fix border-bottom for project activity tab
Closes #32570
See merge request !11568
| -rw-r--r-- | app/assets/stylesheets/framework/nav.scss | 4 | ||||
| -rw-r--r-- | app/views/dashboard/_activities.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/_activity.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/32570-project-activity-tab-border.yml | 4 |
4 files changed, 8 insertions, 4 deletions
diff --git a/app/assets/stylesheets/framework/nav.scss b/app/assets/stylesheets/framework/nav.scss index e890c2e0634..28b2a7cfacd 100644 --- a/app/assets/stylesheets/framework/nav.scss +++ b/app/assets/stylesheets/framework/nav.scss @@ -443,8 +443,8 @@ } } -.activities { - .nav-block { +.nav-block { + &.activities { border-bottom: 1px solid $border-color; .nav-links { diff --git a/app/views/dashboard/_activities.html.haml b/app/views/dashboard/_activities.html.haml index 89d991abe54..e1b270a08c2 100644 --- a/app/views/dashboard/_activities.html.haml +++ b/app/views/dashboard/_activities.html.haml @@ -1,7 +1,7 @@ .hidden-xs = render "events/event_last_push", event: @last_push -.nav-block +.nav-block.activities .controls = link_to dashboard_projects_path(rss_url_options), class: 'btn rss-btn has-tooltip', title: 'Subscribe' do %i.fa.fa-rss diff --git a/app/views/projects/_activity.html.haml b/app/views/projects/_activity.html.haml index aa0cb3e1a50..f5bb7364d4a 100644 --- a/app/views/projects/_activity.html.haml +++ b/app/views/projects/_activity.html.haml @@ -1,7 +1,7 @@ - @no_container = true %div{ class: container_class } - .nav-block.activity-filter-block + .nav-block.activity-filter-block.activities .controls = link_to namespace_project_path(@project.namespace, @project, rss_url_options), title: "Subscribe", class: 'btn rss-btn has-tooltip' do = icon('rss') diff --git a/changelogs/unreleased/32570-project-activity-tab-border.yml b/changelogs/unreleased/32570-project-activity-tab-border.yml new file mode 100644 index 00000000000..100a3e6a74d --- /dev/null +++ b/changelogs/unreleased/32570-project-activity-tab-border.yml @@ -0,0 +1,4 @@ +--- +title: Fix border-bottom for project activity tab +merge_request: +author: |