##// END OF EJS Templates
filectx: add isabsent method...
filectx: add isabsent method This will indicate whether this filectx represents a file that is *not* in a changectx. This will be used by merge and filemerge code to know about when a conflict is a change/delete conflict. While this is kind of hacky, it is the least bad of all the alternatives. Other options considered but rejected include: - isinstance(fctx, ...) -- not very Pythonic, doesn't support duck typing - fctx.size() is None -- the 'size()' call on workingfilectxes causes a disk stat - fctx.filenode() == nullid -- the semantics around filenode are incredibly confusing. In particular, for workingfilectxes, filenode() is always None no matter whether the file is present on disk or in either parent. Having different behavior for None versus nullid in the merge code is just asking for pain. Thanks to Pierre-Yves David for early review feedback here.

File last commit:

r26599:bdd7d9c7 default
r26978:9b9d4bcc default
Show More
style-paper.css
415 lines | 6.7 KiB | text/css | CssLexer
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 body {
margin: 0;
padding: 0;
background: white;
Gijs Kruitbosch
hgweb: ensure both foreground and background colors are specified (issue4872)...
r26536 color: black;
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 font-family: sans-serif;
}
.container {
padding-left: 115px;
}
.main {
position: relative;
background: white;
padding: 2em 2em 2em 0;
}
#.main {
width: 98%;
}
.overflow {
width: 100%;
overflow: auto;
}
.menu {
width: 90px;
margin: 0;
font-size: 80%;
text-align: left;
position: absolute;
top: 20px;
left: 20px;
right: auto;
}
.menu ul {
list-style: none;
padding: 0;
margin: 10px 0 0 0;
border-left: 2px solid #999;
}
.menu li {
margin-bottom: 3px;
padding: 2px 4px;
background: white;
color: black;
font-weight: normal;
}
.menu li.active {
font-weight: bold;
}
.menu img {
width: 75px;
height: 90px;
border: 0;
}
Anton Shestakov
hgweb: use css margin instead of empty <p> before <div class="atom-logo">...
r24041 div.atom-logo {
margin-top: 10px;
}
Angel Ezquerra
hgweb: add (Atom) subscribe link to the main paper template pages...
r18200 .atom-logo img{
width: 14px;
height: 14px;
border: 0;
}
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 .menu a { color: black; display: block; }
.search {
position: absolute;
top: .7em;
right: 2em;
}
form.search div#hint {
display: none;
position: absolute;
top: 40px;
right: 0px;
width: 190px;
padding: 5px;
background: #ffc;
font-size: 70%;
border: 1px solid yellow;
Gijs Kruitbosch
hgweb: fix border-radius for standards-based browsers...
r26530 border-radius: 5px;
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 }
form.search:hover div#hint { display: block; }
a { text-decoration:none; }
.age { white-space:nowrap; }
.date { white-space:nowrap; }
.indexlinks { white-space:nowrap; }
Alexander Plavin
hgweb: introduce separate classes for stripey background...
r19431 .parity0,
.stripes4 > :nth-child(4n+1),
.stripes2 > :nth-child(2n+1) { background-color: #f0f0f0; }
.parity1,
.stripes4 > :nth-child(4n+3),
.stripes2 > :nth-child(2n+2) { background-color: white; }
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 .plusline { color: green; }
.minusline { color: #dc143c; } /* crimson */
.atline { color: purple; }
Anton Shestakov
hgweb: use css margin instead of empty <p> before diffstat table...
r24042 .diffstat-table {
margin-top: 1em;
}
Steven Brown
paper, coal: define the diffstat templates...
r14563 .diffstat-file {
white-space: nowrap;
font-size: 90%;
}
.diffstat-total {
white-space: nowrap;
font-size: 90%;
}
.diffstat-graph {
width: 100%;
}
.diffstat-add {
background-color: green;
float: left;
}
.diffstat-remove {
background-color: red;
float: left;
}
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 .navigate {
text-align: right;
font-size: 60%;
margin: 1em 0;
}
.tag {
color: #999;
font-size: 70%;
font-weight: normal;
margin-left: .5em;
vertical-align: baseline;
}
.branchhead {
color: #000;
font-size: 80%;
font-weight: normal;
margin-left: .5em;
vertical-align: baseline;
}
ul#graphnodes .branchhead {
font-size: 75%;
}
.branchname {
color: #000;
Thomas Arendsen Hein
trailing spaces (and one stray tab)
r10575 font-size: 60%;
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 font-weight: normal;
margin-left: .5em;
vertical-align: baseline;
}
h3 .branchname {
font-size: 80%;
}
/* Common */
pre { margin: 0; }
h2 { font-size: 120%; border-bottom: 1px solid #999; }
h2 a { color: #000; }
h3 {
anuraggoel
paper: overlapping of section title on help pages (issue4051)...
r20626 margin-top: +.7em;
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 font-size: 100%;
}
/* log and tags tables */
.bigtable {
border-bottom: 1px solid #999;
border-collapse: collapse;
font-size: 90%;
width: 100%;
font-weight: normal;
text-align: left;
}
.bigtable td {
vertical-align: top;
}
.bigtable th {
padding: 1px 4px;
border-bottom: 1px solid #999;
}
.bigtable tr { border: none; }
.bigtable .age { width: 7em; }
Dan Villiom Podlaski Christiansen
hgweb: consistent author name width...
r18664 .bigtable .author { width: 15em; }
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 .bigtable .description { }
Kevin Gessner
hgweb: add base link to file log for paper and coal styles (issue2452)
r13850 .bigtable .description .base { font-size: 70%; float: right; line-height: 1.66; }
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 .bigtable .node { width: 5em; font-family: monospace;}
.bigtable .permissions { width: 8em; text-align: left;}
.bigtable .size { width: 5em; text-align: right; }
.bigtable .annotate { text-align: right; }
.bigtable td.annotate { font-size: smaller; }
.bigtable td.source { font-size: inherit; }
av6
hgweb: replace .sourcelast with .bottomline that does the same...
r26245 .source, .sourcefirst {
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 font-family: monospace;
white-space: pre;
padding: 1px 4px;
font-size: 90%;
}
.sourcefirst { border-bottom: 1px solid #999; font-weight: bold; }
.source a { color: #999; font-size: smaller; font-family: monospace;}
.bottomline { border-bottom: 1px solid #999; }
Alexander Plavin
hgweb: code selection without line numbers in file source view...
r19387 .sourcelines {
font-size: 90%;
position: relative;
Alexander Plavin
hgweb: file diff and changesets views behave like file source view...
r19432 counter-reset: lineno;
Alexander Plavin
hgweb: code selection without line numbers in file source view...
r19387 }
Alexander Plavin
hgweb: add line wrapping switch to file source view...
r19430 .wrap > span {
white-space: pre-wrap;
}
.linewraptoggle {
float: right;
}
Alexander Plavin
hgweb: file diff and changesets views behave like file source view...
r19432 .diffblocks { counter-reset: lineno; }
.diffblocks > div { counter-increment: lineno; }
Alexander Plavin
hgweb: code selection without line numbers in file source view...
r19387 .sourcelines > span {
display: inline-block;
Paul Fisher
hgweb: pull line numbers out of main flow of source content...
r24427 box-sizing: border-box;
Alexander Plavin
hgweb: code selection without line numbers in file source view...
r19387 width: 100%;
Paul Fisher
hgweb: pull line numbers out of main flow of source content...
r24427 padding: 1px 0px 1px 5em;
Alexander Plavin
hgweb: code selection without line numbers in file source view...
r19387 counter-increment: lineno;
}
.sourcelines > span:before {
-moz-user-select: -moz-none;
-khtml-user-select: none;
-webkit-user-select: none;
-ms-user-select: none;
user-select: none;
display: inline-block;
Paul Fisher
hgweb: pull line numbers out of main flow of source content...
r24427 margin-left: -5em;
Alexander Plavin
hgweb: code selection without line numbers in file source view...
r19387 width: 4em;
font-size: smaller;
color: #999;
text-align: right;
Alexander Plavin
hgweb: file diff and changesets views behave like file source view...
r19432 content: counters(lineno, ".");
Alexander Plavin
paper: fix rendering of the first tab in a line in Webkit (issue3990)...
r19492 float: left;
Alexander Plavin
hgweb: code selection without line numbers in file source view...
r19387 }
Alexander Plavin
hgweb: highlight line which is linked to at comparison view
r19459 .sourcelines > span:target, tr:target td {
Alexander Plavin
hgweb: change highlighted line color to be different from 'inserted' color...
r19458 background-color: #bfdfff;
Alexander Plavin
hgweb: color line which is linked to in file source view...
r19389 }
Alexander Plavin
hgweb: code selection without line numbers in file source view...
r19387 .sourcelines > a {
display: inline-block;
position: absolute;
left: 0px;
width: 4em;
height: 1em;
}
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 .fileline { font-family: monospace; }
.fileline img { border: 0; }
.tagEntry .closed { color: #99f; }
/* Changeset entry */
#changesetEntry {
border-collapse: collapse;
font-size: 90%;
width: 100%;
margin-bottom: 1em;
}
#changesetEntry th {
padding: 1px 4px;
width: 4em;
text-align: right;
font-weight: normal;
color: #999;
margin-right: .5em;
vertical-align: top;
}
div.description {
border-left: 2px solid #999;
margin: 1em 0 1em 0;
padding: .3em;
Adrian Buehlmann
paper: preserve whitespace on description instead of adding breaks...
r13934 white-space: pre;
Adrian Buehlmann
paper: use monospace font for description
r13961 font-family: monospace;
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 }
/* Graph */
div#wrapper {
position: relative;
border-top: 1px solid black;
border-bottom: 1px solid black;
margin: 0;
padding: 0;
}
canvas {
position: absolute;
z-index: 5;
top: -0.7em;
margin: 0;
}
ul#graphnodes {
position: absolute;
z-index: 10;
top: -1.0em;
list-style: none inside none;
padding: 0;
}
ul#nodebgs {
list-style: none inside none;
padding: 0;
margin: 0;
top: -0.7em;
}
ul#graphnodes li, ul#nodebgs li {
height: 39px;
}
ul#graphnodes li .info {
display: block;
font-size: 70%;
position: relative;
top: -3px;
}
wujek srujek
hgweb: side-by-side comparison functionality...
r17202
/* Comparison */
.legend {
padding: 1.5% 0 1.5% 0;
}
.legendinfo {
border: 1px solid #999;
font-size: 80%;
text-align: center;
padding: 0.5%;
}
.equal {
background-color: #ffffff;
}
.delete {
Matt Mackall
hgweb: improve colors for comparison page...
r17243 background-color: #faa;
color: #333;
wujek srujek
hgweb: side-by-side comparison functionality...
r17202 }
.insert {
Matt Mackall
hgweb: improve colors for comparison page...
r17243 background-color: #ffa;
wujek srujek
hgweb: side-by-side comparison functionality...
r17202 }
.replace {
Matt Mackall
hgweb: improve colors for comparison page...
r17243 background-color: #e8e8e8;
wujek srujek
hgweb: side-by-side comparison functionality...
r17202 }
.header {
text-align: center;
}
.block {
border-top: 1px solid #999;
}
Angel Ezquerra <angel.ezquerra at gmail.com>
hgweb: add a "URL breadcrumb" to the index and repository pages...
r18258
.breadcrumb {
color: gray;
}
.breadcrumb a {
color: blue;
}
Alexander Plavin
paper: add simple animation to the loading indicator
r19761
.scroll-loading {
-webkit-animation: change_color 1s linear 0s infinite alternate;
-moz-animation: change_color 1s linear 0s infinite alternate;
-o-animation: change_color 1s linear 0s infinite alternate;
animation: change_color 1s linear 0s infinite alternate;
}
@-webkit-keyframes change_color {
from { background-color: #A0CEFF; } to { }
}
@-moz-keyframes change_color {
from { background-color: #A0CEFF; } to { }
}
@-o-keyframes change_color {
from { background-color: #A0CEFF; } to { }
}
@keyframes change_color {
from { background-color: #A0CEFF; } to { }
}
Alexander Plavin
paper: add reddish background to ajax error message
r19762 .scroll-loading-error {
background-color: #FFCCCC !important;
}