BigW Consortium Gitlab

Commit 5e93f912 by Dmitriy Zaporozhets

Add search field to commits page

parent 9a250ad6
...@@ -28,10 +28,6 @@ ...@@ -28,10 +28,6 @@
} }
} }
.commits-feed-holder {
float: right;
}
li.commit { li.commit {
list-style: none; list-style: none;
...@@ -126,14 +122,14 @@ li.commit { ...@@ -126,14 +122,14 @@ li.commit {
.divergence-graph { .divergence-graph {
padding: 12px 12px 0 0; padding: 12px 12px 0 0;
float: right; float: right;
.graph-side { .graph-side {
position: relative; position: relative;
width: 80px; width: 80px;
height: 22px; height: 22px;
padding: 5px 0 13px; padding: 5px 0 13px;
float: left; float: left;
.bar { .bar {
position: absolute; position: absolute;
height: 4px; height: 4px;
...@@ -149,7 +145,7 @@ li.commit { ...@@ -149,7 +145,7 @@ li.commit {
left: 0; left: 0;
border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0;
} }
.count { .count {
padding-top: 6px; padding-top: 6px;
padding-bottom: 0px; padding-bottom: 0px;
......
...@@ -10,15 +10,21 @@ ...@@ -10,15 +10,21 @@
.tree-ref-holder .tree-ref-holder
= render 'shared/ref_switcher', destination: 'commits' = render 'shared/ref_switcher', destination: 'commits'
.commits-feed-holder.hidden-xs.hidden-sm .pull-right.hidden-xs.hidden-sm
- if create_mr_button?(@repository.root_ref, @ref) - if create_mr_button?(@repository.root_ref, @ref)
= link_to create_mr_path(@repository.root_ref, @ref), class: 'btn btn-success' do .pull-left.prepend-left-10
= icon('plus') = link_to create_mr_path(@repository.root_ref, @ref), class: 'btn btn-success' do
Create Merge Request = icon('plus')
Create Merge Request
.pull-left.prepend-left-10
= form_tag(namespace_project_commits_path(@project.namespace, @project, @ref), method: :get, class: 'pull-left commits-search-form') do
= search_field_tag :search, params[:search], { placeholder: 'Filter by commit message', class: 'form-control search-text-input', spellcheck: false }
- if current_user && current_user.private_token - if current_user && current_user.private_token
= link_to namespace_project_commits_path(@project.namespace, @project, @ref, {format: :atom, private_token: current_user.private_token}), title: "Commits Feed", class: 'prepend-left-10 btn' do .pull-left.prepend-left-10
= icon("rss") = link_to namespace_project_commits_path(@project.namespace, @project, @ref, {format: :atom, private_token: current_user.private_token}), title: "Commits Feed", class: 'btn' do
= icon("rss")
%ul.breadcrumb.repo-breadcrumb %ul.breadcrumb.repo-breadcrumb
......
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