diff --git a/app/stylesheets/partials/_legend.sass b/app/stylesheets/partials/_legend.sass index 6378bce2..acaf7a2e 100644 --- a/app/stylesheets/partials/_legend.sass +++ b/app/stylesheets/partials/_legend.sass @@ -1,6 +1,7 @@ span#legend - width: 250px - padding: 5px 0 10px 10px + width: 280px + padding: 5px 0 0 10px display: inline-block - height: 56px - margin: 0 10px 0 0 \ No newline at end of file + height: 45px + margin: 0 auto + float: right \ No newline at end of file diff --git a/app/views/features/_legend.html.erb b/app/views/features/_legend.html.erb index 9e8399e0..41775f49 100644 --- a/app/views/features/_legend.html.erb +++ b/app/views/features/_legend.html.erb @@ -1,5 +1,5 @@
diff --git a/app/views/features/merge.html.erb b/app/views/features/merge.html.erb index 4fe3c68f..504dc5cd 100644 --- a/app/views/features/merge.html.erb +++ b/app/views/features/merge.html.erb @@ -2,13 +2,13 @@ <%= stylesheet_link_tag "pretty_diff" %> <% end %> -<%= render :partial => "legend", :locals => {:diff_from => "file", :diff_to => "file"} %> - +<%= render :partial => "legend", :locals => {:diff_from => "file", :diff_to => "file"} %> +