Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-01-13 16:37:25 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-01-13 16:37:25 +0300
commit3b3f755b5bfa5348375fffe22ec56fe0f01ac1f5 (patch)
treef6bf7e2b36f263674170937e82804e8df030952e /app/views/groups/show.html.haml
parentb433efcf70dbafd5f76ce7140a4e6eb36008eee5 (diff)
New layout without background color
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/views/groups/show.html.haml')
-rw-r--r--app/views/groups/show.html.haml30
1 files changed, 18 insertions, 12 deletions
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml
index 48a544fc834..34719481984 100644
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -5,6 +5,9 @@
- if current_user
= auto_discovery_link_tag(:atom, group_url(@group, format: :atom, private_token: current_user.private_token), title: "#{@group.name} activity")
+- @no_container = true
+- @blank_container = true
+
.cover-block
.cover-controls
- if @group && can?(current_user, :admin_group, @group)
@@ -25,8 +28,8 @@
.cover-desc.description
= markdown(@group.description, pipeline: :description)
-- if can?(current_user, :read_group, @group)
- %ul.center-top-menu.no-top
+
+ %ul.center-top-menu.cover-menu
%li.active
= link_to "#activity", 'data-toggle' => 'tab' do
Activity
@@ -35,19 +38,22 @@
= link_to "#projects", 'data-toggle' => 'tab' do
Projects
- .tab-content
- .tab-pane.active#activity
- .gray-content-block.activity-filter-block
- - if current_user
- = render "events/event_last_push", event: @last_push
+- if can?(current_user, :read_group, @group)
+
+ %div{ class: container_class }
+ .tab-content
+ .tab-pane.active#activity
+ .activity-filter-block
+ - if current_user
+ = render "events/event_last_push", event: @last_push
- = render 'shared/event_filter'
+ = render 'shared/event_filter'
- .content_list
- = spinner
+ .content_list
+ = spinner
- .tab-pane#projects
- = render "projects", projects: @projects
+ .tab-pane#projects
+ = render "projects", projects: @projects
- else
%p.center-top-menu.no-top