Show More
@@ -59,7 +59,7 b'' | |||||
59 | {files} |
|
59 | {files} | |
60 | </table> |
|
60 | </table> | |
61 |
|
61 | |||
62 | <div class="diff"> |
|
62 | <div class="diff diffblocks"> | |
63 | {diff} |
|
63 | {diff} | |
64 | </div> |
|
64 | </div> | |
65 |
|
65 |
@@ -50,7 +50,7 b'' | |||||
50 | {child%filediffchild} |
|
50 | {child%filediffchild} | |
51 | </dl> |
|
51 | </dl> | |
52 |
|
52 | |||
53 | <div class="diff"> |
|
53 | <div class="diff diffblocks"> | |
54 | {diff} |
|
54 | {diff} | |
55 | </div> |
|
55 | </div> | |
56 |
|
56 |
@@ -60,7 +60,7 b'' | |||||
60 | <p class="description">{desc|strip|escape|websub|addbreaks|nonempty}</p> |
|
60 | <p class="description">{desc|strip|escape|websub|addbreaks|nonempty}</p> | |
61 |
|
61 | |||
62 | <div class="source"> |
|
62 | <div class="source"> | |
63 | {text%fileline} |
|
63 | <pre class="sourcelines stripes">{text%fileline}</pre> | |
64 | </div> |
|
64 | </div> | |
65 |
|
65 | |||
66 | {footer} |
|
66 | {footer} |
@@ -89,9 +89,7 b' filediff = filediff.tmpl' | |||||
89 | filecomparison = filecomparison.tmpl |
|
89 | filecomparison = filecomparison.tmpl | |
90 | filelog = filelog.tmpl |
|
90 | filelog = filelog.tmpl | |
91 | fileline = ' |
|
91 | fileline = ' | |
92 | <div style="font-family:monospace" class="parity{parity}"> |
|
92 | <span id="{lineid}">{strip(line|escape, '\r\n')}</span><a href="#{lineid}"></a>' | |
93 | <pre><a class="linenr" href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}</pre> |
|
|||
94 | </div>' |
|
|||
95 | annotateline = ' |
|
93 | annotateline = ' | |
96 | <tr class="parity{parity}"> |
|
94 | <tr class="parity{parity}"> | |
97 | <td class="linenr"> |
|
95 | <td class="linenr"> | |
@@ -103,10 +101,14 b" annotateline = '" | |||||
103 | </td> |
|
101 | </td> | |
104 | <td class="source">{line|escape}</td> |
|
102 | <td class="source">{line|escape}</td> | |
105 | </tr>' |
|
103 | </tr>' | |
106 | difflineplus = '<span class="difflineplus"><a class="linenr" href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}</span>' |
|
104 | difflineplus = ' | |
107 | difflineminus = '<span class="difflineminus"><a class="linenr" href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}</span>' |
|
105 | <span id="{lineid}" class="difflineplus">{strip(line|escape, '\r\n')}</span><a href="#{lineid}"></a>' | |
108 | difflineat = '<span class="difflineat"><a class="linenr" href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}</span>' |
|
106 | difflineminus = ' | |
109 | diffline = '<span><a class="linenr" href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}</span>' |
|
107 | <span id="{lineid}" class="difflineminus">{strip(line|escape, '\r\n')}</span><a href="#{lineid}"></a>' | |
|
108 | difflineat = ' | |||
|
109 | <span id="{lineid}" class="difflineat">{strip(line|escape, '\r\n')}</span><a href="#{lineid}"></a>' | |||
|
110 | diffline = ' | |||
|
111 | <span id="{lineid}">{strip(line|escape, '\r\n')}</span><a href="#{lineid}"></a>' | |||
110 |
|
112 | |||
111 | comparisonblock =' |
|
113 | comparisonblock =' | |
112 | <tbody class="block"> |
|
114 | <tbody class="block"> | |
@@ -201,7 +203,7 b" branchentry = '" | |||||
201 | <a href="{url|urlescape}file/{node|short}{sessionvars%urlparameter}">files</a> |
|
203 | <a href="{url|urlescape}file/{node|short}{sessionvars%urlparameter}">files</a> | |
202 | </td> |
|
204 | </td> | |
203 | </tr>' |
|
205 | </tr>' | |
204 | diffblock = '<pre>{lines}</pre>' |
|
206 | diffblock = '<div class="diffblock"><pre class="sourcelines">{lines}</pre></div>' | |
205 | filediffparent = ' |
|
207 | filediffparent = ' | |
206 | <dt>parent {rev}</dt> |
|
208 | <dt>parent {rev}</dt> | |
207 | <dd><a href="{url|urlescape}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></dd>' |
|
209 | <dd><a href="{url|urlescape}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></dd>' |
@@ -255,33 +255,57 b' div.diff pre span {' | |||||
255 | font-family: monospace; |
|
255 | font-family: monospace; | |
256 | white-space: pre; |
|
256 | white-space: pre; | |
257 | font-size: 1.2em; |
|
257 | font-size: 1.2em; | |
258 | padding: 3px 0; |
|
|||
259 | } |
|
258 | } | |
|
259 | div.diffblocks { counter-reset: lineno; } | |||
|
260 | div.diffblock { counter-increment: lineno; } | |||
260 | span.difflineplus { color:#008800; } |
|
261 | span.difflineplus { color:#008800; } | |
261 | span.difflineminus { color:#cc0000; } |
|
262 | span.difflineminus { color:#cc0000; } | |
262 | span.difflineat { color:#990099; } |
|
263 | span.difflineat { color:#990099; } | |
263 |
|
264 | |||
|
265 | pre.sourcelines { position: relative; counter-reset: lineno; } | |||
|
266 | pre.sourcelines > span { | |||
|
267 | display: inline-block; | |||
|
268 | box-sizing: border-box; | |||
|
269 | width: 100%; | |||
|
270 | padding: 0 0 0 5em; | |||
|
271 | font-size: 1.2em; | |||
|
272 | counter-increment: lineno; | |||
|
273 | } | |||
|
274 | div.source > pre.sourcelines > span { | |||
|
275 | padding: 1px 1px 1px 5em; | |||
|
276 | } | |||
|
277 | pre.sourcelines > span:before { | |||
|
278 | -moz-user-select: -moz-none; | |||
|
279 | -khtml-user-select: none; | |||
|
280 | -webkit-user-select: none; | |||
|
281 | -ms-user-select: none; | |||
|
282 | user-select: none; | |||
|
283 | display: inline-block; | |||
|
284 | margin-left: -5em; | |||
|
285 | width: 4em; | |||
|
286 | color: #999; | |||
|
287 | text-align: right; | |||
|
288 | content: counters(lineno,"."); | |||
|
289 | float: left; | |||
|
290 | } | |||
|
291 | pre.sourcelines > a { | |||
|
292 | display: inline-block; | |||
|
293 | position: absolute; | |||
|
294 | left: 0px; | |||
|
295 | width: 4em; | |||
|
296 | height: 1em; | |||
|
297 | } | |||
|
298 | pre.sourcelines.stripes > :nth-child(4n+1) { background-color: #F1F6F7; } | |||
|
299 | pre.sourcelines.stripes > :nth-child(4n+3) { background-color: #FFFFFF; } | |||
|
300 | pre.sourcelines.stripes > :nth-child(4n+1):hover, | |||
|
301 | pre.sourcelines.stripes > :nth-child(4n+3):hover { background-color: #D5E1E6; } | |||
|
302 | ||||
264 | td.source { |
|
303 | td.source { | |
265 | white-space: pre; |
|
304 | white-space: pre; | |
266 | margin: 10px 30px 0; |
|
305 | margin: 10px 30px 0; | |
267 | font-size: 1.2em; |
|
306 | font-size: 1.2em; | |
268 | font-family: monospace; |
|
307 | font-family: monospace; | |
269 | } |
|
308 | } | |
270 | div.source div.parity0, |
|
|||
271 | div.source div.parity1 { |
|
|||
272 | padding: 1px; |
|
|||
273 | font-size: 1.2em; |
|
|||
274 | } |
|
|||
275 | div.source div.parity0 { |
|
|||
276 | background: #F1F6F7; |
|
|||
277 | } |
|
|||
278 | div.source div.parity1 { |
|
|||
279 | background: #FFFFFF; |
|
|||
280 | } |
|
|||
281 | div.parity0:hover, |
|
|||
282 | div.parity1:hover { |
|
|||
283 | background: #D5E1E6; |
|
|||
284 | } |
|
|||
285 | .linenr { |
|
309 | .linenr { | |
286 | color: #999; |
|
310 | color: #999; | |
287 | text-align: right; |
|
311 | text-align: right; |
General Comments 0
You need to be logged in to leave comments.
Login now