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
9570325f
Commit
9570325f
authored
Jun 08, 2020
by
Tim Zallmann
Committed by
Mark Florian
Jun 08, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updates the calendar, ellipsis and compress icon to SVG
Update Compress Icon to size 48
parent
9de9a747
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
11 deletions
+11
-11
app/assets/javascripts/vue_shared/components/markdown/field.vue
...sets/javascripts/vue_shared/components/markdown/field.vue
+3
-3
app/views/layouts/nav/breadcrumbs/_collapsed_dropdown.html.haml
...ews/layouts/nav/breadcrumbs/_collapsed_dropdown.html.haml
+1
-1
app/views/projects/_zen.html.haml
app/views/projects/_zen.html.haml
+2
-2
ee/app/views/groups/contribution_analytics/show.html.haml
ee/app/views/groups/contribution_analytics/show.html.haml
+2
-2
locale/gitlab.pot
locale/gitlab.pot
+3
-3
No files found.
app/assets/javascripts/vue_shared/components/markdown/field.vue
View file @
9570325f
...
@@ -245,11 +245,11 @@ export default {
...
@@ -245,11 +245,11 @@ export default {
<div
class=
"zen-backdrop"
>
<div
class=
"zen-backdrop"
>
<slot
name=
"textarea"
></slot>
<slot
name=
"textarea"
></slot>
<a
<a
class=
"zen-control zen-control-leave js-zen-leave"
class=
"zen-control zen-control-leave js-zen-leave
gl-text-gray-700
"
href=
"#"
href=
"#"
:aria-label=
"__('
Enter
zen mode')"
:aria-label=
"__('
Leave
zen mode')"
>
>
<icon
:size=
"
32
"
name=
"screen-normal"
/>
<icon
:size=
"
16
"
name=
"screen-normal"
/>
</a>
</a>
<markdown-toolbar
<markdown-toolbar
:markdown-docs-path=
"markdownDocsPath"
:markdown-docs-path=
"markdownDocsPath"
...
...
app/views/layouts/nav/breadcrumbs/_collapsed_dropdown.html.haml
View file @
9570325f
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
-
if
defined?
(
@breadcrumb_dropdown_links
)
&&
@breadcrumb_dropdown_links
.
key?
(
dropdown_location
)
-
if
defined?
(
@breadcrumb_dropdown_links
)
&&
@breadcrumb_dropdown_links
.
key?
(
dropdown_location
)
%li
.dropdown
%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
}
%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"
)
=
sprite_icon
(
"angle-right"
,
size:
8
,
css_class:
"breadcrumbs-list-angle"
)
.dropdown-menu
.dropdown-menu
%ul
%ul
...
...
app/views/projects/_zen.html.haml
View file @
9570325f
...
@@ -15,5 +15,5 @@
...
@@ -15,5 +15,5 @@
qa_selector:
qa_selector
}
qa_selector:
qa_selector
}
-
else
-
else
=
text_area_tag
attr
,
current_text
,
class:
classes
,
placeholder:
placeholder
=
text_area_tag
attr
,
current_text
,
class:
classes
,
placeholder:
placeholder
%a
.zen-control.zen-control-leave.js-zen-leave
{
href:
"#"
}
%a
.zen-control.zen-control-leave.js-zen-leave
.gl-text-gray-700
{
href:
"#"
}
=
icon
(
'compress'
)
=
sprite_icon
(
'compress'
,
size:
16
)
ee/app/views/groups/contribution_analytics/show.html.haml
View file @
9570325f
...
@@ -8,8 +8,8 @@
...
@@ -8,8 +8,8 @@
.sub-header-block
.sub-header-block
.float-right
.float-right
.dropdown.inline
.dropdown.inline
%button
.dropdown-toggle.btn
{
type:
'button'
,
'data-toggle'
=>
'dropdown'
}
%button
.dropdown-toggle.btn
.gl-text-gray-700
{
type:
'button'
,
'data-toggle'
=>
'dropdown'
}
=
icon
(
'calendar-o
'
)
=
sprite_icon
(
'calendar
'
)
%b
.caret
%b
.caret
%ul
.dropdown-menu.dropdown-menu-right
%ul
.dropdown-menu.dropdown-menu-right
%li
%li
...
...
locale/gitlab.pot
View file @
9570325f
...
@@ -8407,9 +8407,6 @@ msgstr ""
...
@@ -8407,9 +8407,6 @@ msgstr ""
msgid "Enter your password to approve"
msgid "Enter your password to approve"
msgstr ""
msgstr ""
msgid "Enter zen mode"
msgstr ""
msgid "Environment"
msgid "Environment"
msgstr ""
msgstr ""
...
@@ -12876,6 +12873,9 @@ msgstr ""
...
@@ -12876,6 +12873,9 @@ msgstr ""
msgid "Leave the \"File type\" and \"Delivery method\" options on their default values."
msgid "Leave the \"File type\" and \"Delivery method\" options on their default values."
msgstr ""
msgstr ""
msgid "Leave zen mode"
msgstr ""
msgid "Let's Encrypt does not accept emails on example.com"
msgid "Let's Encrypt does not accept emails on example.com"
msgstr ""
msgstr ""
...
...
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