Show More
@@ -52,6 +52,6 changeset | | |||||
52 | {files} |
|
52 | {files} | |
53 | </table></div> |
|
53 | </table></div> | |
54 |
|
54 | |||
55 | <div class="page_body">{diff}</div> |
|
55 | <div class="page_body diffblocks">{diff}</div> | |
56 |
|
56 | |||
57 | {footer} |
|
57 | {footer} |
@@ -64,7 +64,7 file | | |||||
64 | </div> |
|
64 | </div> | |
65 |
|
65 | |||
66 | <div class="page_body"> |
|
66 | <div class="page_body"> | |
67 | {text%fileline} |
|
67 | <pre class="sourcelines stripes">{text%fileline}</pre> | |
68 | </div> |
|
68 | </div> | |
69 |
|
69 | |||
70 | {footer} |
|
70 | {footer} |
@@ -93,9 +93,7 filediff = filediff.tmpl | |||||
93 | filecomparison = filecomparison.tmpl |
|
93 | filecomparison = filecomparison.tmpl | |
94 | filelog = filelog.tmpl |
|
94 | filelog = filelog.tmpl | |
95 | fileline = ' |
|
95 | fileline = ' | |
96 | <div style="font-family:monospace" class="parity{parity}"> |
|
96 | <span id="{lineid}">{strip(line|escape, '\r\n')}</span><a href="#{lineid}"></a>' | |
97 | <pre><a class="linenr" href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}</pre> |
|
|||
98 | </div>' |
|
|||
99 | annotateline = ' |
|
97 | annotateline = ' | |
100 | <tr style="font-family:monospace" class="parity{parity}"> |
|
98 | <tr style="font-family:monospace" class="parity{parity}"> | |
101 | <td class="linenr" style="text-align: right;"> |
|
99 | <td class="linenr" style="text-align: right;"> | |
@@ -105,10 +103,14 annotateline = ' | |||||
105 | <td><pre><a class="linenr" href="#{lineid}" id="{lineid}">{linenumber}</a></pre></td> |
|
103 | <td><pre><a class="linenr" href="#{lineid}" id="{lineid}">{linenumber}</a></pre></td> | |
106 | <td><pre>{line|escape}</pre></td> |
|
104 | <td><pre>{line|escape}</pre></td> | |
107 | </tr>' |
|
105 | </tr>' | |
108 | difflineplus = '<span class="difflineplus"><a class="linenr" href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}</span>' |
|
106 | difflineplus = ' | |
109 | difflineminus = '<span class="difflineminus"><a class="linenr" href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}</span>' |
|
107 | <span id="{lineid}" class="difflineplus">{strip(line|escape, '\r\n')}</span><a href="#{lineid}"></a>' | |
110 | difflineat = '<span class="difflineat"><a class="linenr" href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}</span>' |
|
108 | difflineminus = ' | |
111 | diffline = '<a class="linenr" href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}' |
|
109 | <span id="{lineid}" class="difflineminus">{strip(line|escape, '\r\n')}</span><a href="#{lineid}"></a>' | |
|
110 | difflineat = ' | |||
|
111 | <span id="{lineid}" class="difflineat">{strip(line|escape, '\r\n')}</span><a href="#{lineid}"></a>' | |||
|
112 | diffline = ' | |||
|
113 | <span id="{lineid}">{strip(line|escape, '\r\n')}</span><a href="#{lineid}"></a>' | |||
112 |
|
114 | |||
113 | comparisonblock =' |
|
115 | comparisonblock =' | |
114 | <tbody class="block"> |
|
116 | <tbody class="block"> | |
@@ -223,7 +225,7 branchentry = ' | |||||
223 | <a href="{url|urlescape}file/{node|short}{sessionvars%urlparameter}">files</a> |
|
225 | <a href="{url|urlescape}file/{node|short}{sessionvars%urlparameter}">files</a> | |
224 | </td> |
|
226 | </td> | |
225 | </tr>' |
|
227 | </tr>' | |
226 | diffblock = '<pre>{lines}</pre>' |
|
228 | diffblock = '<div class="diffblock"><pre class="sourcelines">{lines}</pre></div>' | |
227 | filediffparent = ' |
|
229 | filediffparent = ' | |
228 | <tr> |
|
230 | <tr> | |
229 | <td>parent {rev}</td> |
|
231 | <td>parent {rev}</td> |
@@ -29,9 +29,9 a.list { text-decoration:none; color:#00 | |||||
29 | a.list:hover { text-decoration:underline; color:#880000; } |
|
29 | a.list:hover { text-decoration:underline; color:#880000; } | |
30 | table { padding:8px 4px; } |
|
30 | table { padding:8px 4px; } | |
31 | th { padding:2px 5px; font-size:12px; text-align:left; } |
|
31 | th { padding:2px 5px; font-size:12px; text-align:left; } | |
32 | tr.light:hover, .parity0:hover { background-color:#edece6; } |
|
32 | tr.light:hover, .parity0:hover, pre.sourcelines.stripes > :nth-child(4n+1):hover { background-color:#edece6; } | |
33 | tr.dark, .parity1 { background-color:#f6f6f0; } |
|
33 | tr.dark, .parity1, pre.sourcelines.stripes > :nth-child(4n+3) { background-color:#f6f6f0; } | |
34 | tr.dark:hover, .parity1:hover { background-color:#edece6; } |
|
34 | tr.dark:hover, .parity1:hover, pre.sourcelines.stripes > :nth-child(4n+3):hover { background-color:#edece6; } | |
35 | td { padding:2px 5px; font-size:12px; vertical-align:top; } |
|
35 | td { padding:2px 5px; font-size:12px; vertical-align:top; } | |
36 | td.closed { background-color: #99f; } |
|
36 | td.closed { background-color: #99f; } | |
37 | td.link { padding:2px 5px; font-family:sans-serif; font-size:10px; } |
|
37 | td.link { padding:2px 5px; font-family:sans-serif; font-size:10px; } | |
@@ -87,6 +87,37 span.logtags span.bookmarktag { | |||||
87 | span.difflineplus { color:#008800; } |
|
87 | span.difflineplus { color:#008800; } | |
88 | span.difflineminus { color:#cc0000; } |
|
88 | span.difflineminus { color:#cc0000; } | |
89 | span.difflineat { color:#990099; } |
|
89 | span.difflineat { color:#990099; } | |
|
90 | div.diffblocks { counter-reset: lineno; } | |||
|
91 | div.diffblock { counter-increment: lineno; } | |||
|
92 | pre.sourcelines { position: relative; counter-reset: lineno; } | |||
|
93 | pre.sourcelines > span { | |||
|
94 | display: inline-block; | |||
|
95 | box-sizing: border-box; | |||
|
96 | width: 100%; | |||
|
97 | padding: 0 0 0 5em; | |||
|
98 | counter-increment: lineno; | |||
|
99 | } | |||
|
100 | pre.sourcelines > span:before { | |||
|
101 | -moz-user-select: -moz-none; | |||
|
102 | -khtml-user-select: none; | |||
|
103 | -webkit-user-select: none; | |||
|
104 | -ms-user-select: none; | |||
|
105 | user-select: none; | |||
|
106 | display: inline-block; | |||
|
107 | margin-left: -5em; | |||
|
108 | width: 4em; | |||
|
109 | color: #999; | |||
|
110 | text-align: right; | |||
|
111 | content: counters(lineno,"."); | |||
|
112 | float: left; | |||
|
113 | } | |||
|
114 | pre.sourcelines > a { | |||
|
115 | display: inline-block; | |||
|
116 | position: absolute; | |||
|
117 | left: 0px; | |||
|
118 | width: 4em; | |||
|
119 | height: 1em; | |||
|
120 | } | |||
90 |
|
121 | |||
91 | /* Graph */ |
|
122 | /* Graph */ | |
92 | div#wrapper { |
|
123 | div#wrapper { |
@@ -340,7 +340,7 static file | |||||
340 |
|
340 | |||
341 | $ get-with-headers.py --twice localhost:$HGPORT 'static/style-gitweb.css' - date etag server |
|
341 | $ get-with-headers.py --twice localhost:$HGPORT 'static/style-gitweb.css' - date etag server | |
342 | 200 Script output follows |
|
342 | 200 Script output follows | |
343 |
content-length: |
|
343 | content-length: 6242 | |
344 | content-type: text/css |
|
344 | content-type: text/css | |
345 |
|
345 | |||
346 | body { font-family: sans-serif; font-size: 12px; border:solid #d9d8d1; border-width:1px; margin:10px; } |
|
346 | body { font-family: sans-serif; font-size: 12px; border:solid #d9d8d1; border-width:1px; margin:10px; } | |
@@ -374,9 +374,9 static file | |||||
374 | a.list:hover { text-decoration:underline; color:#880000; } |
|
374 | a.list:hover { text-decoration:underline; color:#880000; } | |
375 | table { padding:8px 4px; } |
|
375 | table { padding:8px 4px; } | |
376 | th { padding:2px 5px; font-size:12px; text-align:left; } |
|
376 | th { padding:2px 5px; font-size:12px; text-align:left; } | |
377 | tr.light:hover, .parity0:hover { background-color:#edece6; } |
|
377 | tr.light:hover, .parity0:hover, pre.sourcelines.stripes > :nth-child(4n+1):hover { background-color:#edece6; } | |
378 | tr.dark, .parity1 { background-color:#f6f6f0; } |
|
378 | tr.dark, .parity1, pre.sourcelines.stripes > :nth-child(4n+3) { background-color:#f6f6f0; } | |
379 | tr.dark:hover, .parity1:hover { background-color:#edece6; } |
|
379 | tr.dark:hover, .parity1:hover, pre.sourcelines.stripes > :nth-child(4n+3):hover { background-color:#edece6; } | |
380 | td { padding:2px 5px; font-size:12px; vertical-align:top; } |
|
380 | td { padding:2px 5px; font-size:12px; vertical-align:top; } | |
381 | td.closed { background-color: #99f; } |
|
381 | td.closed { background-color: #99f; } | |
382 | td.link { padding:2px 5px; font-family:sans-serif; font-size:10px; } |
|
382 | td.link { padding:2px 5px; font-family:sans-serif; font-size:10px; } | |
@@ -432,6 +432,37 static file | |||||
432 | span.difflineplus { color:#008800; } |
|
432 | span.difflineplus { color:#008800; } | |
433 | span.difflineminus { color:#cc0000; } |
|
433 | span.difflineminus { color:#cc0000; } | |
434 | span.difflineat { color:#990099; } |
|
434 | span.difflineat { color:#990099; } | |
|
435 | div.diffblocks { counter-reset: lineno; } | |||
|
436 | div.diffblock { counter-increment: lineno; } | |||
|
437 | pre.sourcelines { position: relative; counter-reset: lineno; } | |||
|
438 | pre.sourcelines > span { | |||
|
439 | display: inline-block; | |||
|
440 | box-sizing: border-box; | |||
|
441 | width: 100%; | |||
|
442 | padding: 0 0 0 5em; | |||
|
443 | counter-increment: lineno; | |||
|
444 | } | |||
|
445 | pre.sourcelines > span:before { | |||
|
446 | -moz-user-select: -moz-none; | |||
|
447 | -khtml-user-select: none; | |||
|
448 | -webkit-user-select: none; | |||
|
449 | -ms-user-select: none; | |||
|
450 | user-select: none; | |||
|
451 | display: inline-block; | |||
|
452 | margin-left: -5em; | |||
|
453 | width: 4em; | |||
|
454 | color: #999; | |||
|
455 | text-align: right; | |||
|
456 | content: counters(lineno,"."); | |||
|
457 | float: left; | |||
|
458 | } | |||
|
459 | pre.sourcelines > a { | |||
|
460 | display: inline-block; | |||
|
461 | position: absolute; | |||
|
462 | left: 0px; | |||
|
463 | width: 4em; | |||
|
464 | height: 1em; | |||
|
465 | } | |||
435 |
|
466 | |||
436 | /* Graph */ |
|
467 | /* Graph */ | |
437 | div#wrapper { |
|
468 | div#wrapper { |
General Comments 0
You need to be logged in to leave comments.
Login now