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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
7d09b69a
Commit
7d09b69a
authored
Sep 09, 2019
by
Jarek Ostrowski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Give notification buttons btn-xs class
Add changelog
parent
383f3635
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
3 deletions
+8
-3
app/views/projects/buttons/_fork.html.haml
app/views/projects/buttons/_fork.html.haml
+1
-1
app/views/shared/notifications/_button.html.haml
app/views/shared/notifications/_button.html.haml
+2
-2
changelogs/unreleased/60724-watch-button.yml
changelogs/unreleased/60724-watch-button.yml
+5
-0
No files found.
app/views/projects/buttons/_fork.html.haml
View file @
7d09b69a
...
...
@@ -8,7 +8,7 @@
-
else
-
can_create_fork
=
current_user
.
can?
(
:create_fork
)
=
link_to
new_project_fork_path
(
@project
),
class:
"btn btn-default has-tooltip count-badge-button d-flex align-items-center fork-btn
#{
'has-tooltip disabled'
unless
can_create_fork
}
"
,
class:
"btn btn-default
btn-xs
has-tooltip count-badge-button d-flex align-items-center fork-btn
#{
'has-tooltip disabled'
unless
can_create_fork
}
"
,
title:
(
s_
(
'ProjectOverview|You have reached your project limit'
)
unless
can_create_fork
)
do
=
sprite_icon
(
'fork'
,
{
css_class:
'icon'
})
%span
=
s_
(
'ProjectOverview|Fork'
)
...
...
app/views/shared/notifications/_button.html.haml
View file @
7d09b69a
...
...
@@ -17,14 +17,14 @@
.js-notification-toggle-btns
%div
{
class:
(
"btn-group"
if
notification_setting
.
custom?
)
}
-
if
notification_setting
.
custom?
%button
.dropdown-new.btn.btn-default.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-xs.
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'
}
}
=
icon
(
"bell"
,
class:
"js-notification-loading"
)
=
notification_title
(
notification_setting
.
level
)
%button
.btn.dropdown-toggle
{
data:
{
toggle:
"dropdown"
,
target:
notifications_menu_identifier
(
"dropdown"
,
notification_setting
),
flip:
"false"
}
}
=
icon
(
'caret-down'
)
.sr-only
Toggle dropdown
-
else
%button
.dropdown-new.btn.btn-default.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-xs.
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"
}
}
.float-left
=
icon
(
"bell"
,
class:
"js-notification-loading"
)
=
notification_title
(
notification_setting
.
level
)
...
...
changelogs/unreleased/60724-watch-button.yml
0 → 100644
View file @
7d09b69a
---
title
:
Fix watch button styling and notifications buttons consistency
merge_request
:
32827
author
:
type
:
fixed
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