diff options
author | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-06-03 12:09:45 -0600 |
---|---|---|
committer | Annabel Dunstone <annabel.dunstone@gmail.com> | 2016-06-07 09:08:15 -0500 |
commit | 5db95f5e6991f61193b57aa22447479ff5dede93 (patch) | |
tree | 88bb88aac7958ebe036f29ba3fe9cea8dacc1d69 /app/views/projects/network | |
parent | 664afebbe9e62f13074c999d84674a0e37fa8cc2 (diff) | |
download | gitlab-ce-5db95f5e6991f61193b57aa22447479ff5dede93.tar.gz |
Finish styling sub nav
Diffstat (limited to 'app/views/projects/network')
-rw-r--r-- | app/views/projects/network/_head.html.haml | 13 | ||||
-rw-r--r-- | app/views/projects/network/show.html.haml | 27 |
2 files changed, 22 insertions, 18 deletions
diff --git a/app/views/projects/network/_head.html.haml b/app/views/projects/network/_head.html.haml index c609c505def..86295a3d011 100644 --- a/app/views/projects/network/_head.html.haml +++ b/app/views/projects/network/_head.html.haml @@ -1,6 +1,9 @@ -.row-content-block.append-bottom-default - .tree-ref-holder - = render partial: 'shared/ref_switcher', locals: {destination: 'graph'} +- @no_container = true - .oneline - You can move around the graph by using the arrow keys. +%div{ class: (container_class) } + .row-content-block.second-block.content-component-block + .tree-ref-holder + = render partial: 'shared/ref_switcher', locals: {destination: 'graph'} + + .oneline + You can move around the graph by using the arrow keys. diff --git a/app/views/projects/network/show.html.haml b/app/views/projects/network/show.html.haml index 326180ebe4e..bf9baaea889 100644 --- a/app/views/projects/network/show.html.haml +++ b/app/views/projects/network/show.html.haml @@ -1,20 +1,21 @@ - page_title "Network", @ref = render "projects/commits/head" = render "head" -.project-network - .controls - = form_tag namespace_project_network_path(@project.namespace, @project, @id), method: :get, class: 'form-inline network-form' do |f| - = text_field_tag :extended_sha1, @options[:extended_sha1], placeholder: "Input an extended SHA1 syntax", class: 'search-input form-control input-mx-250 search-sha' - = button_tag class: 'btn btn-success' do - = icon('search') - .inline.prepend-left-20 - .checkbox.light - = label_tag :filter_ref do - = check_box_tag :filter_ref, 1, @options[:filter_ref] - %span Begin with the selected commit +%div{ class: (container_class) } + .project-network + .controls + = form_tag namespace_project_network_path(@project.namespace, @project, @id), method: :get, class: 'form-inline network-form' do |f| + = text_field_tag :extended_sha1, @options[:extended_sha1], placeholder: "Input an extended SHA1 syntax", class: 'search-input form-control input-mx-250 search-sha' + = button_tag class: 'btn btn-success' do + = icon('search') + .inline.prepend-left-20 + .checkbox.light + = label_tag :filter_ref do + = check_box_tag :filter_ref, 1, @options[:filter_ref] + %span Begin with the selected commit - .network-graph - = spinner nil, true + .network-graph + = spinner nil, true :javascript network_graph = new Network({ |