Download as
Browse Code »

Commit c49dcbacc3455ccfa149375a2f792b5f3c5223ec

Authored by Dmitriy Zaporozhets
1 parent 39484136
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Few ui fixes: network graph and accept mr button

Showing 5 changed files with 6 additions and 6 deletions   Show diff stats
app/assets/stylesheets/sections/graph.scss
  Diff comments   View file @c49dcba
@@ -4,7 +4,8 @@ @@ -4,7 +4,8 @@
4 4
5 5
6 h4 { 6 h4 {
7 - padding: 0 10px; 7 + margin: 0;
  8 + padding: 10px;
8 border-bottom: 1px solid #bbb; 9 border-bottom: 1px solid #bbb;
9 @include bg-gray-gradient; 10 @include bg-gray-gradient;
10 } 11 }
app/assets/stylesheets/sections/projects.scss
  Diff comments   View file @c49dcba
@@ -86,7 +86,7 @@ ul.nav.nav-projects-tabs { @@ -86,7 +86,7 @@ ul.nav.nav-projects-tabs {
86 border-bottom: 1px solid #eee; 86 border-bottom: 1px solid #eee;
87 87
88 .description { 88 .description {
89 - margin-left: 22px; 89 + margin-left: 15px;
90 color: #aaa; 90 color: #aaa;
91 } 91 }
92 } 92 }
app/views/projects/merge_requests/show/_mr_accept.html.haml
  Diff comments   View file @c49dcba
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 %strong= link_to "click here", "#", class: "how_to_merge_link vlink", title: "How To Merge" 14 %strong= link_to "click here", "#", class: "how_to_merge_link vlink", title: "How To Merge"
15 for instructions 15 for instructions
16 .accept_group 16 .accept_group
17 - = f.submit "Accept Merge Request", class: "btn btn-success accept_merge_request" 17 + = f.submit "Accept Merge Request", class: "btn btn-create accept_merge_request"
18 - unless @project.root_ref? @merge_request.source_branch 18 - unless @project.root_ref? @merge_request.source_branch
19 .remove_branch_holder 19 .remove_branch_holder
20 = label_tag :should_remove_source_branch, class: "checkbox" do 20 = label_tag :should_remove_source_branch, class: "checkbox" do
app/views/projects/network/_head.html.haml
  Diff comments   View file @c49dcba
1 %h3.page-title Project Network Graph 1 %h3.page-title Project Network Graph
2 -%hr  
3 2
4 .clearfix 3 .clearfix
5 .pull-left 4 .pull-left
app/views/public/projects/index.html.haml
  Diff comments   View file @c49dcba
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 %ul.unstyled 17 %ul.unstyled
18 - @projects.each do |project| 18 - @projects.each do |project|
19 %li.clearfix 19 %li.clearfix
20 - %h5 20 + %div
21 %i.icon-share 21 %i.icon-share
22 - if current_user 22 - if current_user
23 = link_to_project project 23 = link_to_project project
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
25 = project.name_with_namespace 25 = project.name_with_namespace
26 .pull-right 26 .pull-right
27 %pre.dark.tiny git clone #{project.http_url_to_repo} 27 %pre.dark.tiny git clone #{project.http_url_to_repo}
28 - %p.description 28 + %div.description
29 = project.description 29 = project.description
30 - unless @projects.present? 30 - unless @projects.present?
31 %h3.nothing_here_message No public projects 31 %h3.nothing_here_message No public projects