Skip to content

Commit

Permalink
mylife: smoother achievements spacing (fixes #7996) (#7997)
Browse files Browse the repository at this point in the history
Co-authored-by: mutugiii <[email protected]>
Co-authored-by: dogi <[email protected]>
  • Loading branch information
3 people authored Dec 27, 2024
1 parent fe5d6d0 commit 017ca20
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 6 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "planet",
"license": "AGPL-3.0",
"version": "0.16.24",
"version": "0.16.25",
"myplanet": {
"latest": "v0.21.55",
"min": "v0.20.55"
Expand Down
13 changes: 10 additions & 3 deletions src/app/meetups/meetups.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,16 @@ export class MeetupService {
openDeleteDialog(meetups: any[] | any, callback) {
const isMany = meetups.length > 1;
const displayName = isMany ? '' : (meetups[0] || meetups).title;
const recurringInfo = (meetups[0] || meetups).recurring && (meetups[0] || meetups).recurring !== 'none' && (meetups[0] || meetups).recurringNumber
? `(Recurs ${ (meetups[0] || meetups).recurring} for ${ (meetups[0] || meetups).recurringNumber } ${ (meetups[0] || meetups).recurring === 'daily' ? 'days' : 'weeks' })`
: '';
const recurringInfo =
(meetups[0] || meetups).recurring &&
(meetups[0] || meetups).recurring !== 'none' &&
(meetups[0] || meetups).recurringNumber
? `(Recurs ${(meetups[0] || meetups).recurring} for ${
(meetups[0] || meetups).recurringNumber
} ${
(meetups[0] || meetups).recurring === 'daily' ? 'days' : 'weeks'
})`
: '';
this.deleteDialog = this.dialog.open(DialogsPromptComponent, {
data: {
okClick: this.deleteMeetups([ meetups ].flat(), displayName, callback),
Expand Down
2 changes: 1 addition & 1 deletion src/app/shared/forms/planet-tag-input-dialog.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { DialogsPromptComponent } from '../../shared/dialogs/dialogs-prompt.comp
}
:host mat-dialog-content {
overflow-y: auto;
max-height: calc(100vh - 100px);
max-height: calc(100vh - 100px);
}
:host .mat-list-option span {
font-weight: inherit;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ <h3 i18n>My Certifications</h3>
<h3 i18n>My Links</h3>
<mat-list>
<mat-list-item class="mat-list-item-word-wrap" *ngFor="let link of achievements.links">
<h4 mat-line>{{link.title}}:</h4>
<h4 class="link-title" mat-line>{{link.title}}:</h4>
<a href="{{link.url}}" target="_blank" class="styled-link"> {{link.url}} </a>
</mat-list-item>
</mat-list>
Expand Down
5 changes: 5 additions & 0 deletions src/app/users/users-achievements/users-achievements.scss
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@
grid-area: txt;
display: flex;
align-items: center;
max-width: 75%;
}

.achievement-date {
Expand All @@ -94,6 +95,10 @@
}
}

.link-title {
max-width: 75%;
}

.styled-link {
color: #007bff;
text-decoration: none;
Expand Down

0 comments on commit 017ca20

Please sign in to comment.