Few ui fixes: network graph and accept mr button

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