diff options
author | Sam Beckham <sbeckham@gitlab.com> | 2018-07-27 12:27:20 +0300 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-07-27 12:27:20 +0300 |
commit | 321d3e048377fadd01c0655ea84f0f604b0abe9f (patch) | |
tree | 32058e0e91de204d2e70f2377f84bf3acf7c551e /app | |
parent | 0db5c67db5824012feed426612dc65ef267f63de (diff) |
Resolve "The comparison list for the modified icons"
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/badges/components/badge.vue | 2 | ||||
-rw-r--r-- | app/assets/javascripts/ide/components/commit_sidebar/stage_button.vue | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/snippets.scss | 4 | ||||
-rw-r--r-- | app/helpers/snippets_helper.rb | 2 | ||||
-rw-r--r-- | app/views/layouts/header/_default.html.haml | 2 | ||||
-rw-r--r-- | app/views/layouts/nav/sidebar/_group.html.haml | 2 | ||||
-rw-r--r-- | app/views/layouts/nav/sidebar/_profile.html.haml | 2 | ||||
-rw-r--r-- | app/views/layouts/nav/sidebar/_project.html.haml | 4 | ||||
-rw-r--r-- | app/views/shared/snippets/_embed.html.haml | 2 |
9 files changed, 11 insertions, 11 deletions
diff --git a/app/assets/javascripts/badges/components/badge.vue b/app/assets/javascripts/badges/components/badge.vue index b4bfaee1d85..155c348286c 100644 --- a/app/assets/javascripts/badges/components/badge.vue +++ b/app/assets/javascripts/badges/components/badge.vue @@ -93,7 +93,7 @@ export default { <icon :size="16" class="prepend-left-8 append-right-8" - name="doc_image" + name="doc-image" aria-hidden="true" /> </div> diff --git a/app/assets/javascripts/ide/components/commit_sidebar/stage_button.vue b/app/assets/javascripts/ide/components/commit_sidebar/stage_button.vue index 7014b9f605e..e6044401c9f 100644 --- a/app/assets/javascripts/ide/components/commit_sidebar/stage_button.vue +++ b/app/assets/javascripts/ide/components/commit_sidebar/stage_button.vue @@ -56,7 +56,7 @@ export default { > <icon :size="12" - name="more" + name="ellipsis_h" /> </button> <div class="dropdown-menu dropdown-menu-right"> diff --git a/app/assets/stylesheets/snippets.scss b/app/assets/stylesheets/snippets.scss index 64110f9c3a0..bd777c66b56 100644 --- a/app/assets/stylesheets/snippets.scss +++ b/app/assets/stylesheets/snippets.scss @@ -22,8 +22,8 @@ height: 16px; background-size: cover; - &.gl-snippet-icon-doc_code { background-position: 0 0; } - &.gl-snippet-icon-doc_text { background-position: 0 -16px; } + &.gl-snippet-icon-doc-code { background-position: 0 0; } + &.gl-snippet-icon-doc-text { background-position: 0 -16px; } &.gl-snippet-icon-download { background-position: 0 -32px; } } diff --git a/app/helpers/snippets_helper.rb b/app/helpers/snippets_helper.rb index 733832c1bbb..a05640773ad 100644 --- a/app/helpers/snippets_helper.rb +++ b/app/helpers/snippets_helper.rb @@ -116,7 +116,7 @@ module SnippetsHelper raw_project_snippet_url(@snippet.project, @snippet) end - link_to external_snippet_icon('doc_code'), snippet_raw_url, class: 'btn', target: '_blank', rel: 'noopener noreferrer', title: 'Open raw' + link_to external_snippet_icon('doc-code'), snippet_raw_url, class: 'btn', target: '_blank', rel: 'noopener noreferrer', title: 'Open raw' end def embedded_snippet_download_button diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml index 97c04dda8cb..e8d31992149 100644 --- a/app/views/layouts/header/_default.html.haml +++ b/app/views/layouts/header/_default.html.haml @@ -67,5 +67,5 @@ %button.navbar-toggler.d-block.d-sm-none{ type: 'button' } %span.sr-only= _("Toggle navigation") - = sprite_icon('more', size: 12, css_class: 'more-icon js-navbar-toggle-right') + = sprite_icon('ellipsis_h', size: 12, css_class: 'more-icon js-navbar-toggle-right') = sprite_icon('close', size: 12, css_class: 'close-icon js-navbar-toggle-left') diff --git a/app/views/layouts/nav/sidebar/_group.html.haml b/app/views/layouts/nav/sidebar/_group.html.haml index 0a3b5ec7eea..d471dd84550 100644 --- a/app/views/layouts/nav/sidebar/_group.html.haml +++ b/app/views/layouts/nav/sidebar/_group.html.haml @@ -15,7 +15,7 @@ = nav_link(path: ['groups#show', 'groups#activity', 'groups#subgroups', 'analytics#show'], html_options: { class: 'home' }) do = link_to group_path(@group) do .nav-icon-container - = sprite_icon('project') + = sprite_icon('home') %span.nav-item-name = _('Overview') diff --git a/app/views/layouts/nav/sidebar/_profile.html.haml b/app/views/layouts/nav/sidebar/_profile.html.haml index 94863a3460d..d65f153b451 100644 --- a/app/views/layouts/nav/sidebar/_profile.html.haml +++ b/app/views/layouts/nav/sidebar/_profile.html.haml @@ -110,7 +110,7 @@ = nav_link(controller: :gpg_keys) do = link_to profile_gpg_keys_path do .nav-icon-container - = sprite_icon('key-2') + = sprite_icon('key-modern') %span.nav-item-name = _('GPG Keys') %ul.sidebar-sub-level-items.is-fly-out-only diff --git a/app/views/layouts/nav/sidebar/_project.html.haml b/app/views/layouts/nav/sidebar/_project.html.haml index 0ec61df1f0a..2c262a2b7dd 100644 --- a/app/views/layouts/nav/sidebar/_project.html.haml +++ b/app/views/layouts/nav/sidebar/_project.html.haml @@ -11,7 +11,7 @@ = nav_link(path: sidebar_projects_paths, html_options: { class: 'home' }) do = link_to project_path(@project), class: 'shortcuts-project' do .nav-icon-container - = sprite_icon('project') + = sprite_icon('home') %span.nav-item-name = _('Project') @@ -40,7 +40,7 @@ = nav_link(controller: sidebar_repository_paths) do = link_to project_tree_path(@project), class: 'shortcuts-tree' do .nav-icon-container - = sprite_icon('doc_text') + = sprite_icon('doc-text') %span.nav-item-name = _('Repository') diff --git a/app/views/shared/snippets/_embed.html.haml b/app/views/shared/snippets/_embed.html.haml index 36f56fbad1a..c7f0511d1de 100644 --- a/app/views/shared/snippets/_embed.html.haml +++ b/app/views/shared/snippets/_embed.html.haml @@ -2,7 +2,7 @@ .gitlab-embed-snippets .js-file-title.file-title-flex-parent .file-header-content - = external_snippet_icon('doc_text') + = external_snippet_icon('doc-text') %strong.file-title-name %a.gitlab-embedded-snippets-title{ href: url_for(only_path: false, overwrite_params: nil) } |