Commit af501845 authored by Jacob Schatz's avatar Jacob Schatz Committed by Rubén Dávila

aligns menu at top on one row

parent 8f0eee06
...@@ -391,6 +391,22 @@ pre.light-well { ...@@ -391,6 +391,22 @@ pre.light-well {
padding-bottom: 0; padding-bottom: 0;
margin-bottom: 0px; margin-bottom: 0px;
&.fork-search-form {
margin: 0;
margin-top: -$gl-padding;
padding-bottom: 0;
width: 540px;
input {
width: calc(100% - 277px);
}
.fork_link {
float: right;
margin-left: $gl-padding;
}
}
input { input {
display: inline-block; display: inline-block;
width: calc(100% - 151px); width: calc(100% - 151px);
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
== #{pluralize(@all_forks.size, 'fork')}: #{full_count_title} == #{pluralize(@all_forks.size, 'fork')}: #{full_count_title}
.pull-right .pull-right
.projects-search-form .projects-search-form.fork-search-form
= search_field_tag :filter_projects, nil, placeholder: 'Search forks', class: 'projects-list-filter form-control', = search_field_tag :filter_projects, nil, placeholder: 'Search forks', class: 'projects-list-filter form-control',
spellcheck: false, data: { 'filter-selector' => 'span.namespace-name' } spellcheck: false, data: { 'filter-selector' => 'span.namespace-name' }
...@@ -29,15 +29,15 @@ ...@@ -29,15 +29,15 @@
= link_to page_filter_path(sort: sort_value_oldest_updated) do = link_to page_filter_path(sort: sort_value_oldest_updated) do
= sort_title_oldest_updated = sort_title_oldest_updated
.fork_link.inline .fork_link.inline
- if current_user.already_forked?(@project) && current_user.manageable_namespaces.size < 2 - if current_user.already_forked?(@project) && current_user.manageable_namespaces.size < 2
= link_to namespace_project_path(current_user, current_user.fork_of(@project)), title: 'Go to your fork', class: 'pull-right btn btn-new' do = link_to namespace_project_path(current_user, current_user.fork_of(@project)), title: 'Go to your fork', class: 'pull-right btn btn-new' do
= icon('code-fork fw') = icon('code-fork fw')
Fork Fork
- else - else
= link_to new_namespace_project_fork_path(@project.namespace, @project), title: "Fork project", class: 'pull-right btn btn-new' do = link_to new_namespace_project_fork_path(@project.namespace, @project), title: "Fork project", class: 'pull-right btn btn-new' do
= icon('code-fork fw') = icon('code-fork fw')
Fork Fork
.projects-list-holder .projects-list-holder
......
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