Skip to content
Snippets Groups Projects
Commit 7d55f97b authored by Dan Notestein's avatar Dan Notestein
Browse files

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!348Develop,!345Resolve "Fix bug with icon in Activity log Dialog"
<?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
...@@ -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';
......
...@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment