Resolve "The comparison list for the modified icons"
This commit is contained in:
parent
0db5c67db5
commit
321d3e0483
12 changed files with 17 additions and 17 deletions
|
@ -93,7 +93,7 @@ export default {
|
||||||
<icon
|
<icon
|
||||||
:size="16"
|
:size="16"
|
||||||
class="prepend-left-8 append-right-8"
|
class="prepend-left-8 append-right-8"
|
||||||
name="doc_image"
|
name="doc-image"
|
||||||
aria-hidden="true"
|
aria-hidden="true"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -56,7 +56,7 @@ export default {
|
||||||
>
|
>
|
||||||
<icon
|
<icon
|
||||||
:size="12"
|
:size="12"
|
||||||
name="more"
|
name="ellipsis_h"
|
||||||
/>
|
/>
|
||||||
</button>
|
</button>
|
||||||
<div class="dropdown-menu dropdown-menu-right">
|
<div class="dropdown-menu dropdown-menu-right">
|
||||||
|
|
|
@ -22,8 +22,8 @@
|
||||||
height: 16px;
|
height: 16px;
|
||||||
background-size: cover;
|
background-size: cover;
|
||||||
|
|
||||||
&.gl-snippet-icon-doc_code { background-position: 0 0; }
|
&.gl-snippet-icon-doc-code { background-position: 0 0; }
|
||||||
&.gl-snippet-icon-doc_text { background-position: 0 -16px; }
|
&.gl-snippet-icon-doc-text { background-position: 0 -16px; }
|
||||||
&.gl-snippet-icon-download { background-position: 0 -32px; }
|
&.gl-snippet-icon-download { background-position: 0 -32px; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -116,7 +116,7 @@ module SnippetsHelper
|
||||||
raw_project_snippet_url(@snippet.project, @snippet)
|
raw_project_snippet_url(@snippet.project, @snippet)
|
||||||
end
|
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
|
end
|
||||||
|
|
||||||
def embedded_snippet_download_button
|
def embedded_snippet_download_button
|
||||||
|
|
|
@ -67,5 +67,5 @@
|
||||||
|
|
||||||
%button.navbar-toggler.d-block.d-sm-none{ type: 'button' }
|
%button.navbar-toggler.d-block.d-sm-none{ type: 'button' }
|
||||||
%span.sr-only= _("Toggle navigation")
|
%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')
|
= sprite_icon('close', size: 12, css_class: 'close-icon js-navbar-toggle-left')
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
= nav_link(path: ['groups#show', 'groups#activity', 'groups#subgroups', 'analytics#show'], html_options: { class: 'home' }) do
|
= nav_link(path: ['groups#show', 'groups#activity', 'groups#subgroups', 'analytics#show'], html_options: { class: 'home' }) do
|
||||||
= link_to group_path(@group) do
|
= link_to group_path(@group) do
|
||||||
.nav-icon-container
|
.nav-icon-container
|
||||||
= sprite_icon('project')
|
= sprite_icon('home')
|
||||||
%span.nav-item-name
|
%span.nav-item-name
|
||||||
= _('Overview')
|
= _('Overview')
|
||||||
|
|
||||||
|
|
|
@ -110,7 +110,7 @@
|
||||||
= nav_link(controller: :gpg_keys) do
|
= nav_link(controller: :gpg_keys) do
|
||||||
= link_to profile_gpg_keys_path do
|
= link_to profile_gpg_keys_path do
|
||||||
.nav-icon-container
|
.nav-icon-container
|
||||||
= sprite_icon('key-2')
|
= sprite_icon('key-modern')
|
||||||
%span.nav-item-name
|
%span.nav-item-name
|
||||||
= _('GPG Keys')
|
= _('GPG Keys')
|
||||||
%ul.sidebar-sub-level-items.is-fly-out-only
|
%ul.sidebar-sub-level-items.is-fly-out-only
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
= nav_link(path: sidebar_projects_paths, html_options: { class: 'home' }) do
|
= nav_link(path: sidebar_projects_paths, html_options: { class: 'home' }) do
|
||||||
= link_to project_path(@project), class: 'shortcuts-project' do
|
= link_to project_path(@project), class: 'shortcuts-project' do
|
||||||
.nav-icon-container
|
.nav-icon-container
|
||||||
= sprite_icon('project')
|
= sprite_icon('home')
|
||||||
%span.nav-item-name
|
%span.nav-item-name
|
||||||
= _('Project')
|
= _('Project')
|
||||||
|
|
||||||
|
@ -40,7 +40,7 @@
|
||||||
= nav_link(controller: sidebar_repository_paths) do
|
= nav_link(controller: sidebar_repository_paths) do
|
||||||
= link_to project_tree_path(@project), class: 'shortcuts-tree' do
|
= link_to project_tree_path(@project), class: 'shortcuts-tree' do
|
||||||
.nav-icon-container
|
.nav-icon-container
|
||||||
= sprite_icon('doc_text')
|
= sprite_icon('doc-text')
|
||||||
%span.nav-item-name
|
%span.nav-item-name
|
||||||
= _('Repository')
|
= _('Repository')
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
.gitlab-embed-snippets
|
.gitlab-embed-snippets
|
||||||
.js-file-title.file-title-flex-parent
|
.js-file-title.file-title-flex-parent
|
||||||
.file-header-content
|
.file-header-content
|
||||||
= external_snippet_icon('doc_text')
|
= external_snippet_icon('doc-text')
|
||||||
|
|
||||||
%strong.file-title-name
|
%strong.file-title-name
|
||||||
%a.gitlab-embedded-snippets-title{ href: url_for(only_path: false, overwrite_params: nil) }
|
%a.gitlab-embedded-snippets-title{ href: url_for(only_path: false, overwrite_params: nil) }
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
"webpack-prod": "NODE_ENV=production webpack --config config/webpack.config.js"
|
"webpack-prod": "NODE_ENV=production webpack --config config/webpack.config.js"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@gitlab-org/gitlab-svgs": "^1.26.0",
|
"@gitlab-org/gitlab-svgs": "^1.27.0",
|
||||||
"@gitlab-org/gitlab-ui": "1.0.5",
|
"@gitlab-org/gitlab-ui": "1.0.5",
|
||||||
"autosize": "^4.0.0",
|
"autosize": "^4.0.0",
|
||||||
"axios": "^0.17.1",
|
"axios": "^0.17.1",
|
||||||
|
|
|
@ -7,13 +7,13 @@ describe SnippetsHelper do
|
||||||
it 'gives view raw button of embedded snippets for project snippets' do
|
it 'gives view raw button of embedded snippets for project snippets' do
|
||||||
@snippet = create(:project_snippet, :public)
|
@snippet = create(:project_snippet, :public)
|
||||||
|
|
||||||
expect(embedded_snippet_raw_button.to_s).to eq("<a class=\"btn\" target=\"_blank\" rel=\"noopener noreferrer\" title=\"Open raw\" href=\"#{raw_project_snippet_url(@snippet.project, @snippet)}\">#{external_snippet_icon('doc_code')}</a>")
|
expect(embedded_snippet_raw_button.to_s).to eq("<a class=\"btn\" target=\"_blank\" rel=\"noopener noreferrer\" title=\"Open raw\" href=\"#{raw_project_snippet_url(@snippet.project, @snippet)}\">#{external_snippet_icon('doc-code')}</a>")
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'gives view raw button of embedded snippets for personal snippets' do
|
it 'gives view raw button of embedded snippets for personal snippets' do
|
||||||
@snippet = create(:personal_snippet, :public)
|
@snippet = create(:personal_snippet, :public)
|
||||||
|
|
||||||
expect(embedded_snippet_raw_button.to_s).to eq("<a class=\"btn\" target=\"_blank\" rel=\"noopener noreferrer\" title=\"Open raw\" href=\"#{raw_snippet_url(@snippet)}\">#{external_snippet_icon('doc_code')}</a>")
|
expect(embedded_snippet_raw_button.to_s).to eq("<a class=\"btn\" target=\"_blank\" rel=\"noopener noreferrer\" title=\"Open raw\" href=\"#{raw_snippet_url(@snippet)}\">#{external_snippet_icon('doc-code')}</a>")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -78,9 +78,9 @@
|
||||||
lodash "^4.2.0"
|
lodash "^4.2.0"
|
||||||
to-fast-properties "^2.0.0"
|
to-fast-properties "^2.0.0"
|
||||||
|
|
||||||
"@gitlab-org/gitlab-svgs@^1.23.0", "@gitlab-org/gitlab-svgs@^1.26.0":
|
"@gitlab-org/gitlab-svgs@^1.23.0", "@gitlab-org/gitlab-svgs@^1.27.0":
|
||||||
version "1.26.0"
|
version "1.27.0"
|
||||||
resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-svgs/-/gitlab-svgs-1.26.0.tgz#d89c633e866d031a9e4787b05eacc7144c3a7791"
|
resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-svgs/-/gitlab-svgs-1.27.0.tgz#638e70399ebd59e503732177316bb9a18bf7a13f"
|
||||||
|
|
||||||
"@gitlab-org/gitlab-ui@1.0.5":
|
"@gitlab-org/gitlab-ui@1.0.5":
|
||||||
version "1.0.5"
|
version "1.0.5"
|
||||||
|
|
Loading…
Reference in a new issue