From c89682605ff36b9c7659ae204ebd08c7c9c7951c Mon Sep 17 00:00:00 2001
From: Valery Sizov <vsv2711@gmail.com>
Date: Sun, 13 Nov 2011 15:12:52 +0200
Subject: [PATCH] Graph: is done. v1
---
app/assets/stylesheets/projects.css.scss | 5 +----
lib/assets/javascripts/branch-graph.js | 9 +++++----
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/app/assets/stylesheets/projects.css.scss b/app/assets/stylesheets/projects.css.scss
index 9c0eb591bdb..84aa1716ac1 100644
--- a/app/assets/stylesheets/projects.css.scss
+++ b/app/assets/stylesheets/projects.css.scss
@@ -473,8 +473,5 @@ body.project-page table .commit {
border: solid 1px #999;
cursor: move;
height: 70%;
- overflow: scroll;
- position: absolute;
- width: auto;
- margin: 6ex 3ex 0ex 0ex;
+ overflow: hidden;
}
diff --git a/lib/assets/javascripts/branch-graph.js b/lib/assets/javascripts/branch-graph.js
index f8b73660d11..8c45aefe688 100644
--- a/lib/assets/javascripts/branch-graph.js
+++ b/lib/assets/javascripts/branch-graph.js
@@ -37,16 +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,40).attr({fill: "#999"});
+ r.rect(0, 0, days.length * 20 + 20, 20).attr({fill: "#474D57"});
+ r.rect(0, 20, days.length * 20 + 20, 20).attr({fill: "#f7f7f7"});
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, 30, days[mm][0]).attr({font: "12px 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, 10, days[mm][1]).attr({font: "12px Fontin-Sans, Arial", fill: "#444"});
cumonth = days[mm][1]
}
@@ -62,7 +63,7 @@ function branchGraph(holder) {
if (shortrefs.length > 15){
shortrefs = shortrefs.substr(0,13) + "...";
}
- var t = r.text(x+5,y+5,shortrefs).attr({font: "12px Fontin-Sans, Arial", fill: "#666",
+ var t = r.text(x+5, y+5, shortrefs).attr({font: "12px Fontin-Sans, Arial", fill: "#666",
title: longrefs, cursor: "pointer", rotation: "90"});
var textbox = t.getBBox();
--
GitLab