diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-10-17 07:48:48 -0400 |
|---|---|---|
| committer | Nur Rony <pro.nmrony@gmail.com> | 2016-11-04 18:04:26 +0600 |
| commit | 3c4a7f915dfece1ea15185b9f2a1ea5c54e7643f (patch) | |
| tree | 44bb7b1f7d2348a1a47a8b01bc03c5c39832236a | |
| parent | 69bff037be19b0b426306959dfd9835021886ab8 (diff) | |
| download | gitlab-ce-fixed-width-caret.tar.gz | |
Add width to caret to rid ourselves of the shiftfixed-width-caret
Add CHANGELOG
uses fa-fw from font awesome instead of using declaring fix width explicitly
moves changelog entry under 8.14
rebased with master
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | app/views/projects/diffs/_file_header.html.haml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 9411cc62003..027e7ea74b8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ entry. - Show correct environment log in admin/logs (@duk3luk3 !7191) - Fix Milestone dropdown not stay selected for `Upcoming` and `No Milestone` option !7117 +- Diff collapse won't shift when collapsing. - Backups do not fail anymore when using tar on annex and custom_hooks only. !5814 - Adds user project membership expired event to clarify why user was removed (Callum Dryden) - Trim leading and trailing whitespace on project_path (Linus Thiel) diff --git a/app/views/projects/diffs/_file_header.html.haml b/app/views/projects/diffs/_file_header.html.haml index 73993f35b39..d3ed8e1bf38 100644 --- a/app/views/projects/diffs/_file_header.html.haml +++ b/app/views/projects/diffs/_file_header.html.haml @@ -1,4 +1,4 @@ -%i.fa.diff-toggle-caret +%i.fa.diff-toggle-caret.fa-fw - if defined?(blob) && blob && diff_file.submodule? %span = icon('archive fw') |