about summary refs log tree commit diff
path: root/cgit.c
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2011-02-19 14:51:00 +0100
committerLars Hjemli <hjemli@gmail.com>2011-02-19 14:51:00 +0100
commit979c460e7f71d153ae79da67b8b21c3412f0fe02 (patch)
tree6da9ffb66ed0a68205e6644cb7e2b4652d6684be /cgit.c
parentMerge branch 'jh/scan-path' (diff)
parentUse transparent background for the cgit logo (diff)
downloadcgit-pink-979c460e7f71d153ae79da67b8b21c3412f0fe02.tar.gz
cgit-pink-979c460e7f71d153ae79da67b8b21c3412f0fe02.zip
Merge branch 'br/misc'
* br/misc:
  Use transparent background for the cgit logo
  ssdiff: anchors for ssdiff
  implement repo.logo and repo.logo-link
Diffstat (limited to '')
-rw-r--r--cgit.c8
-rw-r--r--cgit.css2
2 files changed, 7 insertions, 3 deletions
diff --git a/cgit.c b/cgit.c
index 71f3fc8..916feb4 100644
--- a/cgit.c
+++ b/cgit.c
@@ -73,9 +73,13 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value)
 		repo->module_link= xstrdup(value);
 	else if (!strcmp(name, "section"))
 		repo->section = xstrdup(value);
-	else if (!strcmp(name, "readme") && value != NULL) {
+	else if (!strcmp(name, "readme") && value != NULL)
 		repo->readme = xstrdup(value);
-	} else if (ctx.cfg.enable_filter_overrides) {
+	else if (!strcmp(name, "logo") && value != NULL)
+		repo->logo = xstrdup(value);
+	else if (!strcmp(name, "logo-link") && value != NULL)
+		repo->logo_link = xstrdup(value);
+	else if (ctx.cfg.enable_filter_overrides) {
 		if (!strcmp(name, "about-filter"))
 			repo->about_filter = new_filter(value, 0);
 		else if (!strcmp(name, "commit-filter"))
diff --git a/cgit.css b/cgit.css
index 008cff8..1d90057 100644
--- a/cgit.css
+++ b/cgit.css
@@ -293,7 +293,7 @@ table.blob pre {
 	padding: 0; margin: 0;
 }
 
-table.blob a.no {
+table.blob a.no, table.ssdiff a.no {
 	color: gray;
 	text-align: right;
 	text-decoration: none;