Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
98207dea
Commit
98207dea
authored
Aug 19, 2020
by
jeldergl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Migrating icon references to the latest naming
parent
6b6b2324
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
11 additions
and
5 deletions
+11
-5
app/assets/javascripts/vue_shared/components/markdown/field.vue
...sets/javascripts/vue_shared/components/markdown/field.vue
+1
-1
app/assets/javascripts/vue_shared/components/markdown/header.vue
...ets/javascripts/vue_shared/components/markdown/header.vue
+1
-1
app/views/shared/_zen.html.haml
app/views/shared/_zen.html.haml
+1
-1
app/views/shared/blob/_markdown_buttons.html.haml
app/views/shared/blob/_markdown_buttons.html.haml
+1
-1
changelogs/unreleased/238723-migrate-instances-of-expand-and-compress-icons-to-maximize-and-min.yml
...nces-of-expand-and-compress-icons-to-maximize-and-min.yml
+6
-0
spec/frontend/snippets/components/__snapshots__/snippet_description_edit_spec.js.snap
...nents/__snapshots__/snippet_description_edit_spec.js.snap
+1
-1
No files found.
app/assets/javascripts/vue_shared/components/markdown/field.vue
View file @
98207dea
...
...
@@ -254,7 +254,7 @@ export default {
href=
"#"
:aria-label=
"__('Leave zen mode')"
>
<icon
:size=
"16"
name=
"
screen-normal
"
/>
<icon
:size=
"16"
name=
"
minimize
"
/>
</a>
<markdown-toolbar
:markdown-docs-path=
"markdownDocsPath"
...
...
app/assets/javascripts/vue_shared/components/markdown/header.vue
View file @
98207dea
...
...
@@ -221,7 +221,7 @@ export default {
:title=
"__('Go full screen')"
type=
"button"
>
<icon
name=
"
screen-full
"
/>
<icon
name=
"
maximize
"
/>
</button>
</div>
</li>
...
...
app/views/shared/_zen.html.haml
View file @
98207dea
...
...
@@ -16,4 +16,4 @@
-
else
=
text_area_tag
attr
,
current_text
,
data:
{
qa_selector:
qa_selector
},
class:
classes
,
placeholder:
placeholder
%a
.zen-control.zen-control-leave.js-zen-leave.gl-text-gray-500
{
href:
"#"
}
=
sprite_icon
(
'
compress
'
)
=
sprite_icon
(
'
minimize
'
)
app/views/shared/blob/_markdown_buttons.html.haml
View file @
98207dea
...
...
@@ -10,4 +10,4 @@
=
markdown_toolbar_button
({
icon:
"table"
,
data:
{
"md-tag"
=>
"| header | header |
\n
| ------ | ------ |
\n
| cell | cell |
\n
| cell | cell |"
,
"md-prepend"
=>
true
},
title:
_
(
"Add a table"
)
})
-
if
show_fullscreen_button
%button
.toolbar-btn.toolbar-fullscreen-btn.js-zen-enter.has-tooltip
{
type:
"button"
,
tabindex:
-
1
,
"aria-label"
:
"Go full screen"
,
title:
_
(
"Go full screen"
),
data:
{
container:
"body"
}
}
=
sprite_icon
(
"
screen-full
"
)
=
sprite_icon
(
"
maximize
"
)
changelogs/unreleased/238723-migrate-instances-of-expand-and-compress-icons-to-maximize-and-min.yml
0 → 100644
View file @
98207dea
---
title
:
Syncronize use of maximize and minimize icons in order to deprecate duplicates
with different names
merge_request
:
39889
author
:
type
:
other
spec/frontend/snippets/components/__snapshots__/snippet_description_edit_spec.js.snap
View file @
98207dea
...
...
@@ -64,7 +64,7 @@ exports[`Snippet Description Edit component rendering matches the snapshot 1`] =
href="#"
>
<icon-stub
name="
screen-normal
"
name="
minimize
"
size="16"
/>
</a>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment