diff options
author | randx <dmitriy.zaporozhets@gmail.com> | 2012-05-27 01:09:44 +0300 |
---|---|---|
committer | randx <dmitriy.zaporozhets@gmail.com> | 2012-05-27 01:12:28 +0300 |
commit | d29ec9d7730ea2cf07ccc2e9dc07dd20df5c391c (patch) | |
tree | 45249ca38661827a42bcda49cb8110448c556c01 /app/views | |
parent | c4b779435227f71d8d6a731a8967268797c073ce (diff) | |
download | gitlab-ce-d29ec9d7730ea2cf07ccc2e9dc07dd20df5c391c.tar.gz |
Images refactored, Feed icon replaced, Fixed comment form focus
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/commits/_head.html.haml | 7 | ||||
-rw-r--r-- | app/views/issues/_head.html.haml | 4 | ||||
-rw-r--r-- | app/views/issues/index.html.haml | 5 | ||||
-rw-r--r-- | app/views/notes/_form.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/graph.html.haml | 3 | ||||
-rw-r--r-- | app/views/refs/_tree_file.html.haml | 2 |
6 files changed, 11 insertions, 12 deletions
diff --git a/app/views/commits/_head.html.haml b/app/views/commits/_head.html.haml index c9f12aacf19..23ad920d8ce 100644 --- a/app/views/commits/_head.html.haml +++ b/app/views/commits/_head.html.haml @@ -23,10 +23,9 @@ - if current_page?(project_commits_path(@project)) && current_user.private_token %li.right - %span - = link_to project_commits_path(@project, :atom, { :private_token => current_user.private_token, :ref => @ref }), :class => "btn" do - feed - = image_tag "Rss-UI.PNG", :width => 14, :title => "feed" + %span.rss-icon + = link_to project_commits_path(@project, :atom, { :private_token => current_user.private_token, :ref => @ref }), :title => "Feed" do + = image_tag "rss_ui.png", :title => "feed" :javascript diff --git a/app/views/issues/_head.html.haml b/app/views/issues/_head.html.haml index 99c61d75528..157741dda04 100644 --- a/app/views/issues/_head.html.haml +++ b/app/views/issues/_head.html.haml @@ -5,3 +5,7 @@ %li{:class => "#{'active' if current_page?(project_milestones_path(@project))}"} = link_to project_milestones_path(@project), :class => "tab" do Milestones + %li.right + %span.rss-icon + = link_to project_issues_path(@project, :atom, { :private_token => current_user.private_token }) do + = image_tag "rss_ui.png", :title => "feed" diff --git a/app/views/issues/index.html.haml b/app/views/issues/index.html.haml index 1d71e3926f9..86fd6a4add2 100644 --- a/app/views/issues/index.html.haml +++ b/app/views/issues/index.html.haml @@ -2,10 +2,7 @@ .issues_content %h3 Issues - %span.rss-icon - = link_to project_issues_path(@project, :atom, { :private_token => current_user.private_token }) do - = image_tag "Rss-UI.PNG", :width => 16, :title => "feed" - + %small (#{@issues.total_count}) .right .span5 - if can? current_user, :write_issue, @project diff --git a/app/views/notes/_form.html.haml b/app/views/notes/_form.html.haml index ec07411a28a..74ffbecbee5 100644 --- a/app/views/notes/_form.html.haml +++ b/app/views/notes/_form.html.haml @@ -10,7 +10,7 @@ = f.text_area :note, :size => 255 %p.hint Markdown is enabled. - .row.note_advanced_opts + .row.note_advanced_opts.hide .span4 %h5 Notify via email: .clearfix diff --git a/app/views/projects/graph.html.haml b/app/views/projects/graph.html.haml index 394a11fdc47..799b4e4e369 100644 --- a/app/views/projects/graph.html.haml +++ b/app/views/projects/graph.html.haml @@ -1,7 +1,6 @@ %h3 Network Graph %br -#holder.graph.well - +#holder.graph :javascript var chunk1={commits:#{@commits_json}}; var days=#{@days_json}; diff --git a/app/views/refs/_tree_file.html.haml b/app/views/refs/_tree_file.html.haml index 3fcc37331e7..686ad41b38b 100644 --- a/app/views/refs/_tree_file.html.haml +++ b/app/views/refs/_tree_file.html.haml @@ -29,7 +29,7 @@ - else %center = link_to blob_project_ref_path(@project, @ref, :path => params[:path]) do - %div + %div.padded %br = image_tag "download.png", :width => 64 %h3 |