Commit 1a7b8741 authored by Olena Horal-Koretska's avatar Olena Horal-Koretska

Merge branch...

Merge branch '238723-migrate-instances-of-expand-and-compress-icons-to-maximize-and-minimize' into 'master'

Migrate instances of misc icons to 'maximize' and 'minimize'

Closes #238723

See merge request gitlab-org/gitlab!39889
parents ea96e0e3 98207dea
...@@ -254,7 +254,7 @@ export default { ...@@ -254,7 +254,7 @@ export default {
href="#" href="#"
:aria-label="__('Leave zen mode')" :aria-label="__('Leave zen mode')"
> >
<icon :size="16" name="screen-normal" /> <icon :size="16" name="minimize" />
</a> </a>
<markdown-toolbar <markdown-toolbar
:markdown-docs-path="markdownDocsPath" :markdown-docs-path="markdownDocsPath"
......
...@@ -221,7 +221,7 @@ export default { ...@@ -221,7 +221,7 @@ export default {
:title="__('Go full screen')" :title="__('Go full screen')"
type="button" type="button"
> >
<icon name="screen-full" /> <icon name="maximize" />
</button> </button>
</div> </div>
</li> </li>
......
...@@ -16,4 +16,4 @@ ...@@ -16,4 +16,4 @@
- else - else
= text_area_tag attr, current_text, data: { qa_selector: qa_selector }, class: classes, placeholder: placeholder = 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: "#" } %a.zen-control.zen-control-leave.js-zen-leave.gl-text-gray-500{ href: "#" }
= sprite_icon('compress') = sprite_icon('minimize')
...@@ -10,4 +10,4 @@ ...@@ -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") }) = 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 - 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" } } %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")
---
title: Syncronize use of maximize and minimize icons in order to deprecate duplicates
with different names
merge_request: 39889
author:
type: other
...@@ -64,7 +64,7 @@ exports[`Snippet Description Edit component rendering matches the snapshot 1`] = ...@@ -64,7 +64,7 @@ exports[`Snippet Description Edit component rendering matches the snapshot 1`] =
href="#" href="#"
> >
<icon-stub <icon-stub
name="screen-normal" name="minimize"
size="16" size="16"
/> />
</a> </a>
......
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