Commit f53557a4 authored by Annabel Dunstone's avatar Annabel Dunstone

Group navigation design update

parent bdda1eed
...@@ -150,6 +150,13 @@ ...@@ -150,6 +150,13 @@
right: auto; right: auto;
} }
} }
&.groups-cover-block {
background: $white-light;
border-bottom: 1px solid $border-color;
text-align: left;
padding: 24px 0;
}
} }
.block-connector { .block-connector {
......
...@@ -30,6 +30,10 @@ header { ...@@ -30,6 +30,10 @@ header {
border: none; border: none;
border-bottom: 1px solid $border-color; border-bottom: 1px solid $border-color;
&.with-horizontal-nav {
border-bottom: none;
}
.container-fluid { .container-fluid {
width: 100% !important; width: 100% !important;
filter: none; filter: none;
......
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
} }
&.active a { &.active a {
color: #000; border-bottom: 2px solid $link-underline-blue;
border-bottom: 2px solid #4688f1; color: $black;
} }
.badge { .badge {
...@@ -193,7 +193,7 @@ ...@@ -193,7 +193,7 @@
.controls { .controls {
float: right; float: right;
position: relative; position: relative;
top: 10px; top: 0;
.dropdown { .dropdown {
margin-left: 7px; margin-left: 7px;
...@@ -202,5 +202,9 @@ ...@@ -202,5 +202,9 @@
.nav-links { .nav-links {
border-bottom: none; border-bottom: none;
a {
padding-top: 2px;
}
} }
} }
...@@ -74,6 +74,7 @@ $btn-transparent-color: #8f8f8f; ...@@ -74,6 +74,7 @@ $btn-transparent-color: #8f8f8f;
$settings-icon-size: 18px; $settings-icon-size: 18px;
$provider-btn-group-border: #e5e5e5; $provider-btn-group-border: #e5e5e5;
$provider-btn-not-active-color: #4688f1; $provider-btn-not-active-color: #4688f1;
$link-underline-blue: #4a8bee;
/* /*
* Color schema * Color schema
...@@ -108,6 +109,7 @@ $red-light: #e52c5a; ...@@ -108,6 +109,7 @@ $red-light: #e52c5a;
$red-normal: #d22852; $red-normal: #d22852;
$red-dark: darken($red-normal, 5%); $red-dark: darken($red-normal, 5%);
$black: #000000;
$black-transparent: rgba(0, 0, 0, 0.3); $black-transparent: rgba(0, 0, 0, 0.3);
$border-white-light: #f1f2f4; $border-white-light: #f1f2f4;
......
...@@ -34,10 +34,13 @@ module NavHelper ...@@ -34,10 +34,13 @@ module NavHelper
end end
def nav_header_class def nav_header_class
class_name =
if nav_menu_collapsed? if nav_menu_collapsed?
"header-collapsed" "header-collapsed"
else else
"header-expanded" "header-expanded"
end end
class_name += " with-horizontal-nav" if defined?(nav) && nav
class_name
end end
end end
...@@ -4,18 +4,12 @@ ...@@ -4,18 +4,12 @@
- if current_user - if current_user
= auto_discovery_link_tag(:atom, group_url(@group, format: :atom, private_token: current_user.private_token), title: "#{@group.name} activity") = auto_discovery_link_tag(:atom, group_url(@group, format: :atom, private_token: current_user.private_token), title: "#{@group.name} activity")
.cover-block .cover-block.groups-cover-block
.avatar-holder .container-fluid
= link_to group_icon(@group), target: '_blank' do = link_to group_icon(@group), target: '_blank' do
= image_tag group_icon(@group), class: "avatar group-avatar s90" = image_tag group_icon(@group), class: "avatar group-avatar s90"
.cover-title .cover-title
%h1 %h1 @#{@group.path}
= @group.name
%span.visibility-icon.has-tooltip{ data: { container: 'body' }, title: visibility_icon_description(@group) }
= visibility_level_icon(@group.visibility_level, fw: false)
.cover-desc.username
@#{@group.path}
- if @group.description.present? - if @group.description.present?
.cover-desc.description .cover-desc.description
......
...@@ -44,14 +44,16 @@ ...@@ -44,14 +44,16 @@
%span %span
Issues Issues
- issues = IssuesFinder.new(current_user, group_id: @group.id, state: 'opened').execute - issues = IssuesFinder.new(current_user, group_id: @group.id, state: 'opened').execute
%span.badge.count= number_with_delimiter(issues.count) %span.count
(#{number_with_delimiter(issues.count)})
= nav_link(path: 'groups#merge_requests') do = nav_link(path: 'groups#merge_requests') do
= link_to merge_requests_group_path(@group), title: 'Merge Requests' do = link_to merge_requests_group_path(@group), title: 'Merge Requests' do
= icon('tasks fw') = icon('tasks fw')
%span %span
Merge Requests Merge Requests
- merge_requests = MergeRequestsFinder.new(current_user, group_id: @group.id, state: 'opened').execute - merge_requests = MergeRequestsFinder.new(current_user, group_id: @group.id, state: 'opened').execute
%span.badge.count= number_with_delimiter(merge_requests.count) %span.count
(#{number_with_delimiter(merge_requests.count)})
= nav_link(controller: [:group_members]) do = nav_link(controller: [:group_members]) do
= link_to group_group_members_path(@group), title: 'Members' do = link_to group_group_members_path(@group), title: 'Members' do
= icon('users fw') = icon('users fw')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment