Commit c49dcbac authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Few ui fixes: network graph and accept mr button

parent 39484136
......@@ -4,7 +4,8 @@
h4 {
padding: 0 10px;
margin: 0;
padding: 10px;
border-bottom: 1px solid #bbb;
@include bg-gray-gradient;
}
......
......@@ -86,7 +86,7 @@ ul.nav.nav-projects-tabs {
border-bottom: 1px solid #eee;
.description {
margin-left: 22px;
margin-left: 15px;
color: #aaa;
}
}
......
......@@ -14,7 +14,7 @@
%strong= link_to "click here", "#", class: "how_to_merge_link vlink", title: "How To Merge"
for instructions
.accept_group
= f.submit "Accept Merge Request", class: "btn btn-success accept_merge_request"
= f.submit "Accept Merge Request", class: "btn btn-create accept_merge_request"
- unless @project.root_ref? @merge_request.source_branch
.remove_branch_holder
= label_tag :should_remove_source_branch, class: "checkbox" do
......
%h3.page-title Project Network Graph
%hr
.clearfix
.pull-left
......
......@@ -17,7 +17,7 @@
%ul.unstyled
- @projects.each do |project|
%li.clearfix
%h5
%div
%i.icon-share
- if current_user
= link_to_project project
......@@ -25,7 +25,7 @@
= project.name_with_namespace
.pull-right
%pre.dark.tiny git clone #{project.http_url_to_repo}
%p.description
%div.description
= project.description
- unless @projects.present?
%h3.nothing_here_message No public projects
......
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