Mastodon
/
Sengi-Windows-MacOS-Linux
mirror of https://github.com/NicolasConstant/sengi
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #264 from NicolasConstant/develop 

0.26.1 PR
This commit is contained in:
Nicolas Constant 2020-04-21 22:36:41 -04:00 committed by GitHub
parent 1aec5e9438 d036a5cd9a
commit 11c6ef955e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 68 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
docs/assets/css/main.css
View File

@ -201,6 +201,17 @@ body {
.quick-overview__video {
width: 100%;
height: 492; } }
.quick-overview__video:focus {
background: none;
border: 0px;
outline: none; }
.link {
color: black; }
.link:visited, .link:focus {
color: black; }
.link:hover {
color: grey; }
.functionalities__row {
max-width: 100rem; }

20
docs/assets/sass/layout/_section.scss
View File

@ -71,6 +71,24 @@
width: 100%;
height: 492;
}
&:focus {
background: none;
border: 0px;
outline: none;
}
}
}
.link {
color: black;
&:visited, &:focus {
color: black;
}
&:hover {
color: grey;
}
}
@ -84,7 +102,7 @@
display: block;
margin: auto;
font-weight: 400;
font-size: 2rem;
font-size: 2rem;
text-align: center;
padding: 7rem 5rem 0 5rem;

5
docs/index.html
View File

@ -159,8 +159,9 @@
<div class="row functionalities__row">
<div class="col-1-of-2">
<p class="functionalities__text">
Get a quick insight if a status is part of a thread, has replies, is from a bot, is old or was
cross-posted (limited to local TL), is remotely fetched.
Get a quick insight if a status is part of a thread, has replies, is from a bot, is old, is
cross-posted (limited to local TL) or is remotely fetched.<br/>
<a href="https://github.com/NicolasConstant/sengi/wiki/Labels" class="link">more details</a>
</p>
</div>
<div class="col-1-of-2">

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "sengi",
"version": "0.26.0",
"version": "0.26.1",
"license": "AGPL-3.0-or-later",
"main": "main-electron.js",
"description": "A multi-account desktop client for Mastodon and Pleroma",

2
src/app/components/stream/status/databinded-text/databinded-text.component.ts
View File

@ -32,7 +32,7 @@ export class DatabindedTextComponent implements OnInit {
let parser = new DOMParser();
var dom = parser.parseFromString(value, 'text/html')
this.isCollapsed = [...dom.body.textContent].length > 500;
this.isCollapsed = [...dom.body.textContent].length > 600;
this.processedText = '';

2
src/app/components/stream/status/status.component.html
View File

@ -5,7 +5,7 @@
(auxclick)="openUrl(status.account.url)"><span innerHTML="{{ status.account | accountEmoji }}"></span> <img
*ngIf="reblog" class="reblog__avatar" src="{{ status.account.avatar }}" /></a> boosted
</div>
<div *ngIf="statusWrapper.status.pinned" class="pinned">
<div *ngIf="statusWrapper.status.pinned && !notificationType" class="pinned">
<div class="notification--icon">
<fa-icon class="pinned__icon" [icon]="faThumbtack"></fa-icon>
</div>

16
src/app/components/stream/stream-notifications/stream-notifications.component.html
View File

@ -1,13 +1,17 @@
<div class="notifications">
<div class="notifications__selector">
<a href class="notifications__selector__button" title="display all notifications" (click)="select('all')"
[class.notifications__selector__button--selected]="displayingNotifications">All</a>
<a href class="notifications__selector__button" title="display mentions" (click)="select('mentions')"
[class.notifications__selector__button--selected]="displayingMentions">Mentions</a>
<div class="notifications__selector--wrapper">
<a href class="notifications__selector__button" title="display all notifications" (click)="select('all')"
[class.notifications__selector__button--selected]="displayingNotifications">All</a>
</div>
<div class="notifications__selector--wrapper">
<a href class="notifications__selector__button" title="display mentions" (click)="select('mentions')"
[class.notifications__selector__button--selected]="displayingMentions">Mentions</a>
</div>
</div>
<div class="notifications__elements">
<div [class.notifications__elements__wrapper--selected]="displayingNotifications"
<div [class.notifications__elements__wrapper--selected]="displayingNotifications"
class="notifications__elements__wrapper flexcroll" #notificationstream (scroll)="onScroll()" tabindex="0">
<div class="notification" *ngFor="let notification of notifications">
<app-notification [notification]="notification" (browseAccountEvent)="browseAccount($event)"
@ -16,7 +20,7 @@
</div>
<app-waiting-animation *ngIf="isNotificationsLoading" class="waiting-icon"></app-waiting-animation>
</div>
<div [class.notifications__elements__wrapper--selected]="displayingMentions"
<div [class.notifications__elements__wrapper--selected]="displayingMentions"
class="notifications__elements__wrapper flexcroll" #mentionstream (scroll)="onScroll()" tabindex="0">
<div class="notification" *ngFor="let notification of mentions">
<app-notification [notification]="notification" (browseAccountEvent)="browseAccount($event)"

25
src/app/components/stream/stream-notifications/stream-notifications.component.scss
View File

@ -9,15 +9,32 @@ $selector-height: 30px;
position: relative;
&__selector {
position: relative;
height: $selector-height;
background-color: $notification-column-selector-background;
width: calc(100%);
background-color: $notification-column-selector-background;
&--wrapper {
position: absolute;
width: calc(50%);
display: inline-block;
&:nth-child(odd) {
top: 0;
left: 0;
}
&:nth-child(even) {
top: 0;
right: 0;
}
}
&__button {
text-decoration: none;
display: inline-block;
width: 50%;
display: block;
height: 100%;
height: $selector-height;
text-align: center;
padding-top: 3px;
color: $notification-column-selector-color;
@ -25,8 +42,6 @@ $selector-height: 30px;
&--selected {
color: $notification-column-selector-color-hover;
}
}
}

4
src/app/services/user-notification.service.ts
View File

@ -134,11 +134,11 @@ export class UserNotificationService {
if (currentAccountNotifications) {
currentAccountNotifications = this.analyseNotifications(account, currentAccountNotifications, notifications, type);
if (currentAccountNotifications.hasNewMentions || currentAccountNotifications.hasNewNotifications) {
//if (currentAccountNotifications.hasNewMentions || currentAccountNotifications.hasNewNotifications) {
currentNotifications = currentNotifications.filter(x => x.account.id !== account.id);
currentNotifications.push(currentAccountNotifications);
this.userNotifications.next(currentNotifications);
}
//}
} else {
let newNotifications = new UserNotification();
newNotifications.account = account;