summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrandx <dmitriy.zaporozhets@gmail.com>2012-05-27 01:09:44 +0300
committerrandx <dmitriy.zaporozhets@gmail.com>2012-05-27 01:12:28 +0300
commitd29ec9d7730ea2cf07ccc2e9dc07dd20df5c391c (patch)
tree45249ca38661827a42bcda49cb8110448c556c01
parentc4b779435227f71d8d6a731a8967268797c073ce (diff)
downloadgitlab-ce-d29ec9d7730ea2cf07ccc2e9dc07dd20df5c391c.tar.gz
Images refactored, Feed icon replaced, Fixed comment form focus
-rw-r--r--app/assets/images/Info-UI.PNGbin801 -> 0 bytes
-rw-r--r--app/assets/images/Rss-UI.PNGbin789 -> 0 bytes
-rw-r--r--app/assets/images/add_comment.pngbin823 -> 0 bytes
-rw-r--r--app/assets/images/admin.PNGbin556 -> 0 bytes
-rw-r--r--app/assets/images/comment_add.pngbin778 -> 781 bytes
-rw-r--r--app/assets/images/download.pngbin599 -> 674 bytes
-rw-r--r--app/assets/images/new_project.pngbin257 -> 0 bytes
-rw-r--r--app/assets/images/rss_ui.pngbin0 -> 812 bytes
-rw-r--r--app/assets/javascripts/note.js4
-rw-r--r--app/assets/stylesheets/common.scss9
-rw-r--r--app/controllers/projects_controller.rb1
-rw-r--r--app/views/commits/_head.html.haml7
-rw-r--r--app/views/issues/_head.html.haml4
-rw-r--r--app/views/issues/index.html.haml5
-rw-r--r--app/views/notes/_form.html.haml2
-rw-r--r--app/views/projects/graph.html.haml3
-rw-r--r--app/views/refs/_tree_file.html.haml2
-rw-r--r--lib/assets/javascripts/branch-graph.js8
18 files changed, 26 insertions, 19 deletions
diff --git a/app/assets/images/Info-UI.PNG b/app/assets/images/Info-UI.PNG
deleted file mode 100644
index 7f48ed8d3f1..00000000000
--- a/app/assets/images/Info-UI.PNG
+++ /dev/null
Binary files differ
diff --git a/app/assets/images/Rss-UI.PNG b/app/assets/images/Rss-UI.PNG
deleted file mode 100644
index 2116571ebbc..00000000000
--- a/app/assets/images/Rss-UI.PNG
+++ /dev/null
Binary files differ
diff --git a/app/assets/images/add_comment.png b/app/assets/images/add_comment.png
deleted file mode 100644
index 1992303e769..00000000000
--- a/app/assets/images/add_comment.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/images/admin.PNG b/app/assets/images/admin.PNG
deleted file mode 100644
index 73ff1dfb334..00000000000
--- a/app/assets/images/admin.PNG
+++ /dev/null
Binary files differ
diff --git a/app/assets/images/comment_add.png b/app/assets/images/comment_add.png
index 98291d0d2ec..836557ac846 100644
--- a/app/assets/images/comment_add.png
+++ b/app/assets/images/comment_add.png
Binary files differ
diff --git a/app/assets/images/download.png b/app/assets/images/download.png
index d718e07dea3..5791e723de9 100644
--- a/app/assets/images/download.png
+++ b/app/assets/images/download.png
Binary files differ
diff --git a/app/assets/images/new_project.png b/app/assets/images/new_project.png
deleted file mode 100644
index 045dc705ba3..00000000000
--- a/app/assets/images/new_project.png
+++ /dev/null
Binary files differ
diff --git a/app/assets/images/rss_ui.png b/app/assets/images/rss_ui.png
new file mode 100644
index 00000000000..c45afbab519
--- /dev/null
+++ b/app/assets/images/rss_ui.png
Binary files differ
diff --git a/app/assets/javascripts/note.js b/app/assets/javascripts/note.js
index c45cdd90b4f..4d97ffefdce 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 ca797ed06f4..08dc2ec9209 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 246d43e8703..d73072f2672 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 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
diff --git a/lib/assets/javascripts/branch-graph.js b/lib/assets/javascripts/branch-graph.js
index f46dbd17754..3276886e77d 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]
}