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
dfea2ce8
Commit
dfea2ce8
authored
Dec 07, 2020
by
Alexander Turinske
Committed by
Phil Hughes
Dec 07, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Convert bootstrap carets to svg chevrons
- snippet comments - notification settings - web hook test
parent
7db0da5a
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
13 additions
and
9 deletions
+13
-9
app/assets/stylesheets/framework/dropdowns.scss
app/assets/stylesheets/framework/dropdowns.scss
+2
-1
app/assets/stylesheets/pages/notifications.scss
app/assets/stylesheets/pages/notifications.scss
+0
-2
app/views/profiles/notifications/_group_settings.html.haml
app/views/profiles/notifications/_group_settings.html.haml
+1
-1
app/views/shared/notes/_comment_button.html.haml
app/views/shared/notes/_comment_button.html.haml
+1
-1
app/views/shared/notifications/_button.html.haml
app/views/shared/notifications/_button.html.haml
+3
-3
app/views/shared/web_hooks/_test_button.html.haml
app/views/shared/web_hooks/_test_button.html.haml
+1
-1
changelogs/unreleased/225957-convert-to-svg-caret-down-comments.yml
.../unreleased/225957-convert-to-svg-caret-down-comments.yml
+5
-0
No files found.
app/assets/stylesheets/framework/dropdowns.scss
View file @
dfea2ce8
...
@@ -341,7 +341,8 @@
...
@@ -341,7 +341,8 @@
}
}
.droplab-dropdown
{
.droplab-dropdown
{
.dropdown-toggle
>
i
{
.dropdown-toggle
>
i
,
.dropdown-toggle
>
svg
{
pointer-events
:
none
;
pointer-events
:
none
;
}
}
...
...
app/assets/stylesheets/pages/notifications.scss
View file @
dfea2ce8
.notification-list-item
{
.notification-list-item
{
line-height
:
34px
;
.dropdown-menu
{
.dropdown-menu
{
@extend
.dropdown-menu-right
;
@extend
.dropdown-menu-right
;
}
}
...
...
app/views/profiles/notifications/_group_settings.html.haml
View file @
dfea2ce8
...
@@ -12,5 +12,5 @@
...
@@ -12,5 +12,5 @@
=
render
'shared/notifications/button'
,
notification_setting:
setting
,
emails_disabled:
emails_disabled
=
render
'shared/notifications/button'
,
notification_setting:
setting
,
emails_disabled:
emails_disabled
.table-section.section-30
.table-section.section-30
=
form_for
setting
,
url:
profile_notifications_group_path
(
group
),
method: :put
,
html:
{
class:
'update-notifications'
}
do
|
f
|
=
form_for
setting
,
url:
profile_notifications_group_path
(
group
),
method: :put
,
html:
{
class:
'update-notifications
gl-display-flex
'
}
do
|
f
|
=
f
.
select
:notification_email
,
@user
.
public_verified_emails
,
{
include_blank:
'Global notification email'
},
class:
'select2 js-group-notification-email'
=
f
.
select
:notification_email
,
@user
.
public_verified_emails
,
{
include_blank:
'Global notification email'
},
class:
'select2 js-group-notification-email'
app/views/shared/notes/_comment_button.html.haml
View file @
dfea2ce8
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
-
if
@note
.
can_be_discussion_note?
-
if
@note
.
can_be_discussion_note?
=
button_tag
type:
'button'
,
class:
'btn btn-nr dropdown-toggle btn-success js-note-new-discussion js-disable-on-submit'
,
data:
{
'dropdown-trigger'
=>
'#resolvable-comment-menu'
},
'aria-label'
=>
_
(
'Open comment type dropdown'
)
do
=
button_tag
type:
'button'
,
class:
'btn btn-nr dropdown-toggle btn-success js-note-new-discussion js-disable-on-submit'
,
data:
{
'dropdown-trigger'
=>
'#resolvable-comment-menu'
},
'aria-label'
=>
_
(
'Open comment type dropdown'
)
do
=
icon
(
'caret-down'
,
class:
'toggle-ico
n'
)
=
sprite_icon
(
'chevron-dow
n'
)
%ul
#resolvable-comment-menu
.dropdown-menu.dropdown-open-top
{
data:
{
dropdown:
true
}
}
%ul
#resolvable-comment-menu
.dropdown-menu.dropdown-open-top
{
data:
{
dropdown:
true
}
}
%li
#comment
.droplab-item-selected
{
data:
{
value:
''
,
'submit-text'
=>
_
(
'Comment'
),
'close-text'
=>
_
(
"Comment & close %{noteable_name}"
)
%
{
noteable_name:
noteable_name
},
'reopen-text'
=>
_
(
"Comment & reopen %{noteable_name}"
)
%
{
noteable_name:
noteable_name
}
}
}
%li
#comment
.droplab-item-selected
{
data:
{
value:
''
,
'submit-text'
=>
_
(
'Comment'
),
'close-text'
=>
_
(
"Comment & close %{noteable_name}"
)
%
{
noteable_name:
noteable_name
},
'reopen-text'
=>
_
(
"Comment & reopen %{noteable_name}"
)
%
{
noteable_name:
noteable_name
}
}
}
...
...
app/views/shared/notifications/_button.html.haml
View file @
dfea2ce8
...
@@ -20,8 +20,8 @@
...
@@ -20,8 +20,8 @@
%button
.dropdown-new.btn.btn-default.btn-icon.gl-button.has-tooltip.notifications-btn.text-left
#notifications-button
{
type:
"button"
,
title:
button_title
,
class:
"#{btn_class}"
,
"aria-label"
=>
aria_label
,
data:
{
container:
"body"
,
toggle:
"modal"
,
target:
"#"
+
notifications_menu_identifier
(
"modal"
,
notification_setting
),
display:
'static'
}
}
%button
.dropdown-new.btn.btn-default.btn-icon.gl-button.has-tooltip.notifications-btn.text-left
#notifications-button
{
type:
"button"
,
title:
button_title
,
class:
"#{btn_class}"
,
"aria-label"
=>
aria_label
,
data:
{
container:
"body"
,
toggle:
"modal"
,
target:
"#"
+
notifications_menu_identifier
(
"modal"
,
notification_setting
),
display:
'static'
}
}
=
sprite_icon
(
"notifications"
,
css_class:
"js-notification-loading"
)
=
sprite_icon
(
"notifications"
,
css_class:
"js-notification-loading"
)
=
notification_title
(
notification_setting
.
level
)
=
notification_title
(
notification_setting
.
level
)
%button
.btn.dropdown-toggle.
d-flex
{
data:
{
toggle:
"dropdown"
,
target:
notifications_menu_identifier
(
"dropdown"
,
notification_setting
),
flip:
"false"
}
}
%button
.btn.dropdown-toggle.
gl-display-flex.gl-align-items-center
{
data:
{
toggle:
"dropdown"
,
target:
notifications_menu_identifier
(
"dropdown"
,
notification_setting
),
flip:
"false"
}
}
=
icon
(
'caret
-down'
)
=
sprite_icon
(
'chevron
-down'
)
.sr-only
Toggle dropdown
.sr-only
Toggle dropdown
-
else
-
else
%button
.dropdown-new.btn.btn-default.btn-icon.gl-button.has-tooltip.notifications-btn
#notifications-button
{
type:
"button"
,
title:
button_title
,
class:
"#{btn_class}"
,
"aria-label"
=>
aria_label
,
data:
{
container:
"body"
,
toggle:
"dropdown"
,
target:
notifications_menu_identifier
(
"dropdown"
,
notification_setting
),
flip:
"false"
}
}
%button
.dropdown-new.btn.btn-default.btn-icon.gl-button.has-tooltip.notifications-btn
#notifications-button
{
type:
"button"
,
title:
button_title
,
class:
"#{btn_class}"
,
"aria-label"
=>
aria_label
,
data:
{
container:
"body"
,
toggle:
"dropdown"
,
target:
notifications_menu_identifier
(
"dropdown"
,
notification_setting
),
flip:
"false"
}
}
...
@@ -29,7 +29,7 @@
...
@@ -29,7 +29,7 @@
=
sprite_icon
(
"notifications"
,
css_class:
"js-notification-loading"
)
=
sprite_icon
(
"notifications"
,
css_class:
"js-notification-loading"
)
=
notification_title
(
notification_setting
.
level
)
=
notification_title
(
notification_setting
.
level
)
.float-right
.float-right
=
icon
(
"caret
-down"
)
=
sprite_icon
(
"chevron
-down"
)
=
render
"shared/notifications/notification_dropdown"
,
notification_setting:
notification_setting
=
render
"shared/notifications/notification_dropdown"
,
notification_setting:
notification_setting
...
...
app/views/shared/web_hooks/_test_button.html.haml
View file @
dfea2ce8
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
.hook-test-button.dropdown.inline
>
.hook-test-button.dropdown.inline
>
%button
.btn
{
'data-toggle'
=>
'dropdown'
,
class:
button_class
}
%button
.btn
{
'data-toggle'
=>
'dropdown'
,
class:
button_class
}
=
_
(
'Test'
)
=
_
(
'Test'
)
=
icon
(
'caret
-down'
)
=
sprite_icon
(
'chevron
-down'
)
%ul
.dropdown-menu.dropdown-menu-right
{
role:
'menu'
}
%ul
.dropdown-menu.dropdown-menu-right
{
role:
'menu'
}
-
triggers
.
each_value
do
|
event
|
-
triggers
.
each_value
do
|
event
|
%li
%li
...
...
changelogs/unreleased/225957-convert-to-svg-caret-down-comments.yml
0 → 100644
View file @
dfea2ce8
---
title
:
Convert bootstrap carets to svg chevrons
merge_request
:
48492
author
:
type
:
other
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