From af501845dd719c2478a3c5f1bb8ead1f4b6c90b4 Mon Sep 17 00:00:00 2001
From: Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>
Date: Wed, 13 Jan 2016 13:15:53 -0500
Subject: [PATCH] aligns menu at top on one row
---
app/assets/stylesheets/pages/projects.scss | 16 ++++++++++++++++
app/views/projects/forks/index.html.haml | 20 ++++++++++----------
2 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss
index 8c685c08eaf..7c3587622c4 100644
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -391,6 +391,22 @@ pre.light-well {
padding-bottom: 0;
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 {
display: inline-block;
width: calc(100% - 151px);
diff --git a/app/views/projects/forks/index.html.haml b/app/views/projects/forks/index.html.haml
index 09406ce9e4b..24efc7b3097 100644
--- a/app/views/projects/forks/index.html.haml
+++ b/app/views/projects/forks/index.html.haml
@@ -6,7 +6,7 @@
== #{pluralize(@all_forks.size, 'fork')}: #{full_count_title}
.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',
spellcheck: false, data: { 'filter-selector' => 'span.namespace-name' }
@@ -29,15 +29,15 @@
= link_to page_filter_path(sort: sort_value_oldest_updated) do
= sort_title_oldest_updated
- .fork_link.inline
- - 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
- = icon('code-fork fw')
- Fork
- - else
- = link_to new_namespace_project_fork_path(@project.namespace, @project), title: "Fork project", class: 'pull-right btn btn-new' do
- = icon('code-fork fw')
- Fork
+ .fork_link.inline
+ - 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
+ = icon('code-fork fw')
+ Fork
+ - else
+ = link_to new_namespace_project_fork_path(@project.namespace, @project), title: "Fork project", class: 'pull-right btn btn-new' do
+ = icon('code-fork fw')
+ Fork
.projects-list-holder
--
GitLab