|
| 1 | +--- |
| 2 | +permalink: colorsLegend.html |
| 3 | +layout: default |
| 4 | + |
| 5 | +# mainAnchor is used by Apple links |
| 6 | +mainAnchor: colorsLegend |
| 7 | +title: Colors Legend |
| 8 | +subtitle: Colors and icons used in folder and file comparison views |
| 9 | +--- |
| 10 | + |
| 11 | +# [Folder Colors](#folder_colors) |
| 12 | + |
| 13 | +Folders are shown using different colors to quickly visualize the file comparison results. |
| 14 | + |
| 15 | +<div class="table-wrapper"> |
| 16 | + <table class="alt"> |
| 17 | + <thead> |
| 18 | + <tr> |
| 19 | + <th>Folder</th> |
| 20 | + <th>Description</th> |
| 21 | + </tr> |
| 22 | + </thead> |
| 23 | + <tbody> |
| 24 | + <tr> |
| 25 | + <td><img class="folder-legend" src="{{ site.prefixDir }}img/screenshots/folder/view/folders/folder-000.png"></td> |
| 26 | + <td>Matched folder (all contained files are the same on the other side)</td> |
| 27 | + </tr> |
| 28 | + <tr> |
| 29 | + <td><img class="folder-legend" src="{{ site.prefixDir }}img/screenshots/folder/view/folders/folder-001.png"></td> |
| 30 | + <td>Folder contains only files older than the other side</td> |
| 31 | + </tr> |
| 32 | + <tr> |
| 33 | + <td><img class="folder-legend" src="{{ site.prefixDir }}img/screenshots/folder/view/folders/folder-010.png"></td> |
| 34 | + <td>Folder contains only modified files</td> |
| 35 | + </tr> |
| 36 | + <tr> |
| 37 | + <td><img class="folder-legend" src="{{ site.prefixDir }}img/screenshots/folder/view/folders/folder-011.png"></td> |
| 38 | + <td>Folder contains only modified files and files older than the other side</td> |
| 39 | + </tr> |
| 40 | + <tr> |
| 41 | + <td><img class="folder-legend" src="{{ site.prefixDir }}img/screenshots/folder/view/folders/folder-100.png"></td> |
| 42 | + <td>Folder contains only files not present on the other side (so-called orphan folder)</td> |
| 43 | + </tr> |
| 44 | + <tr> |
| 45 | + <td><img class="folder-legend" src="{{ site.prefixDir }}img/screenshots/folder/view/folders/folder-101.png"></td> |
| 46 | + <td>Folder contains files not present on the other side and files older than the other side</td> |
| 47 | + </tr> |
| 48 | + <tr> |
| 49 | + <td><img class="folder-legend" src="{{ site.prefixDir }}img/screenshots/folder/view/folders/folder-110.png"></td> |
| 50 | + <td>Folder contains modified files and files not present on the other side</td> |
| 51 | + </tr> |
| 52 | + <tr> |
| 53 | + <td><img class="folder-legend" src="{{ site.prefixDir }}img/screenshots/folder/view/folders/folder-999.png"></td> |
| 54 | + <td>Folder matches <a href="fileFilters.html#show_filtered_files">file filters</a> or is empty and the 'Empty folders' setting is on</td> |
| 55 | + </tr> |
| 56 | + </tbody> |
| 57 | + </table> |
| 58 | +</div> |
| 59 | + |
| 60 | +# [File Colors](#file_colors) |
| 61 | + |
| 62 | +Line colors in the File Differ View are based on differences found. |
| 63 | + |
| 64 | +<div class="table-wrapper"> |
| 65 | + <table class="alt"> |
| 66 | + <thead> |
| 67 | + <tr> |
| 68 | + <th>Color</th> |
| 69 | + <th>Description</th> |
| 70 | + </tr> |
| 71 | + </thead> |
| 72 | + <tbody> |
| 73 | + <tr> |
| 74 | + <td class="file-legend-same"></td> |
| 75 | + <td>Text content on left and right is the same</td> |
| 76 | + </tr> |
| 77 | + <tr> |
| 78 | + <td class="file-legend-different"></td> |
| 79 | + <td>Text content present on the left differs from text content present on the right</td> |
| 80 | + </tr> |
| 81 | + <tr> |
| 82 | + <td class="file-legend-missing-left"></td> |
| 83 | + <td>Text content is present only on the right; on the left the line is missing</td> |
| 84 | + </tr> |
| 85 | + <tr> |
| 86 | + <td class="file-legend-missing-right"></td> |
| 87 | + <td>Text content is present only on the left; on the right the line is missing</td> |
| 88 | + </tr> |
| 89 | + <tr> |
| 90 | + <td class="file-legend-merged"></td> |
| 91 | + <td>Text content has been copied from the other side; this marks the document as edited and it can be saved</td> |
| 92 | + </tr> |
| 93 | + </tbody> |
| 94 | + </table> |
| 95 | +</div> |
| 96 | + |
| 97 | +# [Difference Indicator](#difference_indicator) |
| 98 | + |
| 99 | +The narrow strip on the right side of the file diff view gives a bird's-eye view of all differences across the whole file. |
| 100 | + |
| 101 | +{:.wiki-img} |
| 102 | + |
| 103 | +Each colored mark corresponds to a difference section; the colors match those in the diff table. The current scroll position is shown as a highlighted band. Click anywhere on the indicator to jump directly to that part of the file. |
0 commit comments