Skip to content

Commit 541aaa3

Browse files
authored
Merge pull request #2269 from citizenos/#2180
#2180
2 parents a82594a + 0ba4d28 commit 541aaa3

File tree

2 files changed

+54
-18
lines changed

2 files changed

+54
-18
lines changed

src/app/group/group.component.html

Lines changed: 48 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
</ng-container>
2525
</div>
2626
<div id="buttons_area">
27-
<button id="join_button" *ngIf="!group.userLevel" class="btn_medium_close"
28-
translate="VIEWS.GROUP.BTN_JOIN" (click)="joinGroup(group)"></button>
27+
<button id="join_button" *ngIf="!group.userLevel" class="btn_medium_close" translate="VIEWS.GROUP.BTN_JOIN"
28+
(click)="joinGroup(group)"></button>
2929
<div *ngIf="(group.userLevel)" class="permissions_lable tablet_hidden"
3030
[translate]="(group.userLevel !== 'read')? ('TXT_GROUP_LEVELS_' + group.userLevel | uppercase) : 'VIEWS.GROUP.LBL_JOINED'">
3131
</div>
@@ -385,18 +385,34 @@
385385
<div class="info_number">{{group.members.topics.count.followUp || 0}}</div>
386386
</div>
387387
</div>
388-
<a id="view_more" class="tablet_show" (click)="moreInfo = !moreInfo" *ngIf="!moreInfo">
389-
<div class="bold" *ngIf="!moreInfo" translate="VIEWS.GROUP.LNK_MORE_INFO"></div>
390-
<div class="bold" *ngIf="moreInfo" translate="VIEWS.GROUP.LNK_CLOSE_INFO"></div>
391-
<svg *ngIf="!moreInfo" width="24" height="24" viewBox="0 0 24 24" fill="none"
392-
xmlns="http://www.w3.org/2000/svg">
393-
<path d="M17 10L12 15L7 10" stroke="#1168A8" stroke-width="2" stroke-linecap="round" />
394-
</svg>
395-
<svg *ngIf="moreInfo" width="24" height="24" viewBox="0 0 24 24" transform="rotate(180)" fill="none"
396-
xmlns="http://www.w3.org/2000/svg">
397-
<path d="M17 10L12 15L7 10" stroke="#1168A8" stroke-width="2" stroke-linecap="round" />
398-
</svg>
399-
</a>
388+
<div class="mobile_hidden">
389+
<a id="view_more" class="tablet_show" (click)="moreInfo = !moreInfo" *ngIf="!moreInfo">
390+
<div class="bold" *ngIf="!moreInfo" translate="VIEWS.GROUP.LNK_MORE_INFO"></div>
391+
<div class="bold" *ngIf="moreInfo" translate="VIEWS.GROUP.LNK_CLOSE_INFO"></div>
392+
<svg *ngIf="!moreInfo" width="24" height="24" viewBox="0 0 24 24" fill="none"
393+
xmlns="http://www.w3.org/2000/svg">
394+
<path d="M17 10L12 15L7 10" stroke="#1168A8" stroke-width="2" stroke-linecap="round" />
395+
</svg>
396+
<svg *ngIf="moreInfo" width="24" height="24" viewBox="0 0 24 24" transform="rotate(180)" fill="none"
397+
xmlns="http://www.w3.org/2000/svg">
398+
<path d="M17 10L12 15L7 10" stroke="#1168A8" stroke-width="2" stroke-linecap="round" />
399+
</svg>
400+
</a>
401+
</div>
402+
<div class="button_wrap mobile_show" *ngIf="!moreInfo">
403+
<button class="btn_medium_secondary" id="view_more_btn" (click)="moreInfo = !moreInfo">
404+
<svg *ngIf="!moreInfo" width="24" height="24" viewBox="0 0 24 24" fill="none"
405+
xmlns="http://www.w3.org/2000/svg">
406+
<path d="M17 10L12 15L7 10" stroke="#1168A8" stroke-width="2" stroke-linecap="round" />
407+
</svg>
408+
<svg *ngIf="moreInfo" width="24" height="24" viewBox="0 0 24 24" fill="none"
409+
xmlns="http://www.w3.org/2000/svg">
410+
<path d="M17 15L12 10L7 15" stroke="#1168A8" stroke-width="2" stroke-linecap="round" />
411+
</svg>
412+
<span *ngIf="!moreInfo" translate="VIEWS.GROUP.LNK_MORE_INFO"></span>
413+
<span *ngIf="moreInfo" translate="VIEWS.GROUP.LNK_CLOSE_INFO"></span>
414+
</button>
415+
</div>
400416
</div>
401417
</div>
402418
<div id="group_extra_info" [ngClass]=" {'open': moreInfo}">
@@ -509,7 +525,7 @@
509525
</div>
510526
</div>
511527
<div class="line_separator" *ngIf="moreInfo"></div>
512-
<a id="view_more" (click)="moreInfo = !moreInfo" *ngIf="moreInfo">
528+
<a id="view_more" class="mobile_hidden" (click)="moreInfo = !moreInfo" *ngIf="moreInfo">
513529
<div class="bold" *ngIf="!moreInfo" translate="VIEWS.GROUP.LNK_MORE_INFO"></div>
514530
<div class="bold" *ngIf="moreInfo" translate="VIEWS.GROUP.LNK_CLOSE_INFO"></div>
515531
<svg *ngIf="!moreInfo" width="24" height="24" viewBox="0 0 24 24" fill="none"
@@ -521,6 +537,20 @@
521537
<path d="M17 10L12 15L7 10" stroke="#1168A8" stroke-width="2" stroke-linecap="round" />
522538
</svg>
523539
</a>
540+
<div class="button_wrap mobile_show" *ngIf="moreInfo">
541+
<button class="btn_medium_secondary" id="view_more_btn" (click)="moreInfo = !moreInfo">
542+
<svg *ngIf="!moreInfo" width="24" height="24" viewBox="0 0 24 24" fill="none"
543+
xmlns="http://www.w3.org/2000/svg">
544+
<path d="M17 10L12 15L7 10" stroke="#1168A8" stroke-width="2" stroke-linecap="round" />
545+
</svg>
546+
<svg *ngIf="moreInfo" width="24" height="24" viewBox="0 0 24 24" fill="none"
547+
xmlns="http://www.w3.org/2000/svg">
548+
<path d="M17 15L12 10L7 15" stroke="#1168A8" stroke-width="2" stroke-linecap="round" />
549+
</svg>
550+
<span *ngIf="!moreInfo" translate="VIEWS.GROUP.LNK_MORE_INFO"></span>
551+
<span *ngIf="moreInfo" translate="VIEWS.GROUP.LNK_CLOSE_INFO"></span>
552+
</button>
553+
</div>
524554
</div>
525555

526556
</div>
@@ -1344,7 +1374,7 @@
13441374
</div>
13451375
<!--MOBILE_TOPIC_FILTERS_END-->
13461376
</div>
1347-
<div id="topics_area" *ngIf="topics$ | async as topics;" (click)="(removeTopics)? toggleRemove(): ''">
1377+
<div id="topics_area" *ngIf="topics$ | async as topics;" (click)="(removeTopics)? toggleRemove(): ''">
13481378
<ng-container *ngIf="!topics.length && !filtersSet">
13491379
<div class="no_engagements">
13501380
<div class="illustration">
@@ -1528,7 +1558,8 @@
15281558
<div class="level_heading" translate="VIEWS.GROUP.ROLE">
15291559
<div class="tooltip" tooltip>
15301560
<div class="content_title" translate="VIEWS.GROUP.TOOLTIP_MEMBERS_PERMISSIONS_HEADING"></div>
1531-
<div class="content_description" [innerHTML]="'VIEWS.GROUP.TOOLTIP_MEMBERS_PERMISSIONS_DESCRIPTION' | translate"></div>
1561+
<div class="content_description"
1562+
[innerHTML]="'VIEWS.GROUP.TOOLTIP_MEMBERS_PERMISSIONS_DESCRIPTION' | translate"></div>
15321563
</div>
15331564
</div>
15341565

src/app/group/group.component.scss

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,10 @@
251251
}
252252
}
253253

254+
#view_more_btn {
255+
width: 100%;
256+
}
257+
254258
#group_content_wrap {
255259
display: flex;
256260
flex-direction: column;
@@ -670,7 +674,8 @@
670674
align-items: center;
671675
gap: 8px;
672676

673-
group-member-user, group-invite-user {
677+
group-member-user,
678+
group-invite-user {
674679
display: contents;
675680
}
676681

0 commit comments

Comments
 (0)