##// END OF EJS Templates
file summary and codeblock styles adjustments
Liviu -
r3668:8a8aadb3 new-ui
parent child Browse files
Show More
@@ -408,8 +408,8 b' div.codeblock {'
408
408
409 overflow: auto;
409 overflow: auto;
410 padding: 0px;
410 padding: 0px;
411 border: @border-thickness solid @grey5;
411 border: @border-thickness solid #EAEAEA;
412 background: @grey6;
412 background: #f5f5f5;
413 .border-radius(@border-radius);
413 .border-radius(@border-radius);
414
414
415 #remove_gist {
415 #remove_gist {
@@ -493,6 +493,10 b' div.codeblock {'
493 width: 100%;
493 width: 100%;
494 }
494 }
495 }
495 }
496
497 .codeblock-header {
498 border-bottom: 1px solid #eaeaea;
499 }
496 }
500 }
497
501
498 .code-highlighttable,
502 .code-highlighttable,
@@ -516,7 +516,7 b' ul.auth_plugins {'
516 text-align: center;
516 text-align: center;
517 vertical-align: middle;
517 vertical-align: middle;
518 color: @grey2;
518 color: @grey2;
519 background-color: @grey6;
519 font-size: 11px;
520
520
521 p {
521 p {
522 margin: 0;
522 margin: 0;
@@ -228,6 +228,23 b''
228 }
228 }
229 }
229 }
230
230
231 .left-label-summary-files {
232 padding-left: 45px;
233 margin-top: 5px;
234
235 p {
236 margin-bottom: 5px;
237 color: @grey1;
238 float: left;
239 width: 130px;
240 }
241
242 .right-label-summary {
243 float: left;
244 margin-top: 7px;
245 }
246 }
247
231 .left-content {
248 .left-content {
232 width: ~"calc(60% - 20px)";
249 width: ~"calc(60% - 20px)";
233 float: left;
250 float: left;
@@ -386,11 +403,10 b''
386 display: block;
403 display: block;
387 width: 100%;
404 width: 100%;
388 margin: 0;
405 margin: 0;
389 padding: @space 0 10px 0;
390 border-top: @border-thickness solid @border-default-color;
391
406
392 .stats {
407 .stats {
393 float: left;
408 float: left;
409 padding: 10px;
394 }
410 }
395 .stats-filename {
411 .stats-filename {
396 font-size: 120%;
412 font-size: 120%;
@@ -399,10 +415,17 b''
399 padding: 0px 0px 0px 3px;
415 padding: 0px 0px 0px 3px;
400 }
416 }
401
417
418 .stats-info {
419 margin-top: 5px;
420 color: @grey4;
421 }
422
402 .buttons {
423 .buttons {
403 float: right;
424 float: right;
404 text-align: right;
425 text-align: right;
405 color: @grey4;
426 color: @grey4;
427 padding: 10px;
428 margin-top: 15px;
406 }
429 }
407
430
408 .file-container {
431 .file-container {
@@ -3,24 +3,25 b''
3 <div id="codeblock" class="codeblock">
3 <div id="codeblock" class="codeblock">
4 <div class="codeblock-header">
4 <div class="codeblock-header">
5 <div class="stats">
5 <div class="stats">
6 <span class="stats-filename">
6 <span class="stats-filename">
7 <strong>
7 <strong>
8 <i class="icon-file-text"></i>
8 <i class="icon-file-text"></i>
9 ${c.file.unicode_path_safe}
9 ${c.file.unicode_path_safe}
10 </strong>
10 </strong>
11 </span>
11 </span>
12 <span class="item last"><i class="tooltip icon-clipboard clipboard-action" data-clipboard-text="${c.f_path}" title="${_('Copy the full path')}"></i></span>
12 <span class="item last"><i class="tooltip icon-clipboard clipboard-action" data-clipboard-text="${c.f_path}" title="${_('Copy the full path')}"></i></span>
13 <br/>
13 <br/>
14
14
15 % if c.lf_node:
15 % if c.lf_node:
16 <span title="${_('This file is a pointer to large binary file')}"> | ${_('LargeFile')} ${h.format_byte_size_binary(c.lf_node.size)} </span>
16 <span title="${_('This file is a pointer to large binary file')}"> | ${_('LargeFile')} ${h.format_byte_size_binary(c.lf_node.size)} </span>
17 % endif
17 % endif
18
18
19 <span class="stats-first-item">${c.file.lines()[0]} ${_ungettext('line', 'lines', c.file.lines()[0])}</span>
19 <div class="stats-info">
20 <span> | ${h.format_byte_size_binary(c.file.size)}</span>
20 <span class="stats-first-item">${c.file.lines()[0]} ${_ungettext('line', 'lines', c.file.lines()[0])}</span>
21 <span> | ${c.file.mimetype} </span>
21 <span> | ${h.format_byte_size_binary(c.file.size)}</span>
22 <span> | ${h.get_lexer_for_filenode(c.file).__class__.__name__}</span>
22 <span> | ${c.file.mimetype} </span>
23
23 <span> | ${h.get_lexer_for_filenode(c.file).__class__.__name__}</span>
24 </div>
24 </div>
25 </div>
25 <div class="buttons">
26 <div class="buttons">
26 <a id="file_history_overview" href="#">
27 <a id="file_history_overview" href="#">
@@ -27,10 +27,10 b''
27 </div>
27 </div>
28
28
29 <div class="fieldset collapsable-content" data-toggle="summary-details">
29 <div class="fieldset collapsable-content" data-toggle="summary-details">
30 <div class="">
30 <div class="left-label-summary-files">
31 <div class="tags">
31 <p>${_('File last commit')}</p>
32 ${_('File last commit')}
32 <div class="right-label-summary">
33 <code><a href="${h.route_path('repo_commit',repo_name=c.repo_name,commit_id=c.file_last_commit.raw_id)}">${h.show_id(c.file_last_commit)}</a></code>
33 <code><a href="${h.route_path('repo_commit',repo_name=c.repo_name,commit_id=c.file_last_commit.raw_id)}">${h.show_id(c.file_last_commit)}</a></code>
34
34
35 ${file_base.refs(c.file_last_commit)}
35 ${file_base.refs(c.file_last_commit)}
36 </div>
36 </div>
@@ -39,22 +39,24 b''
39
39
40
40
41 <div class="fieldset collapsable-content" data-toggle="summary-details">
41 <div class="fieldset collapsable-content" data-toggle="summary-details">
42 <div class="">
42 <div class="left-label-summary-files">
43 ${_('Show/Diff file')}
43 <p>${_('Show/Diff file')}</p>
44 ${h.hidden('diff1')}
44 <div class="right-label-summary">
45 ${h.hidden('diff2',c.commit.raw_id)}
45 ${h.hidden('diff1')}
46 ${h.hidden('annotate', c.annotate)}
46 ${h.hidden('diff2',c.commit.raw_id)}
47 ${h.hidden('annotate', c.annotate)}
48 </div>
47 </div>
49 </div>
48 </div>
50 </div>
49
51
50
52
51 <div class="fieldset collapsable-content" data-toggle="summary-details">
53 <div class="fieldset collapsable-content" data-toggle="summary-details">
52 <div class="">
54 <div class="left-label-summary-files">
53 ${_('Action')}:
55 <p>${_('Action')}</p>
54 </div>
56 <div class="right-label-summary">
55 <div class="">
57 ${h.submit('diff_to_commit',_('Diff to Commit'),class_="btn disabled",disabled="true")}
56 ${h.submit('diff_to_commit',_('Diff to Commit'),class_="btn disabled",disabled="true")}
58 ${h.submit('show_at_commit',_('Show at Commit'),class_="btn disabled",disabled="true")}
57 ${h.submit('show_at_commit',_('Show at Commit'),class_="btn disabled",disabled="true")}
59 </div>
58 </div>
60 </div>
59 </div>
61 </div>
60 </div>
62 </div>
General Comments 0
You need to be logged in to leave comments. Login now