Skip to content

Commit 8e13d0e

Browse files
Saby-BishopsMutugiiidogi
authored
teams: smoother list button spacing (fixes #9199) (#9246)
Co-authored-by: mutugiii <[email protected]> Co-authored-by: dogi <[email protected]>
1 parent e982079 commit 8e13d0e

File tree

3 files changed

+24
-16
lines changed

3 files changed

+24
-16
lines changed

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"name": "planet",
33
"license": "AGPL-3.0",
4-
"version": "0.20.62",
4+
"version": "0.20.63",
55
"myplanet": {
6-
"latest": "v0.36.25",
7-
"min": "v0.35.25"
6+
"latest": "v0.36.36",
7+
"min": "v0.35.36"
88
},
99
"scripts": {
1010
"ng": "ng",

src/app/teams/teams.component.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,12 @@ <h3 class="team-name">
9292
<mat-icon>check</mat-icon>
9393
</button>
9494
</mat-header-cell>
95-
<mat-cell *matCellDef="let element" class>
96-
<div [ngClass]="{'horizontal-align button-container': isMobile}">
95+
<mat-cell *matCellDef="let element">
96+
<div class="button-container" [ngClass]="{'horizontal-align': isMobile}">
9797
<ng-container [ngSwitch]="element.userStatus" *ngIf="user.isUserAdmin || user.roles.length">
9898
<ng-container *ngSwitchCase="'member'">
9999
<ng-container *ngIf="!element.isLeader">
100-
<button mat-raised-button color="primary" class="margin-lr-3" (click)="openLeaveDialog(element.doc, element.membershipDoc); $event.stopPropagation()">
100+
<button mat-raised-button color="primary" (click)="openLeaveDialog(element.doc, element.membershipDoc); $event.stopPropagation()">
101101
<mat-icon>remove_circle</mat-icon>
102102
<label *ngIf="!isMobile" i18n> Leave </label>
103103
</button>
@@ -107,7 +107,7 @@ <h3 class="team-name">
107107
<label *ngIf="!isMobile" i18n> Edit </label>
108108
</button>
109109
</ng-container>
110-
<button *ngSwitchCase="'unrelated'" mat-raised-button color="primary" class="margin-lr-3" (click)="requestToJoin(element.doc); $event.stopPropagation()">
110+
<button *ngSwitchCase="'unrelated'" mat-raised-button color="primary" (click)="requestToJoin(element.doc); $event.stopPropagation()">
111111
<mat-icon>add_circle</mat-icon>
112112
<label *ngIf="!isMobile" i18n> Request to Join </label>
113113
</button>
@@ -120,7 +120,7 @@ <h3 class="team-name">
120120
<mat-icon>feedback</mat-icon>
121121
<label *ngIf="!isMobile" i18n> Feedback </label>
122122
</button>
123-
<button *planetAuthorizedRoles="''" mat-raised-button color="primary" class="margin-lr-3" (click)="archiveClick(element.doc); $event.stopPropagation()">
123+
<button *planetAuthorizedRoles="''" mat-raised-button color="primary" (click)="archiveClick(element.doc); $event.stopPropagation()">
124124
<mat-icon>delete_forever</mat-icon>
125125
<label *ngIf="!isMobile" i18n> Delete </label>
126126
</button>

src/app/teams/teams.scss

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@
1919

2020
.button-container {
2121
display: flex;
22-
flex-direction: row;
22+
flex-wrap: wrap;
2323
align-items: center;
24+
gap: 0.5rem;
2425
}
2526
.horizontal-align {
2627
justify-content: center;
@@ -31,7 +32,7 @@
3132
overflow: hidden;
3233
}
3334

34-
.mat-cell button, .mat-cell div button[mat-raised-button] {
35+
.button-container button[mat-raised-button] {
3536
width: 150px;
3637
text-align: center;
3738
padding: 8px 12px;
@@ -49,23 +50,24 @@
4950
color: #666;
5051
}
5152

53+
@media (max-width: $screen-md) {
54+
.button-container {
55+
gap: 0.75rem;
56+
}
57+
}
58+
5259
@media (max-width: $screen-sm) {
5360
mat-cell button {
5461
min-width: 0;
5562
padding: 0 3px;
5663
}
5764

58-
.mat-cell button, .mat-cell div button[mat-raised-button] {
59-
width: 50px;
60-
}
61-
6265
.button-container {
6366
flex-direction: column;
6467
align-items: flex-start;
68+
gap: 0.5rem;
6569
}
66-
}
6770

68-
@media (max-width: $screen-sm) {
6971
.mobile-scroll-wrapper {
7072
overflow-x: auto;
7173
-webkit-overflow-scrolling: touch;
@@ -75,4 +77,10 @@
7577
min-width: 800px;
7678
}
7779
}
80+
81+
@media (max-width: $screen-xs) {
82+
.button-container button[mat-raised-button] {
83+
width: 50px;
84+
}
85+
}
7886
}

0 commit comments

Comments
 (0)