##// END OF EJS Templates
diffs: made pills display on single side. Better UX and readability.
dan -
r3116:4d442652 default
parent child Browse files
Show More
@@ -743,9 +743,10 b' input.filediff-collapse-state {'
743 .pill-group {
743 .pill-group {
744 .pill {
744 .pill {
745 opacity: .8;
745 opacity: .8;
746 margin-right: 3px;
747
746 &:first-child {
748 &:first-child {
747 border-radius: @border-radius 0 0 @border-radius;
749 border-radius: @border-radius 0 0 @border-radius;
748 margin-right: 3px;
749 }
750 }
750 &:last-child {
751 &:last-child {
751 border-radius: 0 @border-radius @border-radius 0;
752 border-radius: 0 @border-radius @border-radius 0;
@@ -383,19 +383,16 b' from rhodecode.lib.diffs import NEW_FILE'
383 %endif
383 %endif
384 <i style="color: #aaa" class="tooltip icon-clipboard clipboard-action" data-clipboard-text="${final_path}" title="${_('Copy the full path')}" onclick="return false;"></i>
384 <i style="color: #aaa" class="tooltip icon-clipboard clipboard-action" data-clipboard-text="${final_path}" title="${_('Copy the full path')}" onclick="return false;"></i>
385 </span>
385 </span>
386 <span class="pill-group" style="float: left">
386 ## anchor link
387 <a class="pill filediff-anchor" href="#a_${h.FID('', filediff.patch['filename'])}"></a>
388
389 <span class="pill-group" style="float: right">
390
391 ## ops pills
387 %if filediff.limited_diff:
392 %if filediff.limited_diff:
388 <span class="pill tooltip" op="limited" title="The stats for this diff are not complete">limited diff</span>
393 <span class="pill tooltip" op="limited" title="The stats for this diff are not complete">limited diff</span>
389 %endif
394 %endif
390
395
391 %if RENAMED_FILENODE in filediff.patch['stats']['ops']:
392 <span class="pill" op="renamed">renamed</span>
393 %endif
394
395 %if COPIED_FILENODE in filediff.patch['stats']['ops']:
396 <span class="pill" op="copied">copied</span>
397 %endif
398
399 %if NEW_FILENODE in filediff.patch['stats']['ops']:
396 %if NEW_FILENODE in filediff.patch['stats']['ops']:
400 <span class="pill" op="created">created</span>
397 <span class="pill" op="created">created</span>
401 %if filediff['target_mode'].startswith('120'):
398 %if filediff['target_mode'].startswith('120'):
@@ -405,6 +402,14 b' from rhodecode.lib.diffs import NEW_FILE'
405 %endif
402 %endif
406 %endif
403 %endif
407
404
405 %if RENAMED_FILENODE in filediff.patch['stats']['ops']:
406 <span class="pill" op="renamed">renamed</span>
407 %endif
408
409 %if COPIED_FILENODE in filediff.patch['stats']['ops']:
410 <span class="pill" op="copied">copied</span>
411 %endif
412
408 %if DEL_FILENODE in filediff.patch['stats']['ops']:
413 %if DEL_FILENODE in filediff.patch['stats']['ops']:
409 <span class="pill" op="removed">removed</span>
414 <span class="pill" op="removed">removed</span>
410 %endif
415 %endif
@@ -414,23 +419,17 b' from rhodecode.lib.diffs import NEW_FILE'
414 ${nice_mode(filediff['source_mode'])}${nice_mode(filediff['target_mode'])}
419 ${nice_mode(filediff['source_mode'])}${nice_mode(filediff['target_mode'])}
415 </span>
420 </span>
416 %endif
421 %endif
417 </span>
418
422
419 <a class="pill filediff-anchor" href="#a_${h.FID('', filediff.patch['filename'])}"></a>
420
421 <span class="pill-group" style="float: right">
422 %if BIN_FILENODE in filediff.patch['stats']['ops']:
423 %if BIN_FILENODE in filediff.patch['stats']['ops']:
423 <span class="pill" op="binary">binary</span>
424 <span class="pill" op="binary">binary</span>
424 %if MOD_FILENODE in filediff.patch['stats']['ops']:
425 %if MOD_FILENODE in filediff.patch['stats']['ops']:
425 <span class="pill" op="modified">modified</span>
426 <span class="pill" op="modified">modified</span>
426 %endif
427 %endif
427 %endif
428 %endif
428 %if filediff.patch['stats']['added']:
429
429 <span class="pill" op="added">+${filediff.patch['stats']['added']}</span>
430 <span class="pill" op="added">${('+' if filediff.patch['stats']['added'] else '')}${filediff.patch['stats']['added']}</span>
430 %endif
431 <span class="pill" op="deleted">${((h.safe_int(filediff.patch['stats']['deleted']) or 0) * -1)}</span>
431 %if filediff.patch['stats']['deleted']:
432
432 <span class="pill" op="deleted">-${filediff.patch['stats']['deleted']}</span>
433 %endif
434 </span>
433 </span>
435
434
436 </%def>
435 </%def>
General Comments 0
You need to be logged in to leave comments. Login now