Commit 91bd0bf9 authored by Rubén Dávila's avatar Rubén Dávila
Browse files

Some CSS and sorting fixes.

parent e19486cbbd08
......@@ -391,22 +391,6 @@ 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);
......@@ -414,6 +398,7 @@ pre.light-well {
.btn {
display: inline-block;
width: 135px;
}
}
......@@ -584,6 +569,32 @@ pre.light-well {
* Forks list rendered on Project's forks page
*/
.projects-search-form {
&.fork-search-form {
margin: 0;
margin-top: -$gl-padding;
padding-bottom: 0;
width: 540px;
input {
width: calc(100% - 300px);
}
button.sort-forks {
width: 160px;
}
.fork_link {
float: right;
margin-left: $gl-padding;
a.btn-new {
width: 110px;
}
}
}
}
.private-forks-notice .private-fork-icon {
i.fa-circle {
color: #2AA056;
......
......@@ -4,8 +4,8 @@ class Projects::ForksController < Projects::ApplicationController
before_action :authorize_download_code!
def index
@all_forks = project.forks.includes(:creator)
@all_forks = @all_forks.sort(params[:sort]) if params[:sort]
@sort = params[:sort] || 'id_desc'
@all_forks = project.forks.includes(:creator).order_by(@sort)
@public_forks, @protected_forks = @all_forks.partition do |project|
can?(current_user, :read_project, project)
......
......@@ -11,7 +11,7 @@
spellcheck: false, data: { 'filter-selector' => 'span.namespace-name' }
.dropdown.inline.prepend-left-10
%button.dropdown-toggle.btn{type: 'button', 'data-toggle' => 'dropdown'}
%button.dropdown-toggle.btn.sort-forks{type: 'button', 'data-toggle' => 'dropdown'}
%span.light sort:
- if @sort.present?
= sort_options_hash[@sort]
......
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