Commit bad89b24 authored by Mark Florian's avatar Mark Florian

Merge branch 'tz-exchange-icon-calendar' into 'master'

Updates the calendar, ellipsis and compress icon to SVG icons

See merge request gitlab-org/gitlab!33949
parents 6b95281a 9570325f
......@@ -245,11 +245,11 @@ export default {
<div class="zen-backdrop">
<slot name="textarea"></slot>
<a
class="zen-control zen-control-leave js-zen-leave"
class="zen-control zen-control-leave js-zen-leave gl-text-gray-700"
href="#"
:aria-label="__('Enter zen mode')"
:aria-label="__('Leave zen mode')"
>
<icon :size="32" name="screen-normal" />
<icon :size="16" name="screen-normal" />
</a>
<markdown-toolbar
:markdown-docs-path="markdownDocsPath"
......
......@@ -3,7 +3,7 @@
- if defined?(@breadcrumb_dropdown_links) && @breadcrumb_dropdown_links.key?(dropdown_location)
%li.dropdown
%button.text-expander.has-tooltip.js-breadcrumbs-collapsed-expander{ type: "button", data: { toggle: "dropdown", container: "body" }, "aria-label": button_tooltip, title: button_tooltip }
= icon("ellipsis-h")
= sprite_icon("ellipsis_h", size: 12)
= sprite_icon("angle-right", size: 8, css_class: "breadcrumbs-list-angle")
.dropdown-menu
%ul
......
......@@ -15,5 +15,5 @@
qa_selector: qa_selector }
- else
= text_area_tag attr, current_text, class: classes, placeholder: placeholder
%a.zen-control.zen-control-leave.js-zen-leave{ href: "#" }
= icon('compress')
%a.zen-control.zen-control-leave.js-zen-leave.gl-text-gray-700{ href: "#" }
= sprite_icon('compress', size: 16)
......@@ -8,8 +8,8 @@
.sub-header-block
.float-right
.dropdown.inline
%button.dropdown-toggle.btn{ type: 'button', 'data-toggle' => 'dropdown' }
= icon('calendar-o')
%button.dropdown-toggle.btn.gl-text-gray-700{ type: 'button', 'data-toggle' => 'dropdown' }
= sprite_icon('calendar')
%b.caret
%ul.dropdown-menu.dropdown-menu-right
%li
......
......@@ -8417,9 +8417,6 @@ msgstr ""
msgid "Enter your password to approve"
msgstr ""
msgid "Enter zen mode"
msgstr ""
msgid "Environment"
msgstr ""
......@@ -12886,6 +12883,9 @@ msgstr ""
msgid "Leave the \"File type\" and \"Delivery method\" options on their default values."
msgstr ""
msgid "Leave zen mode"
msgstr ""
msgid "Let's Encrypt does not accept emails on example.com"
msgstr ""
......
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