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

removed placeholder for close button

This commit is contained in:
Nicolas Constant 2019-03-02 02:01:53 -05:00
parent fa9b1ef368
commit 5a7f6bf87f
No known key found for this signature in database
GPG Key ID: 1E9F677FB01A5688
4 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/components/floating-column/floating-column.component.html
View File

@ -5,7 +5,9 @@
[browseThreadData]="overlayThreadToBrowse"></app-stream-overlay> [browseThreadData]="overlayThreadToBrowse"></app-stream-overlay>
<div class="floating-column__header"> <div class="floating-column__header">
<a class="close-button" href (click)="closePanel()" title="close">x</a> <a class="close-button" href (click)="closePanel()" title="close">
<fa-icon [icon]="faTimes"></fa-icon>
</a>
</div> </div>
<app-manage-account *ngIf="openPanel === 'manageAccount'" [account]="userAccountUsed"></app-manage-account> <app-manage-account *ngIf="openPanel === 'manageAccount'" [account]="userAccountUsed"></app-manage-account>

44
src/app/components/floating-column/floating-column.component.scss
View File

@ -29,26 +29,32 @@
} }
.close-button { .close-button {
// display: inline-block; display: block;
background-color: $color-primary;
color: darken(white, 30);
border-radius: 999px;
width: 26px;
height: 26px;
text-align: center;
text-decoration: none;
padding: 1px;
z-index: 9999;
float: right; float: right;
margin: 10px; font-size: 14px;
transition: all .2s;
&:hover {
background-color: lighten($color-primary, 20);
color: white; color: white;
// transform: scale(1.2); margin: 10px 16px 0 0;
}
// display: inline-block;
// background-color: $color-primary;
// color: darken(white, 30);
// border-radius: 999px;
// width: 26px;
// height: 26px;
// text-align: center;
// text-decoration: none;
// padding: 1px;
// z-index: 9999;
// float: right;
// margin: 10px;
// transition: all .2s;
// &:hover {
// background-color: lighten($color-primary, 20);
// color: white;
// // transform: scale(1.2);
// }
} }

3
src/app/components/floating-column/floating-column.component.ts
View File

@ -1,4 +1,6 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { faTimes } from "@fortawesome/free-solid-svg-icons";
import { NavigationService, LeftPanelType } from '../../services/navigation.service'; import { NavigationService, LeftPanelType } from '../../services/navigation.service';
import { AccountWrapper } from '../../models/account.models'; import { AccountWrapper } from '../../models/account.models';
import { OpenThreadEvent } from '../../services/tools.service'; import { OpenThreadEvent } from '../../services/tools.service';
@ -9,6 +11,7 @@ import { OpenThreadEvent } from '../../services/tools.service';
styleUrls: ['./floating-column.component.scss'] styleUrls: ['./floating-column.component.scss']
}) })
export class FloatingColumnComponent implements OnInit { export class FloatingColumnComponent implements OnInit {
faTimes = faTimes;
overlayActive: boolean; overlayActive: boolean;
overlayAccountToBrowse: string; overlayAccountToBrowse: string;
overlayHashtagToBrowse: string; overlayHashtagToBrowse: string;

2
src/sass/_panel.scss
View File

@ -9,6 +9,6 @@
&__title { &__title {
font-size: 13px; font-size: 13px;
text-transform: uppercase; text-transform: uppercase;
margin: 6px 0 12px 0; margin: 4px 0 12px 5px;
} }
} }