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

various buttons removals

This commit is contained in:
Nicolas Constant 2019-09-28 14:22:11 -04:00
parent c7ca6fb61c
commit 11ddcacb8c
No known key found for this signature in database
GPG Key ID: 1E9F677FB01A5688
8 changed files with 31 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/components/create-status/media/media.component.html
View File

@ -8,18 +8,18 @@
<app-waiting-animation class="waiting-icon"></app-waiting-animation>
</div>
<div class="media__loaded--hover">
<button class="media__loaded--button" title="remove" (click)="removeMedia(m)">
<a href class="media__loaded--button" title="remove" (click)="removeMedia(m)">
<fa-icon [icon]="faTimes"></fa-icon>
</button>
</a>
<input class="media__loaded--description" [(ngModel)]="m.description" autocomplete="off"
placeholder="Describe for the visually impaired" />
</div>
<img class="media__loaded--preview" src="{{m.attachment.preview_url}}" />
</div>
<div *ngIf="m.attachment !== null && m.attachment.type === 'audio'" class="audio">
<button class="audio__button" title="remove" (click)="removeMedia(m)">
<a href class="audio__button" title="remove" (click)="removeMedia(m)">
<fa-icon [icon]="faTimes"></fa-icon>
</button>
</a>
<div *ngIf="m.isMigrating">
<app-waiting-animation class="waiting-icon"></app-waiting-animation>

17
src/app/components/create-status/media/media.component.scss
View File

@ -46,12 +46,11 @@
opacity: 100;
}
&--button {
@include clearButton;
&--button {
width: 10px;
height: 10px;
position: absolute;
top:5px;
top:0px;
right:8px;
color: white;
}
@ -61,13 +60,9 @@
bottom:5px;
left: 5px;
width: calc(100% - 10px);
// background: black;
// color: white;
}
&--preview {
// display: block;
width: calc(100%);
height: calc(100%);
@ -87,16 +82,12 @@
}
&__button {
@include clearButton;
display: block;
width: 10px;
height: 10px;
color: white;
float: right;
// position: absolute;
// top:5px;
// right:8px;
margin-top: 0px;
margin-right: 5px;
}
}

12
src/app/components/media-viewer/media-viewer.component.html
View File

@ -1,19 +1,19 @@
<div class="media-viewer-canvas noselect">
<div class="background__close" (click)="close()"></div>
<button class="media-viewer-canvas__close media-viewer-canvas__button" title="close" (click)="close()">
<a href class="media-viewer-canvas__close media-viewer-canvas__button" title="close" (click)="close()">
<fa-icon [icon]="faTimes"></fa-icon>
</button>
</a>
<button class="media-viewer-canvas__previous media-viewer-canvas__button" title="previous"
<a href class="media-viewer-canvas__previous media-viewer-canvas__button" title="previous"
(click)="previous($event)" *ngIf="previousAvailable">
<fa-icon [icon]="faAngleLeft"></fa-icon>
</button>
</a>
<button class="media-viewer-canvas__next media-viewer-canvas__button" title="next" (click)="next($event)"
<a href class="media-viewer-canvas__next media-viewer-canvas__button" title="next" (click)="next($event)"
*ngIf="nextAvailable">
<fa-icon [icon]="faAngleRight"></fa-icon>
</button>
</a>
<div *ngFor="let att of attachments" class="media-viewer-canvas__attachement"
[class.collapsed]="currentIndex !== att.index">

2
src/app/components/media-viewer/media-viewer.component.scss
View File

@ -10,7 +10,7 @@
position: relative;
&__button {
@include clearButton;
display: block;
padding: 5px;
position: absolute;
}

23
src/app/components/stream/status/attachements/attachements.component.html
View File

@ -46,37 +46,30 @@
</div>
</div>
<div class="galery" *ngIf="isGifv">
<!-- <video width="480" height="320" controls="controls"> -->
<video class="galery__gifv" role="application" loop autoplay (click)="attachmentSelected(0)">
<source src="{{ attachments[0].url }}" type="video/mp4">
</video>
</div>
<div class="galery galery__hover" *ngIf="isVideo">
<!-- <video width="480" height="320" controls="controls"> -->
<video #videoPlayer class="galery__video" role="application" loop>
<source src="{{ attachments[0].url }}" type="video/mp4">
</video>
<div class="galery__play-control">
<button type="button" class="galery__control--button" (click)="onPlay()" *ngIf="!isPlaying">
<a href class="galery__control--button" (click)="onPlay()" *ngIf="!isPlaying">
<fa-icon [icon]="faPlay"></fa-icon>
</button>
<!-- <button type="button" id="play-pause" class="galery__control--button">
<fa-icon [icon]="faPause"></fa-icon>
</button> -->
</a>
</div>
<div class="galery__control">
<button type="button" class="galery__control--button" (click)="onPlay()">
<a href class="galery__control--button" (click)="onPlay()">
<fa-icon [icon]="faPause" *ngIf="isPlaying"></fa-icon>
</button>
<!-- <input type="range" id="seek-bar" class="video-control__button" value="0"> -->
<button type="button" class="galery__control--button galery__control--expand" (click)="onExpand()">
</a>
<a href class="galery__control--button galery__control--expand" (click)="onExpand()">
<fa-icon [icon]="faExpand"></fa-icon>
</button>
<!-- <input type="range" id="volume-bar" class="video-control__button" min="0" max="1" step="0.1" value="1"> -->
<button type="button" class="galery__control--button galery__control--mute" (click)="onMute()">
</a>
<a href class="galery__control--button galery__control--mute" (click)="onMute()">
<fa-icon [icon]="faVolumeUp" *ngIf="!isMuted"></fa-icon>
<fa-icon [icon]="faVolumeMute" *ngIf="isMuted"></fa-icon>
</button>
</a>
</div>
</div>
<div *ngIf="isAudio">

4
src/app/components/stream/status/attachements/attachements.component.scss
View File

@ -124,8 +124,8 @@
padding-top: 55px;
&--button {
@include clearButton;
color: rgb(211, 211, 211);
display: inline-block;
color: rgb(211, 211, 211);
font-size: 16px;
padding: 10px 15px;

10
src/app/components/stream/status/attachements/attachements.component.ts
View File

@ -64,7 +64,7 @@ export class AttachementsComponent implements OnInit {
return this.videoplayer.nativeElement;
}
onPlay() {
onPlay(): boolean {
if (!this.isPlaying) {
this.getVideo().play();
} else {
@ -72,10 +72,10 @@ export class AttachementsComponent implements OnInit {
}
this.isPlaying = !this.isPlaying;
return false;
}
onExpand() {
onExpand(): boolean {
if (!this.isMuted) {
this.onMute();
}
@ -85,11 +85,13 @@ export class AttachementsComponent implements OnInit {
}
this.attachmentSelected(0);
return false;
}
onMute() {
onMute(): boolean {
this.isMuted = !this.isMuted;
this.getVideo().muted = this.isMuted;
return false;
}
setAudioData(att: Attachment): any {

1
src/app/components/stream/stream-edition/stream-edition.component.scss
View File

@ -26,7 +26,6 @@
}
&__button {
//@include clearButton;
display: inline-block;
padding: 5px 10px 5px 10px;
margin: 3px 0;