##// END OF EJS Templates
rebase: allow in-memory merge of the working copy parent...
rebase: allow in-memory merge of the working copy parent Before this patch and when the rebase involved the working copy parent (and thus the working copy too), we would not do in-memory rebase even if requested to. The in-code comment explains that the reason had something to do with avoiding an extra update, but I don't know which update that refers to. Perhaps an earlier version of the code used to update to the destination before rebasing even if in-memory rebase was requested? That seems to not be done at least since aa660c1203a9 (rebase: do not bail on uncomitted changes if rebasing in-memory, 2017-12-07). To see if this still made it slower, I create a single tiny commit on top of one branch of the mozilla-unified repo (commit a1098c82 to be exact) and rebased it to another branch (commit d4e9a7be). Before this patch that took 11.8s and after this patch it took 8.6s (I only did two runs each, but the timings were very consistent). Differential Revision: https://phab.mercurial-scm.org/D2876

File last commit:

r35547:5afe0ca5 default
r36993:795eb53f default
Show More
style-paper.css
549 lines | 9.1 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;
}
av6
hgweb: show commit phase if it's not public...
r35064 .phase {
color: #999;
font-size: 70%;
border-bottom: 1px dotted #999;
font-weight: normal;
margin-left: .5em;
vertical-align: baseline;
}
av6
hgweb: show obsolescence status of a commit...
r35088 .obsolete {
color: #999;
font-size: 70%;
border-bottom: 1px dashed #999;
font-weight: normal;
margin-left: .5em;
vertical-align: baseline;
}
av6
hgweb: show instabilities of a commit...
r35093 .instability {
color: #000;
font-size: 70%;
border-bottom: 1px solid #000;
font-weight: normal;
margin-left: .5em;
vertical-align: baseline;
}
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 .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;
}
/* 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 {
av6
paper: minor adjustments to table styles...
r35480 padding: 1px 4px;
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 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; }
Denis Laxalde
hgweb: highlight data of the current revision in annotate view...
r29387 tr.thisrev a { color:#999999; text-decoration: none; }
tr.thisrev td.source { 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 {
Denis Laxalde
hgweb: re-implement followlines UI selection using buttons...
r33390 z-index: 5;
Denis Laxalde
hgweb: add link to parents of annotated revision in annotate view...
r29522 display: none;
position: absolute;
background-color: #FFFFFF;
av6
paper: make annotate popup use theme colors
r29625 border: 1px solid #999;
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
Gregory Szorc
hgweb: add HTML elements to control whitespace settings for annotate...
r34392 #diffopts-form {
font-size: smaller;
color: #424242;
padding-bottom: 10px;
display: none;
}
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;
Denis Laxalde
hgweb: re-implement followlines UI selection using buttons...
r33390 margin-left: -6em;
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 }
Denis Laxalde
hgweb: re-implement followlines UI selection using buttons...
r33390 /* Followlines */
Denis Laxalde
hgweb: plug followlines action in annotate view...
r32994 tbody.sourcelines > tr.followlines-selected,
Denis Laxalde
hgweb: expose a followlines UI in filerevision view...
r31758 pre.sourcelines > span.followlines-selected {
background-color: #99C7E9;
}
div#followlines {
av6
paper: apply styles from annotate tooltip to followlines popup...
r35025 background-color: #FFF;
border: 1px solid #999;
padding: 5px;
Denis Laxalde
hgweb: position the "followlines" box close to latest cursor position
r31849 position: fixed;
Denis Laxalde
hgweb: expose a followlines UI in filerevision view...
r31758 }
div.followlines-cancel {
text-align: right;
}
div.followlines-cancel > button {
line-height: 80%;
padding: 0;
border: 0;
border-radius: 2px;
background-color: inherit;
font-weight: bold;
}
div.followlines-cancel > button:hover {
color: #FFFFFF;
background-color: #CF1F1F;
}
div.followlines-link {
margin: 2px;
margin-top: 4px;
font-family: sans-serif;
}
Denis Laxalde
hgweb: re-implement followlines UI selection using buttons...
r33390 .btn-followlines {
Denis Laxalde
hgweb: add a floating tooltip to invite on followlines action...
r31848 display: none;
Denis Laxalde
hgweb: re-implement followlines UI selection using buttons...
r33390 cursor: pointer;
box-sizing: content-box;
font-size: 12px;
width: 13px;
height: 13px;
border-radius: 3px;
margin: 0px;
margin-top: -2px;
padding: 0px;
background-color: #E5FDE5;
border: 1px solid #9BC19B;
font-family: monospace;
text-align: center;
line-height: 5px;
}
tr .btn-followlines {
position: absolute;
Denis Laxalde
hgweb: add a floating tooltip to invite on followlines action...
r31848 }
Denis Laxalde
hgweb: re-implement followlines UI selection using buttons...
r33390 span .btn-followlines {
float: left;
}
span.followlines-select .btn-followlines {
margin-left: -1.5em;
}
.btn-followlines:hover {
transform: scale(1.2, 1.2);
}
.btn-followlines .followlines-plus {
color: green;
}
.btn-followlines .followlines-minus {
color: red;
}
.btn-followlines-end {
background-color: #ffdcdc;
}
.sourcelines tr:hover .btn-followlines,
.sourcelines span.followlines-select:hover > .btn-followlines {
Denis Laxalde
hgweb: add a floating tooltip to invite on followlines action...
r31848 display: inline;
}
Denis Laxalde
hgweb: re-implement followlines UI selection using buttons...
r33390 .btn-followlines-hidden,
.sourcelines tr:hover .btn-followlines-hidden {
Denis Laxalde
hgweb: add a floating tooltip to invite on followlines action...
r31848 display: none;
}
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;
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 {
list-style: none inside none;
padding: 0;
margin: 0;
}
av6
paper: make actual changeset entries have backgrounds on /graph...
r35547 ul#graphnodes li {
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 height: 39px;
av6
paper: make actual changeset entries have backgrounds on /graph...
r35547 overflow: visible;
}
ul#graphnodes li .fg {
position: absolute;
z-index: 10;
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 }
ul#graphnodes li .info {
font-size: 70%;
}
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;
}