[PATCH 1/2] ui-log: color line changes

[PATCH 1/2] ui-log: color line changes

[list]

From: Christian Hesse <mail at eworm.de>

Signed-off-by: Christian Hesse <mail at eworm.de>
---
 cgit.css | 9 +++++++++
 ui-log.c | 3 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/cgit.css b/cgit.css
index 66c6d53..983eac5 100644
--- a/cgit.css
+++ b/cgit.css
@@ -590,6 +590,15 @@ div#cgit span.age-months {
 div#cgit span.age-years {
 	color: #bbb;
 }
+
+div#cgit span.insertions {
+	color: #080;
+}
+
+div#cgit span.deletions {
+	color: #800;
+}
+
 div#cgit div.footer {
 	margin-top: 0.5em;
 	text-align: center;
diff --git a/ui-log.c b/ui-log.c
index d6d94f6..c97b8e0 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -258,7 +258,8 @@ static void print_commit(struct commit *commit, struct rev_info *revs)
 	if (ctx.repo->enable_log_filecount)
 		htmlf("</td><td>%d", files);
 	if (ctx.repo->enable_log_linecount)
-		htmlf("</td><td>-%d/+%d", rem_lines, add_lines);
+		htmlf("</td><td><span class='deletions'>-%d</span>/"
+			"<span class='insertions'>+%d</span>", rem_lines, add_lines);
 
 	html("</td></tr>\n");
 
-- 
2.9.0

[PATCH 2/2] css: consistent use of empty lines

[list]

From: Christian Hesse <mail at eworm.de>

Signed-off-by: Christian Hesse <mail at eworm.de>
---
 cgit.css | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/cgit.css b/cgit.css
index 983eac5..763a99e 100644
--- a/cgit.css
+++ b/cgit.css
@@ -605,13 +605,16 @@ div#cgit div.footer {
 	font-size: 80%;
 	color: #ccc;
 }
+
 div#cgit div.footer a {
 	color: #ccc;
 	text-decoration: none;
 }
+
 div#cgit div.footer a:hover {
 	text-decoration: underline;
 }
+
 div#cgit a.branch-deco {
 	color: #000;
 	margin: 0px 0.5em;
@@ -619,6 +622,7 @@ div#cgit a.branch-deco {
 	background-color: #88ff88;
 	border: solid 1px #007700;
 }
+
 div#cgit a.tag-deco {
 	color: #000;
 	margin: 0px 0.5em;
@@ -626,6 +630,7 @@ div#cgit a.tag-deco {
 	background-color: #ffff88;
 	border: solid 1px #777700;
 }
+
 div#cgit a.remote-deco {
 	color: #000;
 	margin: 0px 0.5em;
@@ -633,6 +638,7 @@ div#cgit a.remote-deco {
 	background-color: #ccccff;
 	border: solid 1px #000077;
 }
+
 div#cgit a.deco {
 	color: #000;
 	margin: 0px 0.5em;
@@ -824,3 +830,4 @@ div#cgit table.ssdiff td.space {
 div#cgit table.ssdiff td.space div {
 	min-height: 3em;
 }
+
-- 
2.9.0

[PATCH 2/2] css: consistent use of empty lines

[john]

On Wed, Jun 29, 2016 at 09:37:58AM +0200, Christian Hesse wrote:
> From: Christian Hesse <mail at eworm.de>
> 
> Signed-off-by: Christian Hesse <mail at eworm.de>
> ---
>  cgit.css | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/cgit.css b/cgit.css
> index 983eac5..763a99e 100644
> --- a/cgit.css
> +++ b/cgit.css
[snip obviously correct changes]
> @@ -824,3 +830,4 @@ div#cgit table.ssdiff td.space {
>  div#cgit table.ssdiff td.space div {
>  	min-height: 3em;
>  }
> +

Is this adding a new line to the end of the file?  I don't think we want
to do that (doesn't Git warn about it as a whitespace error?).

[PATCH 2/2] css: consistent use of empty lines

[list]

John Keeping <john at keeping.me.uk> on Wed, 2016/06/29 09:34:
> On Wed, Jun 29, 2016 at 09:37:58AM +0200, Christian Hesse wrote:
> > From: Christian Hesse <mail at eworm.de>
> > 
> > Signed-off-by: Christian Hesse <mail at eworm.de>
> > ---
> >  cgit.css | 7 +++++++
> >  1 file changed, 7 insertions(+)
> > 
> > diff --git a/cgit.css b/cgit.css
> > index 983eac5..763a99e 100644
> > --- a/cgit.css
> > +++ b/cgit.css  
> [snip obviously correct changes]
> > @@ -824,3 +830,4 @@ div#cgit table.ssdiff td.space {
> >  div#cgit table.ssdiff td.space div {
> >  	min-height: 3em;
> >  }
> > +  
> 
> Is this adding a new line to the end of the file?

Yes, it is.

> I don't think we want
> to do that (doesn't Git warn about it as a whitespace error?).

I tend to add a blank line at the end of my files. That makes sure I still
have a blank line when appending a new block.

Did not see any warnings from git... It did happily commit my changes.

But feel free to drop that change. ;)
-- 
main(a){char*c=/*    Schoene Gruesse                         */"B?IJj;MEH"
"CX:;",b;for(a/*    Best regards             my address:    */=0;b=c[a++];)
putchar(b-1/(/*    Chris            cc -ox -xc - && ./x    */b/42*2-3)*42);}
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 473 bytes
Desc: OpenPGP digital signature
URL: <http://lists.zx2c4.com/pipermail/cgit/attachments/20160629/46a8ef2a/attachment.asc>

[PATCH 1/2] ui-log: color line changes

[Jason]

Hey Christian,

This is very pretty. I'll test drive it for a few days, but I like it
overall.

[image: Inline image 1]

Thanks for the patch!

Jason
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.zx2c4.com/pipermail/cgit/attachments/20160702/718e72e2/attachment-0001.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: image.png
Type: image/png
Size: 72650 bytes
Desc: not available
URL: <http://lists.zx2c4.com/pipermail/cgit/attachments/20160702/718e72e2/attachment-0001.png>

[PATCH 2/2] css: consistent use of empty lines

[Jason]

I merged this series, but applied John's suggestion of not doing the
extra trailing line.

Thanks Christian.