diff options
| author | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-05-04 19:43:47 +0300 |
|---|---|---|
| committer | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-05-04 19:43:47 +0300 |
| commit | 003b36b45f38ca3116af5d9179fff4adb26a4eb1 (patch) | |
| tree | 83b8ab89e400dfaa675b2786ffe3a9d17cda61d1 /app/views | |
| parent | 21ccf89685bceee2b502a9e6a9fbb55310e02ebc (diff) | |
Fixed layout nav, revert back to badge styles, general enhancements
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/groups/show.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/_page.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/nav/_group.html.haml | 6 |
3 files changed, 4 insertions, 6 deletions
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml index 8c23a4ed1a4..089de798bd8 100644 --- a/app/views/groups/show.html.haml +++ b/app/views/groups/show.html.haml @@ -5,7 +5,7 @@ = auto_discovery_link_tag(:atom, group_url(@group, format: :atom, private_token: current_user.private_token), title: "#{@group.name} activity") .cover-block.groups-cover-block - .container-fluid + .container-fluid.container-limited = link_to group_icon(@group), target: '_blank' do = image_tag group_icon(@group), class: "avatar group-avatar s90" .group-info diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml index ad8a2e1e6c7..3c3bc41bf0e 100644 --- a/app/views/layouts/_page.html.haml +++ b/app/views/layouts/_page.html.haml @@ -26,7 +26,7 @@ .layout-nav .container-fluid = render "layouts/nav/#{nav}" - .content-wrapper + .content-wrapper{ class: ('page-with-layout-nav' if defined?(nav) && nav) } = render "layouts/flash" = yield :flash_message %div{ class: (container_class unless @no_container) } diff --git a/app/views/layouts/nav/_group.html.haml b/app/views/layouts/nav/_group.html.haml index 705682aeb29..0971bccfcd4 100644 --- a/app/views/layouts/nav/_group.html.haml +++ b/app/views/layouts/nav/_group.html.haml @@ -44,16 +44,14 @@ %span Issues - issues = IssuesFinder.new(current_user, group_id: @group.id, state: 'opened').execute - %span.count - (#{number_with_delimiter(issues.count)}) + %span.badge.count= number_with_delimiter(issues.count) = nav_link(path: 'groups#merge_requests') do = link_to merge_requests_group_path(@group), title: 'Merge Requests' do = icon('tasks fw') %span Merge Requests - merge_requests = MergeRequestsFinder.new(current_user, group_id: @group.id, state: 'opened').execute - %span.count - (#{number_with_delimiter(merge_requests.count)}) + %span.badge.count= number_with_delimiter(merge_requests.count) = nav_link(controller: [:group_members]) do = link_to group_group_members_path(@group), title: 'Members' do = icon('users fw') |