Skip to content

Commit

Permalink
fix styles
Browse files Browse the repository at this point in the history
  • Loading branch information
Borys91 authored and GeorgDangl committed May 10, 2024
1 parent 668d70d commit 6c95717
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 10 deletions.
1 change: 1 addition & 0 deletions src/server/dangl-opencde-ui/src/app/app.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
[opened]="sideNavOpened && userIsAuthenticated"
(openedChange)="sideNavOpened && (userIsAuthenticated = $event)"
class="main-sidenav dark-bg"
color="primary"
>
<div class="list">
<opencde-sidenav></opencde-sidenav>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<div>
<a routerLinkActive="active" mat-button routerLink="/projects">
<a routerLinkActive="active" mat-flat-button routerLink="/projects">
<mat-icon>business</mat-icon>
<span>Projects</span>
</a>
<a routerLinkActive="active" mat-button routerLink="/api-spec">
<a routerLinkActive="active" mat-flat-button routerLink="/api-spec">
<mat-icon>settings</mat-icon>
<span>API</span>
</a>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ a {
text-align: start;
padding-top: 4px;
padding-bottom: 2px;
background-color: $color-dark !important;
color: #fff !important;
}

mat-icon {
Expand All @@ -19,5 +21,5 @@ mat-icon {
}

a.active {
background-color: $color-primary;
background-color: $color-primary !important;
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<opencde-user-info [userInfo]="userInfo"></opencde-user-info>
</ng-container>
<ng-template #notUser>
<button mat-button (click)="login()">
<button mat-flat-button color="primary" (click)="login()">
<span>Login / Register</span>
</button>
</ng-template>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,22 @@
<ng-container *ngIf="userInfo">
<button class="menu-btn" mat-button [matMenuTriggerFor]="menu">
<div class="user-info-container">
<img
class="profile-image"
*ngIf="userInfo?.identiconId"
[diIcon]="userInfo.identiconId"
[rectangleSize]="30"
/>
<span id="username-nav">
{{ userInfo.username }}
</span>
</button>
<button
class="menu-btn"
mat-flat-button
color="primary"
[matMenuTriggerFor]="menu"
>
<span id="username-nav">
{{ userInfo.username }}
</span>
</button>
</div>
</ng-container>
<mat-menu #menu>
<button mat-menu-item (click)="logout()">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,8 @@
#username-nav {
font-size: 14px;
}

.user-info-container {
display: flex;
align-items: center;
}
2 changes: 1 addition & 1 deletion src/server/dangl-opencde-ui/src/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ body {
}

.dark-bg {
background-color: $color-dark;
background-color: $color-dark !important;
}

0 comments on commit 6c95717

Please sign in to comment.