Commit c89682605ff36b9c7659ae204ebd08c7c9c7951c
1 parent
94690bd2
Exists in
master
and in
4 other branches
Graph: is done. v1
Showing
2 changed files
with
6 additions
and
8 deletions
Show diff stats
app/assets/stylesheets/projects.css.scss
| @@ -473,8 +473,5 @@ body.project-page table .commit { | @@ -473,8 +473,5 @@ body.project-page table .commit { | ||
| 473 | border: solid 1px #999; | 473 | border: solid 1px #999; |
| 474 | cursor: move; | 474 | cursor: move; |
| 475 | height: 70%; | 475 | height: 70%; |
| 476 | - overflow: scroll; | ||
| 477 | - position: absolute; | ||
| 478 | - width: auto; | ||
| 479 | - margin: 6ex 3ex 0ex 0ex; | 476 | + overflow: hidden; |
| 480 | } | 477 | } |
lib/assets/javascripts/branch-graph.js
| @@ -37,16 +37,17 @@ function branchGraph(holder) { | @@ -37,16 +37,17 @@ function branchGraph(holder) { | ||
| 37 | r = Raphael("holder", cw, ch), | 37 | r = Raphael("holder", cw, ch), |
| 38 | top = r.set(); | 38 | top = r.set(); |
| 39 | var cuday = 0, cumonth = ""; | 39 | var cuday = 0, cumonth = ""; |
| 40 | - r.rect(0,0,days.length*20+20,40).attr({fill: "#999"}); | 40 | + r.rect(0, 0, days.length * 20 + 20, 20).attr({fill: "#474D57"}); |
| 41 | + r.rect(0, 20, days.length * 20 + 20, 20).attr({fill: "#f7f7f7"}); | ||
| 41 | 42 | ||
| 42 | for (mm = 0; mm < days.length; mm++) { | 43 | for (mm = 0; mm < days.length; mm++) { |
| 43 | if(days[mm] != null){ | 44 | if(days[mm] != null){ |
| 44 | if(cuday != days[mm][0]){ | 45 | if(cuday != days[mm][0]){ |
| 45 | - r.text(10+mm*20,30,days[mm][0]).attr({font: "12px Fontin-Sans, Arial", fill: "#444"}); | 46 | + r.text(10 + mm * 20, 30, days[mm][0]).attr({font: "12px Fontin-Sans, Arial", fill: "#444"}); |
| 46 | cuday = days[mm][0] | 47 | cuday = days[mm][0] |
| 47 | } | 48 | } |
| 48 | if(cumonth != days[mm][1]){ | 49 | if(cumonth != days[mm][1]){ |
| 49 | - r.text(10+mm*20,10,days[mm][1]).attr({font: "12px Fontin-Sans, Arial", fill: "#444"}); | 50 | + r.text(10 + mm * 20, 10, days[mm][1]).attr({font: "12px Fontin-Sans, Arial", fill: "#444"}); |
| 50 | cumonth = days[mm][1] | 51 | cumonth = days[mm][1] |
| 51 | } | 52 | } |
| 52 | 53 | ||
| @@ -62,7 +63,7 @@ function branchGraph(holder) { | @@ -62,7 +63,7 @@ function branchGraph(holder) { | ||
| 62 | if (shortrefs.length > 15){ | 63 | if (shortrefs.length > 15){ |
| 63 | shortrefs = shortrefs.substr(0,13) + "..."; | 64 | shortrefs = shortrefs.substr(0,13) + "..."; |
| 64 | } | 65 | } |
| 65 | - var t = r.text(x+5,y+5,shortrefs).attr({font: "12px Fontin-Sans, Arial", fill: "#666", | 66 | + var t = r.text(x+5, y+5, shortrefs).attr({font: "12px Fontin-Sans, Arial", fill: "#666", |
| 66 | title: longrefs, cursor: "pointer", rotation: "90"}); | 67 | title: longrefs, cursor: "pointer", rotation: "90"}); |
| 67 | 68 | ||
| 68 | var textbox = t.getBBox(); | 69 | var textbox = t.getBBox(); |