Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
condenser
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
hive
condenser
Commits
7d55f97b
Commit
7d55f97b
authored
2 years ago
by
Dan Notestein
Browse files
Options
Downloads
Plain Diff
Merge branch '193-fix-bug-with-icon-in-activity-log-dialog' into 'develop'
Resolve "Fix bug with icon in Activity log Dialog" Closes
#193
See merge request
!345
parents
c5a4389b
8f74028b
No related branches found
No related tags found
2 merge requests
!348
Develop
,
!345
Resolve "Fix bug with icon in Activity log Dialog"
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/app/assets/icons/bell.svg
+1
-0
1 addition, 0 deletions
src/app/assets/icons/bell.svg
src/app/components/cards/NotificationsList.jsx
+1
-0
1 addition, 0 deletions
src/app/components/cards/NotificationsList.jsx
src/app/components/elements/Icon.jsx
+1
-0
1 addition, 0 deletions
src/app/components/elements/Icon.jsx
with
3 additions
and
0 deletions
src/app/assets/icons/bell.svg
0 → 100644
+
1
−
0
View file @
7d55f97b
<?xml version="1.0" ?><!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
<svg
height=
"512px"
id=
"Layer_1"
style=
"enable-background:new 0 0 512 512;"
version=
"1.1"
viewBox=
"0 0 512 512"
width=
"512px"
xml:space=
"preserve"
xmlns=
"http://www.w3.org/2000/svg"
xmlns:xlink=
"http://www.w3.org/1999/xlink"
><g><path
d=
"M381.7,225.9c0-97.6-52.5-130.8-101.6-138.2c0-0.5,0.1-1,0.1-1.6c0-12.3-10.9-22.1-24.2-22.1c-13.3,0-23.8,9.8-23.8,22.1 c0,0.6,0,1.1,0.1,1.6c-49.2,7.5-102,40.8-102,138.4c0,113.8-28.3,126-66.3,158h384C410.2,352,381.7,339.7,381.7,225.9z"
/><path
d=
"M256.2,448c26.8,0,48.8-19.9,51.7-43H204.5C207.3,428.1,229.4,448,256.2,448z"
/></g></svg>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
src/app/components/cards/NotificationsList.jsx
+
1
−
0
View file @
7d55f97b
...
@@ -25,6 +25,7 @@ const notificationsIcon = (type) => {
...
@@ -25,6 +25,7 @@ const notificationsIcon = (type) => {
error
:
'
cog
'
,
error
:
'
cog
'
,
reblog
:
'
reblog
'
,
reblog
:
'
reblog
'
,
mention
:
'
chatboxes
'
,
mention
:
'
chatboxes
'
,
subscribe
:
'
bell
'
,
};
};
let
icon
=
'
chain
'
;
let
icon
=
'
chain
'
;
...
...
This diff is collapsed.
Click to expand it.
src/app/components/elements/Icon.jsx
+
1
−
0
View file @
7d55f97b
...
@@ -56,6 +56,7 @@ export const icons = [
...
@@ -56,6 +56,7 @@ export const icons = [
'
pencil2
'
,
'
pencil2
'
,
'
pin
'
,
'
pin
'
,
'
pin-disabled
'
,
'
pin-disabled
'
,
'
bell
'
,
];
];
const
icons_map
=
{};
const
icons_map
=
{};
// eslint-disable-next-line global-require,import/no-dynamic-require
// eslint-disable-next-line global-require,import/no-dynamic-require
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment