diff --git a/app/assets/images/Info-UI.PNG b/app/assets/images/Info-UI.PNG
deleted file mode 100644
index 7f48ed8d3f16541788d6d2c2117b6ac4afa7bb37..0000000000000000000000000000000000000000
Binary files a/app/assets/images/Info-UI.PNG and /dev/null differ
diff --git a/app/assets/images/Rss-UI.PNG b/app/assets/images/Rss-UI.PNG
deleted file mode 100644
index 2116571ebbc705820beed79c20e6232ceebc6b11..0000000000000000000000000000000000000000
Binary files a/app/assets/images/Rss-UI.PNG and /dev/null differ
diff --git a/app/assets/images/add_comment.png b/app/assets/images/add_comment.png
deleted file mode 100644
index 1992303e7697ab615f6e21adb07a4dbe16ee2820..0000000000000000000000000000000000000000
Binary files a/app/assets/images/add_comment.png and /dev/null differ
diff --git a/app/assets/images/admin.PNG b/app/assets/images/admin.PNG
deleted file mode 100644
index 73ff1dfb3340e284e9b4ea906262f01812dad0a6..0000000000000000000000000000000000000000
Binary files a/app/assets/images/admin.PNG and /dev/null differ
diff --git a/app/assets/images/comment_add.png b/app/assets/images/comment_add.png
index 98291d0d2ec34bb277621675008e7e577fee1d2d..836557ac8462dac7811ac8cdbde9d5531b8cd553 100644
Binary files a/app/assets/images/comment_add.png and b/app/assets/images/comment_add.png differ
diff --git a/app/assets/images/download.png b/app/assets/images/download.png
index d718e07dea3ea6645a3375291f27446661eeb331..5791e723de9063bc7f28764d14c987c2cd277188 100644
Binary files a/app/assets/images/download.png and b/app/assets/images/download.png differ
diff --git a/app/assets/images/new_project.png b/app/assets/images/new_project.png
deleted file mode 100644
index 045dc705ba3da4d6e970e363e97402a99d78ee07..0000000000000000000000000000000000000000
Binary files a/app/assets/images/new_project.png and /dev/null differ
diff --git a/app/assets/images/rss_ui.png b/app/assets/images/rss_ui.png
new file mode 100644
index 0000000000000000000000000000000000000000..c45afbab519ad7582f5c4558b28a95424aefdea5
Binary files /dev/null and b/app/assets/images/rss_ui.png differ
diff --git a/app/assets/javascripts/note.js b/app/assets/javascripts/note.js
index c45cdd90b4f8e742da9d9244652d7a25e57405d4..4d97ffefdcef43cd0f22075f411c54ec41873dea 100644
--- a/app/assets/javascripts/note.js
+++ b/app/assets/javascripts/note.js
@@ -32,9 +32,9 @@ init:
$("#submit_note").removeAttr("disabled");
})
- $("#note_note").live("click", function(){
+ $("#note_note").live("focus", function(){
$(this).css("height", "100px");
- $('.attach_holder').show();
+ $('.note_advanced_opts').show();
});
$("#note_attachment").change(function(e){
diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index ca797ed06f4fdebd37f436785267508d47514bbb..08dc2ec92092d565d79fa900c9272308a4e9674a 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -420,6 +420,8 @@ a.project-update.titled {
cursor: move;
height: 70%;
overflow: hidden;
+ background:white;
+ border: 1px solid $style_color;
}
@@ -960,3 +962,10 @@ li.note {
}
}
}
+
+.rss-icon {
+ img {
+ width:24px;
+ vertical-align:top;
+ }
+}
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 246d43e8703c1ff888164dff64ceac7f54d28ca0..d73072f2672b4d6319b581c6bead458a5424230a 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -100,7 +100,6 @@ class ProjectsController < ApplicationController
end
def graph
- render_full_content
@days_json, @commits_json = GraphCommit.to_graph(project)
end
diff --git a/app/views/commits/_head.html.haml b/app/views/commits/_head.html.haml
index c9f12aacf19a458d1e1b3d0f2031f84c8c43d4eb..23ad920d8cec05ee48b858b3c8607dc7d3c7caaf 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 99c61d75528156bcc695ba9d0ba9c1c07450d9b4..157741dda044d87c810fcd2ff583eb6abc7610d4 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 1d71e3926f9322a356df1ca9f1882d39124f9b8c..86fd6a4add276bc1d8c4a6e4f57280d32c77682a 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 ec07411a28ad359dd847cd3f93a600d84be5e649..74ffbecbee511f85cefc3f4175766b93f5c24783 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 394a11fdc47439c8cae31d1a5379adc1c947a0ed..799b4e4e369eff3f22d060b13b2b9bfb3c2fc27d 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 3fcc37331e7e921a5d13e36ba4895bfef11cf9dc..686ad41b38b76413016d3b65d615a24db8b0fca2 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
diff --git a/lib/assets/javascripts/branch-graph.js b/lib/assets/javascripts/branch-graph.js
index f46dbd1775457d49dfa2097b2a9173067c548f15..3276886e77d6d98fb0ed6bd3a4c62e7f1684080a 100644
--- a/lib/assets/javascripts/branch-graph.js
+++ b/lib/assets/javascripts/branch-graph.js
@@ -37,17 +37,17 @@ function branchGraph(holder) {
r = Raphael("holder", cw, ch),
top = r.set();
var cuday = 0, cumonth = "";
- r.rect(0, 0, days.length * 20 + 20, 20).attr({fill: "#474D57"});
- r.rect(0, 20, days.length * 20 + 20, 20).attr({fill: "#f7f7f7"});
+ r.rect(0, 0, days.length * 20 + 80, 30).attr({fill: "#FFF"});
+ r.rect(0, 30, days.length * 20 + 80, 20).attr({fill: "#f1f1f1"});
for (mm = 0; mm < days.length; mm++) {
if(days[mm] != null){
if(cuday != days[mm][0]){
- r.text(10 + mm * 20, 30, days[mm][0]).attr({font: "12px Fontin-Sans, Arial", fill: "#444"});
+ r.text(10 + mm * 20, 40, days[mm][0]).attr({font: "14px Fontin-Sans, Arial", fill: "#444"});
cuday = days[mm][0]
}
if(cumonth != days[mm][1]){
- r.text(10 + mm * 20, 10, days[mm][1]).attr({font: "12px Fontin-Sans, Arial", fill: "#444"});
+ r.text(10 + mm * 20, 15, days[mm][1]).attr({font: "14px Fontin-Sans, Arial", fill: "#474D57"});
cumonth = days[mm][1]
}