Commit 91479fec authored by Tim Zallmann's avatar Tim Zallmann

Merge branch 'rk/update-icons' into 'master'

Replacing Font-Awesome Icons on Wiki Pages

Closes #225894

See merge request gitlab-org/gitlab!35975
parents ca80ec6a e7f8a04a
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
- git_access_url = wiki_path(@wiki, action: :git_access) - git_access_url = wiki_path(@wiki, action: :git_access)
= link_to git_access_url, class: active_nav_link?(path: 'wikis#git_access') ? 'active' : '', data: { qa_selector: 'clone_repository_link' } do = link_to git_access_url, class: active_nav_link?(path: 'wikis#git_access') ? 'active' : '', data: { qa_selector: 'clone_repository_link' } do
= icon('cloud-download', class: 'append-right-5') = sprite_icon('download', size: 16, css_class: 'append-right-5')
%span= _("Clone repository") %span= _("Clone repository")
.blocks-container .blocks-container
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
.nav-controls.pb-md-3.pb-lg-0 .nav-controls.pb-md-3.pb-lg-0
= link_to wiki_path(@wiki, action: :git_access), class: 'btn' do = link_to wiki_path(@wiki, action: :git_access), class: 'btn' do
= icon('cloud-download') = sprite_icon('download')
= _("Clone repository") = _("Clone repository")
.dropdown.inline.wiki-sort-dropdown .dropdown.inline.wiki-sort-dropdown
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
.btn-group{ role: 'group' } .btn-group{ role: 'group' }
%button.dropdown-toggle{ type: 'button', data: { toggle: 'dropdown', display: 'static' }, class: 'btn btn-default' } %button.dropdown-toggle{ type: 'button', data: { toggle: 'dropdown', display: 'static' }, class: 'btn btn-default' }
= sort_title = sort_title
= icon('chevron-down') = sprite_icon('chevron-down')
%ul.dropdown-menu.dropdown-menu-right.dropdown-menu-selectable.dropdown-menu-sort %ul.dropdown-menu.dropdown-menu-right.dropdown-menu-selectable.dropdown-menu-sort
%li %li
= sortable_item(s_("Wiki|Title"), wiki_path(@wiki, action: :pages, sort: Wiki::TITLE_ORDER), sort_title) = sortable_item(s_("Wiki|Title"), wiki_path(@wiki, action: :pages, sort: Wiki::TITLE_ORDER), sort_title)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment