Commit d29ec9d7 authored by randx's avatar randx

Images refactored, Feed icon replaced, Fixed comment form focus

parent c4b77943
app/assets/images/comment_add.png

778 Bytes | W: | H:

app/assets/images/comment_add.png

781 Bytes | W: | H:

app/assets/images/comment_add.png
app/assets/images/comment_add.png
app/assets/images/comment_add.png
app/assets/images/comment_add.png
  • 2-up
  • Swipe
  • Onion skin
app/assets/images/download.png

599 Bytes | W: | H:

app/assets/images/download.png

674 Bytes | W: | H:

app/assets/images/download.png
app/assets/images/download.png
app/assets/images/download.png
app/assets/images/download.png
  • 2-up
  • Swipe
  • Onion skin
...@@ -32,9 +32,9 @@ init: ...@@ -32,9 +32,9 @@ init:
$("#submit_note").removeAttr("disabled"); $("#submit_note").removeAttr("disabled");
}) })
$("#note_note").live("click", function(){ $("#note_note").live("focus", function(){
$(this).css("height", "100px"); $(this).css("height", "100px");
$('.attach_holder').show(); $('.note_advanced_opts').show();
}); });
$("#note_attachment").change(function(e){ $("#note_attachment").change(function(e){
......
...@@ -420,6 +420,8 @@ a.project-update.titled { ...@@ -420,6 +420,8 @@ a.project-update.titled {
cursor: move; cursor: move;
height: 70%; height: 70%;
overflow: hidden; overflow: hidden;
background:white;
border: 1px solid $style_color;
} }
...@@ -960,3 +962,10 @@ li.note { ...@@ -960,3 +962,10 @@ li.note {
} }
} }
} }
.rss-icon {
img {
width:24px;
vertical-align:top;
}
}
...@@ -100,7 +100,6 @@ class ProjectsController < ApplicationController ...@@ -100,7 +100,6 @@ class ProjectsController < ApplicationController
end end
def graph def graph
render_full_content
@days_json, @commits_json = GraphCommit.to_graph(project) @days_json, @commits_json = GraphCommit.to_graph(project)
end end
......
...@@ -23,10 +23,9 @@ ...@@ -23,10 +23,9 @@
- if current_page?(project_commits_path(@project)) && current_user.private_token - if current_page?(project_commits_path(@project)) && current_user.private_token
%li.right %li.right
%span %span.rss-icon
= link_to project_commits_path(@project, :atom, { :private_token => current_user.private_token, :ref => @ref }), :class => "btn" do = link_to project_commits_path(@project, :atom, { :private_token => current_user.private_token, :ref => @ref }), :title => "Feed" do
feed = image_tag "rss_ui.png", :title => "feed"
= image_tag "Rss-UI.PNG", :width => 14, :title => "feed"
:javascript :javascript
......
...@@ -5,3 +5,7 @@ ...@@ -5,3 +5,7 @@
%li{:class => "#{'active' if current_page?(project_milestones_path(@project))}"} %li{:class => "#{'active' if current_page?(project_milestones_path(@project))}"}
= link_to project_milestones_path(@project), :class => "tab" do = link_to project_milestones_path(@project), :class => "tab" do
Milestones 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"
...@@ -2,10 +2,7 @@ ...@@ -2,10 +2,7 @@
.issues_content .issues_content
%h3 %h3
Issues Issues
%span.rss-icon %small (#{@issues.total_count})
= link_to project_issues_path(@project, :atom, { :private_token => current_user.private_token }) do
= image_tag "Rss-UI.PNG", :width => 16, :title => "feed"
.right .right
.span5 .span5
- if can? current_user, :write_issue, @project - if can? current_user, :write_issue, @project
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
= f.text_area :note, :size => 255 = f.text_area :note, :size => 255
%p.hint Markdown is enabled. %p.hint Markdown is enabled.
.row.note_advanced_opts .row.note_advanced_opts.hide
.span4 .span4
%h5 Notify via email: %h5 Notify via email:
.clearfix .clearfix
......
%h3 Network Graph %h3 Network Graph
%br %br
#holder.graph.well #holder.graph
:javascript :javascript
var chunk1={commits:#{@commits_json}}; var chunk1={commits:#{@commits_json}};
var days=#{@days_json}; var days=#{@days_json};
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
- else - else
%center %center
= link_to blob_project_ref_path(@project, @ref, :path => params[:path]) do = link_to blob_project_ref_path(@project, @ref, :path => params[:path]) do
%div %div.padded
%br %br
= image_tag "download.png", :width => 64 = image_tag "download.png", :width => 64
%h3 %h3
......
...@@ -37,17 +37,17 @@ function branchGraph(holder) { ...@@ -37,17 +37,17 @@ function branchGraph(holder) {
r = Raphael("holder", cw, ch), r = Raphael("holder", cw, ch),
top = r.set(); top = r.set();
var cuday = 0, cumonth = ""; var cuday = 0, cumonth = "";
r.rect(0, 0, days.length * 20 + 20, 20).attr({fill: "#474D57"}); r.rect(0, 0, days.length * 20 + 80, 30).attr({fill: "#FFF"});
r.rect(0, 20, days.length * 20 + 20, 20).attr({fill: "#f7f7f7"}); r.rect(0, 30, days.length * 20 + 80, 20).attr({fill: "#f1f1f1"});
for (mm = 0; mm < days.length; mm++) { for (mm = 0; mm < days.length; mm++) {
if(days[mm] != null){ if(days[mm] != null){
if(cuday != days[mm][0]){ 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] cuday = days[mm][0]
} }
if(cumonth != days[mm][1]){ 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] cumonth = days[mm][1]
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment