From ea521b2675d4ccc3328e4c799709e7aa75d9be4e Mon Sep 17 00:00:00 2001
From: Jonas Mohr <jonas.mohr-2@mni.thm.de>
Date: Mon, 7 Jun 2021 18:36:43 +0200
Subject: [PATCH] added hashtag icon for keywords
---
.../topic-cloud-filter/topic-cloud-filter.component.html | 4 ++--
src/app/components/shared/comment/comment.component.html | 2 +-
src/app/components/shared/comment/comment.component.scss | 4 ++++
src/app/components/shared/header/header.component.html | 2 +-
src/app/services/util/custom-icon.service.ts | 1 +
src/assets/icons/hashtag.svg | 8 ++++++++
6 files changed, 17 insertions(+), 4 deletions(-)
create mode 100644 src/assets/icons/hashtag.svg
diff --git a/src/app/components/shared/_dialogs/topic-cloud-filter/topic-cloud-filter.component.html b/src/app/components/shared/_dialogs/topic-cloud-filter/topic-cloud-filter.component.html
index 4c7814083..aca94ca9f 100644
--- a/src/app/components/shared/_dialogs/topic-cloud-filter/topic-cloud-filter.component.html
+++ b/src/app/components/shared/_dialogs/topic-cloud-filter/topic-cloud-filter.component.html
@@ -12,7 +12,7 @@
<div class="elementIcons">
<mat-icon [inline]="true">comment</mat-icon> {{allCommentsCount}}
<mat-icon [inline]="true">person</mat-icon> {{allCommentsUsers}}
- <mat-icon svgIcon="comment_tag" class="comment_tag-icon"></mat-icon> {{allCommentsKeywords}}
+ <mat-icon svgIcon="hashtag" class="comment_tag-icon"></mat-icon> {{allCommentsKeywords}}
</div>
</div>
</mat-radio-button>
@@ -24,7 +24,7 @@
<div class="elementIcons">
<mat-icon [inline]="true">comment</mat-icon> {{filteredCommentsCount}}
<mat-icon [inline]="true">person</mat-icon> {{filteredCommentsUsers}}
- <mat-icon svgIcon="comment_tag" class="comment_tag-icon"></mat-icon> {{filteredCommentsKeywords}}
+ <mat-icon svgIcon="hashtag" class="comment_tag-icon"></mat-icon> {{filteredCommentsKeywords}}
</div>
</div>
</mat-radio-button>
diff --git a/src/app/components/shared/comment/comment.component.html b/src/app/components/shared/comment/comment.component.html
index 06e75b49f..647ea69f0 100644
--- a/src/app/components/shared/comment/comment.component.html
+++ b/src/app/components/shared/comment/comment.component.html
@@ -324,7 +324,7 @@
[mat-menu-trigger-for]="keywordsMenu"
*ngIf="(comment.keywordsFromQuestioner != undefined && comment.keywordsFromQuestioner.length > 0)"
class="comment-keywords">
- <mat-icon svgIcon="comment_tag"></mat-icon>
+ <mat-icon svgIcon="hashtag" class="keyword-icon"></mat-icon>
<span>
{{ this.selectedKeyword === '' ? ('comment-page.keywords' | translate ) : this.selectedKeyword}}
</span>
diff --git a/src/app/components/shared/comment/comment.component.scss b/src/app/components/shared/comment/comment.component.scss
index 921bc0a86..2f933346a 100644
--- a/src/app/components/shared/comment/comment.component.scss
+++ b/src/app/components/shared/comment/comment.component.scss
@@ -201,6 +201,10 @@ mat-card-content > :first-child {
opacity: 1 !important;
}
+.keyword-icon {
+ height: 18px !important;
+}
+
.user-number {
cursor: pointer;
color: var(--on-surface);
diff --git a/src/app/components/shared/header/header.component.html b/src/app/components/shared/header/header.component.html
index aabc5d3ce..d9537f9fb 100644
--- a/src/app/components/shared/header/header.component.html
+++ b/src/app/components/shared/header/header.component.html
@@ -47,7 +47,7 @@
class="pseudo-button"
matRipple
matTooltip="{{'header.overview-keywords-tooltip' | translate}}">
- <mat-icon svgIcon="comment_tag"
+ <mat-icon svgIcon="hashtag"
class="oldtypo-h2 comment_tag-icon"></mat-icon>
<p style="margin-left: 0.25em;">{{commentsCountKeywords}}</p>
</button>
diff --git a/src/app/services/util/custom-icon.service.ts b/src/app/services/util/custom-icon.service.ts
index 4183d9e8f..b66cc7777 100644
--- a/src/app/services/util/custom-icon.service.ts
+++ b/src/app/services/util/custom-icon.service.ts
@@ -9,6 +9,7 @@ export class CustomIconService {
'beamer',
'meeting_room',
'comment_tag',
+ 'hashtag',
'qrcode'
];
diff --git a/src/assets/icons/hashtag.svg b/src/assets/icons/hashtag.svg
new file mode 100644
index 000000000..c309d2fc2
--- /dev/null
+++ b/src/assets/icons/hashtag.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
+<path d="M64.333,490h58.401l33.878-137.69h122.259L245.39,490h58.401l33.878-137.69h119.92v-48.162h-108.24l29.2-117.324h79.04
+ v-48.162H390.23L424.108,0H365.31l-33.878,138.661H208.79L242.668,0h-58.415l-33.864,138.661H32.411v48.162h106.298l-28.818,117.324
+ h-77.48v48.162h65.8L64.333,490z M197.11,186.824h122.642l-29.2,117.324H168.292L197.11,186.824z"/>
+</svg>
--
GitLab