Merge branch 'stable'

author: Lars Hjemli 2012-01-03 16:48:22 +0000
committer: Lars Hjemli 2012-01-03 16:48:22 +0000
commit: aa25ff3c8b548077f2793c1162f3610af03e63df (patch)
tree: 0bf7463ec07bd94115256d99a95c22ce0b9bce2a
parent: ui-ssdiff.c: set correct diffmode in "control panel" (diff)
parent: Makefile: fetch git tarballs from http://hjemli.net/git/git/ (diff)
download: cgit-aa25ff3c8b548077f2793c1162f3610af03e63df.tar.gz
cgit-aa25ff3c8b548077f2793c1162f3610af03e63df.zip
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 30f7575..bfe18c5 100644
--- a/Makefile
+++ b/Makefile

@@ -13,7 +13,7 @@ pdfdir = $(docdir)
 mandir = $(prefix)/share/man
 SHA1_HEADER = <openssl/sha.h>
 GIT_VER = 1.7.4
-GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
+GIT_URL = http://hjemli.net/git/git/snapshot/git-$(GIT_VER).tar.bz2
 INSTALL = install
 MAN5_TXT = $(wildcard *.5.txt)
 MAN_TXT  = $(MAN5_TXT)
diff --git a/cgit.css b/cgit.css
index 55afa94..3734ca7 100644
--- a/cgit.css
+++ b/cgit.css

@@ -681,7 +681,7 @@ table.hgraph th {
 }
 table.hgraph td {
-        vertical-align: center;
+        vertical-align: middle;
        padding: 2px 2px;
 }
@@ -758,7 +758,7 @@ table.ssdiff td.lineno {
 }
 table.ssdiff td.hunk {
-        color: #black;
+        color: black;
        background: #ccf;
        border-top: solid 1px #aaa;
        border-bottom: solid 1px #aaa;
author	Lars Hjemli	2012-01-03 16:48:22 +0000
committer	Lars Hjemli	2012-01-03 16:48:22 +0000
commit	aa25ff3c8b548077f2793c1162f3610af03e63df (patch)
tree	0bf7463ec07bd94115256d99a95c22ce0b9bce2a
parent	ui-ssdiff.c: set correct diffmode in "control panel" (diff)
parent	Makefile: fetch git tarballs from http://hjemli.net/git/git/ (diff)
download	cgit-aa25ff3c8b548077f2793c1162f3610af03e63df.tar.gz cgit-aa25ff3c8b548077f2793c1162f3610af03e63df.zip

diff --git a/Makefile b/Makefile index 30f7575..bfe18c5 100644 --- a/Makefile +++ b/Makefile
@@ -13,7 +13,7 @@ pdfdir = $(docdir)
13	mandir = $(prefix)/share/man	13	mandir = $(prefix)/share/man
14	SHA1_HEADER = <openssl/sha.h>	14	SHA1_HEADER = <openssl/sha.h>
15	GIT_VER = 1.7.4	15	GIT_VER = 1.7.4
16	GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2	16	GIT_URL = http://hjemli.net/git/git/snapshot/git-$(GIT_VER).tar.bz2
17	INSTALL = install	17	INSTALL = install
18	MAN5_TXT = $(wildcard *.5.txt)	18	MAN5_TXT = $(wildcard *.5.txt)
19	MAN_TXT = $(MAN5_TXT)	19	MAN_TXT = $(MAN5_TXT)


diff --git a/cgit.css b/cgit.css index 55afa94..3734ca7 100644 --- a/cgit.css +++ b/cgit.css
@@ -681,7 +681,7 @@ table.hgraph th {
681	}	681	}
682		682
683	table.hgraph td {	683	table.hgraph td {
684	vertical-align: center;	684	vertical-align: middle;
685	padding: 2px 2px;	685	padding: 2px 2px;
686	}	686	}
687		687
@@ -758,7 +758,7 @@ table.ssdiff td.lineno {
758	}	758	}
759		759
760	table.ssdiff td.hunk {	760	table.ssdiff td.hunk {
761	color: #black;	761	color: black;
762	background: #ccf;	762	background: #ccf;
763	border-top: solid 1px #aaa;	763	border-top: solid 1px #aaa;
764	border-bottom: solid 1px #aaa;	764	border-bottom: solid 1px #aaa;