diff --git a/rhodecode/public/css/code-block.less b/rhodecode/public/css/code-block.less --- a/rhodecode/public/css/code-block.less +++ b/rhodecode/public/css/code-block.less @@ -665,8 +665,9 @@ input.filediff-collapse-state { width: 0; height: 0; border-style: solid; - border-width: 6.5px 0 6.5px 11.3px; - border-color: transparent transparent transparent #ccc; + border-width: 4.5px 0 4.5px 9.3px; + border-color: transparent transparent transparent #aaa; + margin: 6px 0px; } .filediff-menu { display: none; @@ -679,8 +680,10 @@ input.filediff-collapse-state { width: 0; height: 0; border-style: solid; - border-width: 11.3px 6.5px 0 6.5px; - border-color: #ccc transparent transparent transparent; + border-width: 9.3px 4.5px 0 4.5px; + border-color: #aaa transparent transparent transparent; + margin: 6px 0px; + } .filediff-menu { display: block; diff --git a/rhodecode/templates/codeblocks/diffs.mako b/rhodecode/templates/codeblocks/diffs.mako --- a/rhodecode/templates/codeblocks/diffs.mako +++ b/rhodecode/templates/codeblocks/diffs.mako @@ -326,22 +326,28 @@ from rhodecode.lib.diffs import NEW_FILE ## file was renamed, or copied %if RENAMED_FILENODE in filediff.patch['stats']['ops']: ${filediff.target_file_path}${filediff.source_file_path} + <% final_path = filediff.target_file_path %> %elif COPIED_FILENODE in filediff.patch['stats']['ops']: ${filediff.target_file_path} ⬅ ${filediff.source_file_path} + <% final_path = filediff.target_file_path %> %endif %else: ## file was modified ${filediff.source_file_path} + <% final_path = filediff.source_file_path %> %endif %else: %if filediff.source_file_path: ## file was deleted ${filediff.source_file_path} + <% final_path = filediff.source_file_path %> %else: ## file was added ${filediff.target_file_path} + <% final_path = filediff.target_file_path %> %endif %endif + %if filediff.limited_diff: