Skip to content
Snippets Groups Projects
Commit 26a8da9f authored by OZGCloud's avatar OZGCloud
Browse files

Merge pull request 'OZG-6103 OZG-6593 Improve layout and styling' (#747) from...

Merge pull request 'OZG-6103 OZG-6593 Improve layout and styling' (#747) from OZG-6103-admin-layout into master

Reviewed-on: https://git.ozg-sh.de/ozgcloud-app/alfa/pulls/747


Reviewed-by: default avatarOZGCloud <ozgcloud@mgm-tp.com>
parents bd404c82 ff4b6bd5
Branches
Tags
No related merge requests found
...@@ -11,22 +11,18 @@ ...@@ -11,22 +11,18 @@
> >
<ods-admin-logo-icon /> <ods-admin-logo-icon />
</a> </a>
<div>
<user-profile-button-container <user-profile-button-container
data-test-id="user-profile-button" data-test-id="user-profile-button"
></user-profile-button-container> ></user-profile-button-container>
</div>
</header> </header>
<div class="flex w-full flex-auto justify-center overflow-y-auto"> <div class="flex h-screen w-full justify-center overflow-y-auto">
<div class="w-72 bg-slate-100 p-6"> <nav class="h-full w-72 bg-slate-100 p-4">
<nav>
<admin-navigation <admin-navigation
*ngIf="apiRoot | hasLink: ApiRootLinkRel.CONFIGURATION" *ngIf="apiRoot | hasLink: ApiRootLinkRel.CONFIGURATION"
data-test-id="navigation" data-test-id="navigation"
></admin-navigation> ></admin-navigation>
</nav> </nav>
</div> <main class="flex-1 overflow-y-auto bg-white px-6 py-4">
<main class="flex-auto overflow-y-auto bg-slate-200 p-6">
<router-outlet <router-outlet
*ngIf=" *ngIf="
apiRoot | hasLink: ApiRootLinkRel.CONFIGURATION; apiRoot | hasLink: ApiRootLinkRel.CONFIGURATION;
...@@ -39,5 +35,5 @@ ...@@ -39,5 +35,5 @@
</ng-template> </ng-template>
</main> </main>
</div> </div>
<span data-test-id="build-version">Version: {{ apiRoot.version }}</span> <footer data-test-id="build-version">Version: {{ apiRoot.version }}</footer>
</ng-container> </ng-container>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment