Skip to content

Commit 634b8d0

Browse files
author
Junio C Hamano
committed
Merge branch 'jn/web'
* jn/web: gitweb: Finish restoring "blob" links in git_difftree_body gitweb: Refactor feed generation, make output prettier, add Atom feed gitweb: Add an option to href() to return full URL gitweb: New improved formatting of chunk header in diff gitweb: Default to $hash_base or HEAD for $hash in "commit" and "commitdiff" gitweb: Buffer diff header to deal with split patches + git_patchset_body refactoring gitweb: Protect against possible warning in git_commitdiff
2 parents c775794 + 897d1d2 commit 634b8d0

File tree

2 files changed

+407
-167
lines changed

2 files changed

+407
-167
lines changed

gitweb/gitweb.css

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -334,11 +334,13 @@ div.diff.extended_header {
334334
padding: 2px 0px 2px 0px;
335335
}
336336

337+
div.diff a.list,
337338
div.diff a.path,
338339
div.diff a.hash {
339340
text-decoration: none;
340341
}
341342

343+
div.diff a.list:hover,
342344
div.diff a.path:hover,
343345
div.diff a.hash:hover {
344346
text-decoration: underline;
@@ -362,14 +364,25 @@ div.diff.rem {
362364
color: #cc0000;
363365
}
364366

367+
div.diff.chunk_header a,
365368
div.diff.chunk_header {
366369
color: #990099;
370+
}
367371

372+
div.diff.chunk_header {
368373
border: dotted #ffe0ff;
369374
border-width: 1px 0px 0px 0px;
370375
margin-top: 2px;
371376
}
372377

378+
div.diff.chunk_header span.chunk_info {
379+
background-color: #ffeeff;
380+
}
381+
382+
div.diff.chunk_header span.section {
383+
color: #aa22aa;
384+
}
385+
373386
div.diff.incomplete {
374387
color: #cccccc;
375388
}

0 commit comments

Comments
 (0)