Mercurial > hg > mercurial-crew-with-dirclash
annotate templates/static/style-gitweb.css @ 5483:0c43f87baba3 default tip
Fix file-changed-to-dir and dir-to-file commits (issue660).
Allow adding to dirstate files that clash with previously existing
but marked for removal. Protect from reintroducing clashes by revert.
This change doesn't address related issues with update. Current
workaround is to do "clean" update by manually removing conflicting
files/dirs from working directory.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Sat, 27 Oct 2007 16:27:55 +0400 |
parents | 4272ae760bb1 |
children |
rev | line source |
---|---|
1778
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
1 body { font-family: sans-serif; font-size: 12px; margin:0px; border:solid #d9d8d1; border-width:1px; margin:10px; } |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
2 a { color:#0000cc; } |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
3 a:hover, a:visited, a:active { color:#880000; } |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
4 div.page_header { height:25px; padding:8px; font-size:18px; font-weight:bold; background-color:#d9d8d1; } |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
5 div.page_header a:visited { color:#0000cc; } |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
6 div.page_header a:hover { color:#880000; } |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
7 div.page_nav { padding:8px; } |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
8 div.page_nav a:visited { color:#0000cc; } |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
9 div.page_path { padding:8px; border:solid #d9d8d1; border-width:0px 0px 1px} |
3473
2896ce093ec4
Add #motd# to gitweb pages. Needs to pass self.motd to index template, too.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3019
diff
changeset
|
10 div.page_footer { padding:4px 8px; background-color: #d9d8d1; } |
1778
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
11 div.page_footer_text { float:left; color:#555555; font-style:italic; } |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
12 div.page_body { padding:8px; } |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
13 div.title, a.title { |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
14 display:block; padding:6px 8px; |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
15 font-weight:bold; background-color:#edece6; text-decoration:none; color:#000000; |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
16 } |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
17 a.title:hover { background-color: #d9d8d1; } |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
18 div.title_text { padding:6px 0px; border: solid #d9d8d1; border-width:0px 0px 1px; } |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
19 div.log_body { padding:8px 8px 8px 150px; } |
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
|
20 .age { white-space:nowrap; } |
1778
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
21 span.age { position:relative; float:left; width:142px; font-style:italic; } |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
22 div.log_link { |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
23 padding:0px 8px; |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
24 font-size:10px; font-family:sans-serif; font-style:normal; |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
25 position:relative; float:left; width:136px; |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
26 } |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
27 div.list_head { padding:6px 8px 4px; border:solid #d9d8d1; border-width:1px 0px 0px; font-style:italic; } |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
28 a.list { text-decoration:none; color:#000000; } |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
29 a.list:hover { text-decoration:underline; color:#880000; } |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
30 table { padding:8px 4px; } |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
31 th { padding:2px 5px; font-size:12px; text-align:left; } |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
32 tr.light:hover, .parity0:hover { background-color:#edece6; } |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
33 tr.dark, .parity1 { background-color:#f6f6f0; } |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
34 tr.dark:hover, .parity1:hover { background-color:#edece6; } |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
35 td { padding:2px 5px; font-size:12px; vertical-align:top; } |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
36 td.link { padding:2px 5px; font-family:sans-serif; font-size:10px; } |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
37 div.pre { font-family:monospace; font-size:12px; white-space:pre; } |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
38 div.diff_info { font-family:monospace; color:#000099; background-color:#edece6; font-style:italic; } |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
39 div.index_include { border:solid #d9d8d1; border-width:0px 0px 1px; padding:12px 8px; } |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
40 div.search { margin:4px 8px; position:absolute; top:56px; right:12px } |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
41 .linenr { color:#999999; text-decoration:none } |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
42 a.rss_logo { |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
43 float:right; padding:3px 0px; width:35px; line-height:10px; |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
44 border:1px solid; border-color:#fcc7a5 #7d3302 #3e1a01 #ff954e; |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
45 color:#ffffff; background-color:#ff6600; |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
46 font-weight:bold; font-family:sans-serif; font-size:10px; |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
47 text-align:center; text-decoration:none; |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
48 } |
b08b87cecc37
[hgweb] Move CSS from headers into static files
Josef "Jeff" Sipek <jeffpc@optonline.net>
parents:
diff
changeset
|
49 a.rss_logo:hover { background-color:#ee5500; } |
3019 | 50 pre { margin: 0; } |
4538
4272ae760bb1
gitweb: Display branch and tag labels
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
3473
diff
changeset
|
51 span.logtags span { |
4272ae760bb1
gitweb: Display branch and tag labels
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
3473
diff
changeset
|
52 padding: 0px 4px; |
4272ae760bb1
gitweb: Display branch and tag labels
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
3473
diff
changeset
|
53 font-size: 10px; |
4272ae760bb1
gitweb: Display branch and tag labels
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
3473
diff
changeset
|
54 font-weight: normal; |
4272ae760bb1
gitweb: Display branch and tag labels
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
3473
diff
changeset
|
55 border: 1px solid; |
4272ae760bb1
gitweb: Display branch and tag labels
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
3473
diff
changeset
|
56 background-color: #ffaaff; |
4272ae760bb1
gitweb: Display branch and tag labels
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
3473
diff
changeset
|
57 border-color: #ffccff #ff00ee #ff00ee #ffccff; |
4272ae760bb1
gitweb: Display branch and tag labels
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
3473
diff
changeset
|
58 } |
4272ae760bb1
gitweb: Display branch and tag labels
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
3473
diff
changeset
|
59 span.logtags span.tagtag { |
4272ae760bb1
gitweb: Display branch and tag labels
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
3473
diff
changeset
|
60 background-color: #ffffaa; |
4272ae760bb1
gitweb: Display branch and tag labels
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
3473
diff
changeset
|
61 border-color: #ffffcc #ffee00 #ffee00 #ffffcc; |
4272ae760bb1
gitweb: Display branch and tag labels
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
3473
diff
changeset
|
62 } |
4272ae760bb1
gitweb: Display branch and tag labels
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
3473
diff
changeset
|
63 span.logtags span.branchtag { |
4272ae760bb1
gitweb: Display branch and tag labels
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
3473
diff
changeset
|
64 background-color: #aaffaa; |
4272ae760bb1
gitweb: Display branch and tag labels
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
3473
diff
changeset
|
65 border-color: #ccffcc #00cc33 #00cc33 #ccffcc; |
4272ae760bb1
gitweb: Display branch and tag labels
Josef "Jeff" Sipek <jeffpc@josefsipek.net>
parents:
3473
diff
changeset
|
66 } |