summaryrefslogtreecommitdiff
path: root/app/views/projects/branches/index.html.haml
diff options
context:
space:
mode:
authorAnnabel Dunstone <annabel.dunstone@gmail.com>2016-06-03 12:09:45 -0600
committerAnnabel Dunstone <annabel.dunstone@gmail.com>2016-06-07 09:08:15 -0500
commit5db95f5e6991f61193b57aa22447479ff5dede93 (patch)
tree88bb88aac7958ebe036f29ba3fe9cea8dacc1d69 /app/views/projects/branches/index.html.haml
parent664afebbe9e62f13074c999d84674a0e37fa8cc2 (diff)
downloadgitlab-ce-5db95f5e6991f61193b57aa22447479ff5dede93.tar.gz
Finish styling sub nav
Diffstat (limited to 'app/views/projects/branches/index.html.haml')
-rw-r--r--app/views/projects/branches/index.html.haml61
1 files changed, 32 insertions, 29 deletions
diff --git a/app/views/projects/branches/index.html.haml b/app/views/projects/branches/index.html.haml
index 08148b1a18b..0d59c3884cd 100644
--- a/app/views/projects/branches/index.html.haml
+++ b/app/views/projects/branches/index.html.haml
@@ -1,32 +1,35 @@
+- @no_container = true
- page_title "Branches"
= render "projects/commits/head"
-.row-content-block
- .pull-right
- - if can? current_user, :push_code, @project
- = link_to new_namespace_project_branch_path(@project.namespace, @project), class: 'btn btn-create' do
- = icon('plus')
- New branch
- &nbsp;
- .dropdown.inline
- %button.dropdown-toggle.btn{type: 'button', 'data-toggle' => 'dropdown'}
- %span.light
- - if @sort.present?
- = @sort.humanize
- - else
- Name
- %b.caret
- %ul.dropdown-menu.dropdown-menu-align-right
- %li
- = link_to namespace_project_branches_path(sort: nil) do
+
+%div{ class: (container_class) }
+ .row-content-block.second-block.content-component-block
+ .pull-right
+ - if can? current_user, :push_code, @project
+ = link_to new_namespace_project_branch_path(@project.namespace, @project), class: 'btn btn-create' do
+ = icon('plus')
+ New branch
+ &nbsp;
+ .dropdown.inline
+ %button.dropdown-toggle.btn{type: 'button', 'data-toggle' => 'dropdown'}
+ %span.light
+ - if @sort.present?
+ = @sort.humanize
+ - else
Name
- = link_to namespace_project_branches_path(sort: 'recently_updated') do
- = sort_title_recently_updated
- = link_to namespace_project_branches_path(sort: 'last_updated') do
- = sort_title_oldest_updated
- .oneline
- Protected branches can be managed in project settings
-- unless @branches.empty?
- %ul.content-list.all-branches
- - @branches.each do |branch|
- = render "projects/branches/branch", branch: branch
- = paginate @branches, theme: 'gitlab'
+ %b.caret
+ %ul.dropdown-menu.dropdown-menu-align-right
+ %li
+ = link_to namespace_project_branches_path(sort: nil) do
+ Name
+ = link_to namespace_project_branches_path(sort: 'recently_updated') do
+ = sort_title_recently_updated
+ = link_to namespace_project_branches_path(sort: 'last_updated') do
+ = sort_title_oldest_updated
+ .oneline
+ Protected branches can be managed in project settings
+ - unless @branches.empty?
+ %ul.content-list.all-branches
+ - @branches.each do |branch|
+ = render "projects/branches/branch", branch: branch
+ = paginate @branches, theme: 'gitlab'