##// END OF EJS Templates
dirstate: fix restoration of "merged" state after a remove...
dirstate: fix restoration of "merged" state after a remove Before this change, "merged" file that get removed and re-added later were recorded as "from_p2" instead. This came from 8fe74328f700, a 2014 changeset that start explicitly doing so for reason I have not been able to fully grasp. The graft test mentioned in the description are still happy after this changeset. So this changeset restore what seems to be the intended behavior. Restoring information as it was before the removal. Differential Revision: https://phab.mercurial-scm.org/D11429

File last commit:

r35550:bb5a03df default
r48803:87b3010c default
Show More
style.css
117 lines | 2.6 KiB | text/css | CssLexer
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 a { text-decoration:none; }
.age { white-space:nowrap; }
.date { white-space:nowrap; }
.indexlinks { white-space:nowrap; }
Gijs Kruitbosch
hgweb: ensure both foreground and background colors are specified (issue4872)...
r26536 .parity0 { background-color: #ddd; color: #000; }
.parity1 { background-color: #eee; color: #000; }
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 .lineno { width: 60px; color: #aaa; font-size: smaller;
text-align: right; }
.plusline { color: green; }
.minusline { color: red; }
.atline { color: purple; }
.annotate { font-size: smaller; text-align: right; padding-right: 1em; }
Denis Laxalde
hgweb: highlight data of the current revision in annotate view...
r29387 tr.thisrev a { color:#999999; text-decoration: none; }
tr.thisrev pre { color:#009900; }
Tooru Fujisawa
hgweb: avoid line wrap between revision and annotate-info (issue5398)...
r30074 td.annotate {
white-space: nowrap;
}
Denis Laxalde
hgweb: add link to parents of annotated revision in annotate view...
r29522 div.annotate-info {
display: none;
position: absolute;
background-color: #FFFFFF;
av6
spartan: make annotate popup use theme colors
r29628 border: 1px solid #888;
Denis Laxalde
hgweb: add link to parents of annotated revision in annotate view...
r29522 text-align: left;
color: #000000;
padding: 5px;
}
div.annotate-info a { color: #0000FF; }
td.annotate:hover div.annotate-info { display: inline; }
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 .buttons a {
background-color: #666;
padding: 2pt;
color: white;
Alexander Plavin
css: fixed font-family...
r19075 font-family: sans-serif;
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 font-weight: bold;
}
.navigate a {
background-color: #ccc;
padding: 2pt;
Alexander Plavin
css: fixed font-family...
r19075 font-family: sans-serif;
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 color: black;
}
.metatag {
background-color: #888;
color: white;
text-align: right;
}
/* Common */
pre { margin: 0; }
.logo {
float: right;
clear: right;
}
/* Changelog/Filelog entries */
.logEntry { width: 100%; }
.logEntry .age { width: 15%; }
FUJIWARA Katsunori
hgweb: align entries in "changelog" and "revisions" pages of "spartan" style...
r21124 .logEntry th.label { width: 16em; }
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 .logEntry th { font-weight: normal; text-align: right; vertical-align: top; }
.logEntry th.age, .logEntry th.firstline { font-weight: bold; }
.logEntry th.firstline { text-align: left; width: inherit; }
/* Shortlog entries */
.slogEntry { width: 100%; }
.slogEntry .age { width: 8em; }
.slogEntry td { font-weight: normal; text-align: left; vertical-align: top; }
.slogEntry td.author { width: 15em; }
/* Tag entries */
#tagEntries { list-style: none; margin: 0; padding: 0; }
#tagEntries .tagEntry { list-style: none; margin: 0; padding: 0; }
/* Changeset entry */
#changesetEntry { }
#changesetEntry th { font-weight: normal; background-color: #888; color: #fff; text-align: right; }
#changesetEntry th.files, #changesetEntry th.description { vertical-align: top; }
/* File diff view */
#filediffEntry { }
#filediffEntry th { font-weight: normal; background-color: #888; color: #fff; text-align: right; }
/* Graph */
div#wrapper {
position: relative;
margin: 0;
padding: 0;
}
canvas {
position: absolute;
z-index: 5;
top: -0.6em;
margin: 0;
}
av6
spartan: make actual changeset entries have backgrounds on /graph...
r35550 ul#graphnodes {
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 list-style: none inside none;
padding: 0;
margin: 0;
}
av6
spartan: make actual changeset entries have backgrounds on /graph...
r35550 ul#graphnodes li {
height: 37px;
overflow: visible;
padding-top: 2px;
}
ul#graphnodes li .fg {
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 position: absolute;
z-index: 10;
}
ul#graphnodes li .info {
font-size: 70%;
}