diff --git a/static/css/clif.css b/static/css/clif.css index c716ca0..2833fba 100644 --- a/static/css/clif.css +++ b/static/css/clif.css @@ -349,6 +349,7 @@ div.commit { div.commit details.diffstat table .histogram { max-width: 20%; + min-width: 10%; } div.commit details.diffstat table .histogram span { @@ -377,28 +378,29 @@ div.commit { color: darkred; } + div.commit details.diff_options { + margin-bottom: 2rem; + } + div.commit details.diff_options input[type=submit] { margin-top: .5rem; } div.commit .raw_diff { - margin-top: 1rem; white-space: pre-wrap; } div.commit details.diff_view { - border: 1px solid black; - border: 1px solid #d4d4d4; - box-shadow: 0 .5rem 1rem -.5rem #ccc; - margin-top: 1rem; position: relative; } + div.commit details.diff_view[open] summary { + border-bottom: 1px solid #d0d0d0; + } + div.commit details.diff_view summary { - background-color: #f7f7f7; - border-bottom: 1px solid #d4d4d4; list-style: none; - padding: .2rem; + padding: .5rem; } div.commit details.diff_view summary:after { @@ -467,6 +469,11 @@ div.commit { div.commit details.diff_view .diff .ssdiff .content { width: 50%; } + + div.commit hr { + border:1px dashed black; + margin: 2rem 0; + } /* Alternate background color used when displaying table data */ .striped > *:nth-child(even) { diff --git a/templates/repository/commit.html b/templates/repository/commit.html index 4d15658..3e8224e 100644 --- a/templates/repository/commit.html +++ b/templates/repository/commit.html @@ -27,10 +27,10 @@ - Commit ID + Commit - {{ commit.id }} + {{ commit.id }} @@ -180,46 +180,51 @@ {% if patch.delta.status == 1 %} - A {{ patch.delta.new_file.path }} + A   {{ patch.delta.new_file.path }} {% endif %} {% if patch.delta.status == 2 %} - D {{ patch.delta.old_file.path }} + D   {{ patch.delta.old_file.path }} {% endif %} {% if patch.delta.status == 3 %} - M {{ patch.delta.new_file.path }} + M   {{ patch.delta.new_file.path }} {% endif %} {% if patch.delta.status == 4 %} - R {{ patch.delta.old_file.path }} -> {{ patch.delta.new_file.path }} + R   {{ patch.delta.old_file.path }} -> {{ patch.delta.new_file.path }} {% endif %} {% if patch.delta.status == 5 %} - C {{ patch.delta.old_file.path }} {{ patch.delta.new_file.path }} + C   {{ patch.delta.old_file.path }} {{ patch.delta.new_file.path }} {% endif %} - - - - - - + + + + + + + + +
- old size: {{ patch.delta.old_file.size|human_size(B=true) }} - - - new size: {{ patch.delta.new_file.size|human_size(B=true) }} -
- {% if patch.delta.status == 1 %} - new file mode: {{ patch.delta.new_file.mode|filemode }} - {% elif patch.delta.status == 2 %} - deleted file mode: {{ patch.delta.old_file.mode|filemode }} - {% elif patch.delta.old_file.mode != patch.delta.new_file.mode %} - old mode: {{ patch.delta.old_file.mode|filemode }} -
- new mode: {{ patch.delta.new_file.mode|filemode }} - {% endif %} -
+ index {{ (patch.delta.old_file.id|string)[:7] }}..{{ (patch.delta.new_file.id|string)[:7] }} +
+ old size: {{ patch.delta.old_file.size|human_size(B=true) }} + - + new size: {{ patch.delta.new_file.size|human_size(B=true) }} +
+ {% if patch.delta.status == 1 %} + new file mode: {{ patch.delta.new_file.mode|filemode }} + {% elif patch.delta.status == 2 %} + deleted file mode: {{ patch.delta.old_file.mode|filemode }} + {% elif patch.delta.old_file.mode != patch.delta.new_file.mode %} + old mode: {{ patch.delta.old_file.mode|filemode }} +
+ new mode: {{ patch.delta.new_file.mode|filemode }} + {% endif %} +
@@ -352,6 +357,8 @@ + +
{% endfor %}