Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
2023-05-05 13:46:11 +02:00
3 changed files with 23 additions and 12 deletions

View File

@@ -0,0 +1,9 @@
.button-container{
display: flex;
justify-content: space-between;
}
#logout{
justify-self: flex-end;
margin: 5px;
}

View File

@@ -1,5 +1,5 @@
<button (click)="clearAllCookies()">Logout</button> <div class="button-container">
<div class="dropdown dropdown-hover" id="translate"> <div class="dropdown dropdown-hover" id="translate">
<label tabindex="0" class="btn m-1 bg-black border-neutral text-base-100" <label tabindex="0" class="btn m-1 bg-black border-neutral text-base-100"
id="translateLabel">{{homeTranslations.translate}}</label> id="translateLabel">{{homeTranslations.translate}}</label>
<ul tabindex="0" class="dropdown-content menu p-2 shadow rounded-box w-52" id="translateUl"> <ul tabindex="0" class="dropdown-content menu p-2 shadow rounded-box w-52" id="translateUl">
@@ -8,5 +8,7 @@
<li (click)="switchLanguage('IT')"><a>IT</a></li> <li (click)="switchLanguage('IT')"><a>IT</a></li>
<li (click)="switchLanguage('EN')"><a>EN</a></li> <li (click)="switchLanguage('EN')"><a>EN</a></li>
</ul> </ul>
</div>
<button (click)="clearAllCookies()" class="btn btn-active btn-ghost" id="logout">Logout</button>
</div> </div>
<router-outlet></router-outlet> <router-outlet></router-outlet>

View File

@@ -49,8 +49,8 @@
<a (click)="switch()"> <a (click)="switch()">
<span *ngIf="login">Register</span> <button class="btn-link" *ngIf="login">Register</button>
<span *ngIf="!login">Login</span> <button class="btn-link" *ngIf="!login">Login</button>
</a> </a>
</div> </div>