Mercurial > hg > mercurial-crew-with-dirclash
annotate templates/static/style.css @ 5045:f191bc3916f7
merge: do early copy to deal with issue636
Without copies/renames, merges source names are 1:1 with their
targets. Copies and renames introduce the possibility that there will
be two merges with the same input but different output. By doing the
copy to the destination name before the merge, the actual merge
becomes 1:1 again, and no source is the input to two different merges.
- add a preliminary scan to applyupdates to do copies
- for the merge action, pass the old name (for finding ancestors) and
the new name (for input to the merge) to filemerge
- eliminate the old post-merge copy
- lookup file contents from new name in filemerge
- pass new name to external merge helper
- report merge failure at new name
- add a test
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 01 Aug 2007 12:33:12 -0500 |
parents | bc63247c66e9 |
children | 6e0f05f6f68d |
rev | line source |
---|---|
1778
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
1 a { text-decoration:none; } |
2130
90ee844b9f71
hgweb templates: Don't word wrap "foo bar ago" (e.g. "3 months\nago")
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1778
diff
changeset
|
2 .age { white-space:nowrap; } |
2171
290534ee163c
Add download links to hgwebdir index page for allowed archive types.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2132
diff
changeset
|
3 .indexlinks { white-space:nowrap; } |
1778
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
4 .parity0 { background-color: #dddddd; } |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
5 .parity1 { background-color: #eeeeee; } |
4659
7a7d4937272b
Kill trailing spaces
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2686
diff
changeset
|
6 .lineno { width: 60px; color: #aaaaaa; font-size: smaller; |
1778
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
7 text-align: right; padding-right:1em; } |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
8 .plusline { color: green; } |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
9 .minusline { color: red; } |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
10 .atline { color: purple; } |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
11 .annotate { font-size: smaller; text-align: right; padding-right: 1em; } |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
12 .buttons a { |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
13 background-color: #666666; |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
14 padding: 2pt; |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
15 color: white; |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
16 font-family: sans; |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
17 font-weight: bold; |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
18 } |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
19 .navigate a { |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
20 background-color: #ccc; |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
21 padding: 2pt; |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
22 font-family: sans; |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
23 color: black; |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
24 } |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
25 |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
26 .metatag { |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
27 background-color: #888888; |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
28 color: white; |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
29 text-align: right; |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
30 } |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
31 |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
32 /* Common */ |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
33 pre { margin: 0; } |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
34 |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
35 .logo { |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
36 background-color: #333; |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
37 padding: 4pt; |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
38 margin: 8pt 0 8pt 8pt; |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
39 font-family: sans; |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
40 font-size: 60%; |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
41 color: white; |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
42 float: right; |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
43 clear: right; |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
44 text-align: left; |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
45 } |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
46 |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
47 .logo a { |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
48 font-weight: bold; |
4659
7a7d4937272b
Kill trailing spaces
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2686
diff
changeset
|
49 font-size: 150%; |
1778
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
50 color: #999; |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
51 } |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
52 |
2132
4990b62fd0a6
hgweb: Synchronised filelogentry to changelogentry.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2131
diff
changeset
|
53 /* Changelog/Filelog entries */ |
4990b62fd0a6
hgweb: Synchronised filelogentry to changelogentry.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2131
diff
changeset
|
54 .logEntry { width: 100%; } |
4990b62fd0a6
hgweb: Synchronised filelogentry to changelogentry.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2131
diff
changeset
|
55 .logEntry .age { width: 15%; } |
4990b62fd0a6
hgweb: Synchronised filelogentry to changelogentry.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2131
diff
changeset
|
56 .logEntry th { font-weight: normal; text-align: right; vertical-align: top; } |
4990b62fd0a6
hgweb: Synchronised filelogentry to changelogentry.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2131
diff
changeset
|
57 .logEntry th.age, .logEntry th.firstline { font-weight: bold; } |
4990b62fd0a6
hgweb: Synchronised filelogentry to changelogentry.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2131
diff
changeset
|
58 .logEntry th.firstline { text-align: left; width: inherit; } |
1778
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
59 |
2686
d98eebc48d5e
[hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
2171
diff
changeset
|
60 /* Shortlog entries */ |
4703
bc63247c66e9
hgweb: improve shortlog formatting
Matt Mackall <mpm@selenic.com>
parents:
4659
diff
changeset
|
61 .slogEntry { width: 100%; } |
bc63247c66e9
hgweb: improve shortlog formatting
Matt Mackall <mpm@selenic.com>
parents:
4659
diff
changeset
|
62 .slogEntry .age { width: 8em; } |
2686
d98eebc48d5e
[hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
2171
diff
changeset
|
63 .slogEntry td { font-weight: normal; text-align: left; vertical-align: top; } |
4703
bc63247c66e9
hgweb: improve shortlog formatting
Matt Mackall <mpm@selenic.com>
parents:
4659
diff
changeset
|
64 .slogEntry td.author { width: 15em; } |
2686
d98eebc48d5e
[hgweb] Shortlog template for default theme
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
2171
diff
changeset
|
65 |
1778
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
66 /* Tag entries */ |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
67 #tagEntries { list-style: none; margin: 0; padding: 0; } |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
68 #tagEntries .tagEntry { list-style: none; margin: 0; padding: 0; } |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
69 |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
70 /* Changeset entry */ |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
71 #changesetEntry { } |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
72 #changesetEntry th { font-weight: normal; background-color: #888; color: #fff; text-align: right; } |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
73 #changesetEntry th.files, #changesetEntry th.description { vertical-align: top; } |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
74 |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
75 /* File diff view */ |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
76 #filediffEntry { } |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
77 #filediffEntry th { font-weight: normal; background-color: #888; color: #fff; text-align: right; } |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
78 |