diff options
| author | Kushal Pandya <kushalspandya@gmail.com> | 2018-10-23 11:50:41 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2018-10-23 11:50:41 +0000 |
| commit | b9ad4eccf5cc328cc2205203dae106c3953f644c (patch) | |
| tree | 8fa878165f1e3c8620cc9422775fcf47a5493c01 /app | |
| parent | d16ef87793cffe545c989030c0399786fab9f517 (diff) | |
| download | gitlab-ce-b9ad4eccf5cc328cc2205203dae106c3953f644c.tar.gz | |
Update Todo icons in collapsed sidebar for Issues and MRs
Diffstat (limited to 'app')
| -rw-r--r-- | app/helpers/issuables_helper.rb | 4 | ||||
| -rw-r--r-- | app/views/shared/issuable/_sidebar_todo.html.haml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb index 97406fefd43..6069640b9c8 100644 --- a/app/helpers/issuables_helper.rb +++ b/app/helpers/issuables_helper.rb @@ -386,8 +386,8 @@ module IssuablesHelper { todo_text: "Add todo", mark_text: "Mark todo as done", - todo_icon: (is_collapsed ? icon('plus-square') : nil), - mark_icon: (is_collapsed ? icon('check-square', class: 'todo-undone') : nil), + todo_icon: (is_collapsed ? sprite_icon('todo-add') : nil), + mark_icon: (is_collapsed ? sprite_icon('todo-done', css_class: 'todo-undone') : nil), issuable_id: issuable.id, issuable_type: issuable.class.name.underscore, url: project_todos_path(@project), diff --git a/app/views/shared/issuable/_sidebar_todo.html.haml b/app/views/shared/issuable/_sidebar_todo.html.haml index 583b33a8a1b..660ee6d5777 100644 --- a/app/views/shared/issuable/_sidebar_todo.html.haml +++ b/app/views/shared/issuable/_sidebar_todo.html.haml @@ -1,6 +1,6 @@ - is_collapsed = local_assigns.fetch(:is_collapsed, false) -- mark_content = is_collapsed ? icon('check-square', class: 'todo-undone') : _('Mark todo as done') -- todo_content = is_collapsed ? icon('plus-square') : _('Add todo') +- mark_content = is_collapsed ? sprite_icon('todo-done', css_class: 'todo-undone') : _('Mark todo as done') +- todo_content = is_collapsed ? sprite_icon('todo-add') : _('Add todo') %button.issuable-todo-btn.js-issuable-todo{ type: 'button', class: (is_collapsed ? 'btn-blank sidebar-collapsed-icon dont-change-state has-tooltip' : 'btn btn-default issuable-header-btn float-right'), |