This is the codeAbility Sharing Platform! Learn more about the codeAbility Sharing Platform.

Skip to content
Snippets Groups Projects
Commit e3c198ac authored by Eduard Frankford's avatar Eduard Frankford
Browse files

made logout dropdown look better

parent 041aba80
2 merge requests!117Preparing April Release,!104made logout dropdown look better
Hide whitespace changes
Inline Side-by-side
src/main/webapp/app/layouts/navbar/navbar.component.html
+ 63
− 59
View file @ e3c198ac
...@@ -259,17 +259,23 @@ ...@@ -259,17 +259,23 @@
<ul class="dropdown-menu search-container" ngbDropdownMenu aria-labelledby="account-menu"> <ul class="dropdown-menu search-container" ngbDropdownMenu aria-labelledby="account-menu">
<ng-container *ngSwitchCase="false"> <ng-container *ngSwitchCase="false">
<li *ngFor="let config of configs"> <li *ngFor="let config of configs">
<img src="{{ 'oauth2.' + config.registrationId + '.icon' | translate }}" alt="oAuth2Login" style="width: 50px" /> <div class="row">
<button <div class="col-4">
[disabled]="!contentEditable" <img src="{{ 'oauth2.' + config.registrationId + '.icon' | translate }}" alt="oAuth2Login" style="max-width: 50px" />
type="submit" </div>
class="btn btn-outline-secondary" <div class="col-8">
*ngSwitchCase="false" <button
(click)="loginWithGitLab(config.registrationId)" [disabled]="!contentEditable"
jhiTranslate="oauth2.{{ config.registrationId }}.text" type="submit"
> class="btn btn-outline-secondary"
Sign in with GitLab Account *ngSwitchCase="false"
</button> (click)="loginWithGitLab(config.registrationId)"
jhiTranslate="oauth2.{{ config.registrationId }}.text"
>
Sign in with GitLab Account
</button>
</div>
</div>
</li> </li>
<li class="dropdown-divider"></li> <li class="dropdown-divider"></li>
</ng-container> </ng-container>
...@@ -330,54 +336,52 @@ ...@@ -330,54 +336,52 @@
</form> </form>
</li> </li>
<li *ngSwitchCase="true"> <li *ngSwitchCase="true">
<a <div class="row">
class="dropdown-item" <div class="col-12">
routerLink="account/settings" <a
routerLinkActive="active" style="color: #212529"
*ngSwitchCase="true" routerLink="account/settings"
(click)="collapseNavbar()" routerLinkActive="active"
> *ngSwitchCase="true"
<fa-icon icon="wrench" [fixedWidth]="true"></fa-icon> (click)="collapseNavbar()"
<span jhiTranslate="global.menu.account.settings">Settings</span> >
</a> <fa-icon icon="wrench" [fixedWidth]="true"></fa-icon>
<span class="spawn-submenu" jhiTranslate="global.menu.account.settingsDescription" *ngSwitchCase="true" <span jhiTranslate="global.menu.account.settings">Settings</span>
>Manage your user settings</span </a>
> </div>
</li> <div class="col-12">
<li *ngSwitchCase="true"> <a
<a style="color: #212529"
class="dropdown-item" routerLink="account/password"
routerLink="account/password" routerLinkActive="active"
routerLinkActive="active" *ngSwitchCase="true"
*ngSwitchCase="true" (click)="collapseNavbar()"
(click)="collapseNavbar()" >
> <fa-icon icon="lock" [fixedWidth]="true"></fa-icon>
<fa-icon icon="lock" [fixedWidth]="true"></fa-icon> <span jhiTranslate="global.menu.account.passwordDescription">Change password</span>
<span jhiTranslate="global.menu.account.password">Password</span> </a>
</a> </div>
<span class="spawn-submenu" jhiTranslate="global.menu.account.passwordDescription" *ngSwitchCase="true">Change password</span>
</li> <div class="col-12">
<li *ngSwitchCase="true"> <a
<a routerLink="account/achievements"
class="dropdown-item" routerLinkActive="active"
routerLink="account/achievements" *ngSwitchCase="true"
routerLinkActive="active" style="color: #212529"
*ngSwitchCase="true" (click)="collapseNavbar()"
(click)="collapseNavbar()" >
> <fa-icon icon="award" [fixedWidth]="true"></fa-icon>
<fa-icon icon="award" [fixedWidth]="true"></fa-icon> <span jhiTranslate="global.menu.account.achievements">Achievements</span>
<span jhiTranslate="global.menu.account.achievements">Achievements</span> </a>
</a> </div>
<span class="spawn-submenu" jhiTranslate="global.menu.account.achievementsDescription" *ngSwitchCase="true"
>Look at your achievements</span <div class="col-12">
> <a (click)="logout()" id="logout">
</li> <fa-icon icon="sign-out-alt" [fixedWidth]="true"></fa-icon>
<li *ngSwitchCase="true"> <span jhiTranslate="global.menu.account.logout">Sign out</span>
<a class="dropdown-item" (click)="logout()" id="logout"> </a>
<fa-icon icon="sign-out-alt" [fixedWidth]="true"></fa-icon> </div>
<span jhiTranslate="global.menu.account.logout">Sign out</span> </div>
</a>
<span class="spawn-submenu" jhiTranslate="global.menu.account.logoutDescription" *ngSwitchCase="true">Quit session</span>
</li> </li>
</ul> </ul>
</li> </li>
......
src/main/webapp/content/scss/navbar.scss
+ 1
− 1
View file @ e3c198ac
...@@ -46,7 +46,7 @@ svg { ...@@ -46,7 +46,7 @@ svg {
z-index: 1000; z-index: 1000;
display: none; display: none;
float: left; float: left;
min-width: 10rem; min-width: 15rem;
width: auto; width: auto;
padding: 0.5rem 0; padding: 0.5rem 0;
margin: 0.125rem 0 0; margin: 0.125rem 0 0;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment