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

Merge remote-tracking branch 'origin/master'

parents 8bb91413 875b36d6
No related branches found
No related tags found
No related merge requests found
Showing
with 18 additions and 17 deletions
<ng-container *ngIf="(apiRootStateResource$ | async)?.resource as apiRoot"> <ng-container *ngIf="(apiRootStateResource$ | async)?.resource as apiRoot">
<header <header
class="flex h-16 items-center justify-between border-b border-b-ozggray-300 bg-white px-9 py-2" class="z-50 flex h-16 items-center justify-between border-b border-b-ozggray-300 bg-white px-9 py-2"
data-test-id="admin-header" data-test-id="admin-header"
> >
<a <a
......
import { ApiRootLinkRel, ApiRootResource, ApiRootService } from '@alfa-client/api-root-shared'; import { ApiRootLinkRel, ApiRootResource, ApiRootService } from '@alfa-client/api-root-shared';
import { BuildInfoComponent } from '@alfa-client/common-lib'; import { BuildInfoComponent } from '@alfa-client/common';
import { HasLinkPipe, createEmptyStateResource, createStateResource } from '@alfa-client/tech-shared'; import { HasLinkPipe, createEmptyStateResource, createStateResource } from '@alfa-client/tech-shared';
import { import {
Mock, Mock,
......
import { AdminSettingsModule } from '@admin-client/admin-settings'; import { AdminSettingsModule } from '@admin-client/admin-settings';
import { ApiRootModule } from '@alfa-client/api-root-shared'; import { ApiRootModule } from '@alfa-client/api-root-shared';
import { BuildInfoComponent } from '@alfa-client/common-lib'; import { BuildInfoComponent } from '@alfa-client/common';
import { EnvironmentModule } from '@alfa-client/environment-shared'; import { EnvironmentModule } from '@alfa-client/environment-shared';
import { TechSharedModule } from '@alfa-client/tech-shared'; import { TechSharedModule } from '@alfa-client/tech-shared';
import { CommonModule, registerLocaleData } from '@angular/common'; import { CommonModule, registerLocaleData } from '@angular/common';
......
alfa-client/apps/admin/src/favicon.ico

14.7 KiB

...@@ -7,12 +7,17 @@ ...@@ -7,12 +7,17 @@
@import 'libs/design-system/src/lib/tailwind-preset/root.css'; @import 'libs/design-system/src/lib/tailwind-preset/root.css';
@import 'libs/ui/src/lib/font/font_material'; @import 'libs/ui/src/lib/font/font_material';
@import 'variables'; @import 'variables';
@import 'typeface-roboto/index.css';
@include mat.all-component-typographies(); @include mat.all-component-typographies();
@include mat.core(); @include mat.core();
@include mat.all-component-themes($alfaTheme); @include mat.all-component-themes($alfaTheme);
body {
font-family: Roboto, 'Helvetica Neue', sans-serif;
}
body.dark { body.dark {
@include mat.all-component-colors($alfaDarkTheme); @include mat.all-component-colors($alfaDarkTheme);
} }
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
* unter der Lizenz sind dem Lizenztext zu entnehmen. * unter der Lizenz sind dem Lizenztext zu entnehmen.
*/ */
import { ApiRootFacade } from '@alfa-client/api-root-shared'; import { ApiRootFacade } from '@alfa-client/api-root-shared';
import { BuildInfoComponent } from '@alfa-client/common-lib'; import { BuildInfoComponent } from '@alfa-client/common';
import { ENVIRONMENT_CONFIG } from '@alfa-client/environment-shared'; import { ENVIRONMENT_CONFIG } from '@alfa-client/environment-shared';
import { NavigationService } from '@alfa-client/navigation-shared'; import { NavigationService } from '@alfa-client/navigation-shared';
import { createEmptyStateResource, createStateResource } from '@alfa-client/tech-shared'; import { createEmptyStateResource, createStateResource } from '@alfa-client/tech-shared';
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
*/ */
import { ApiRootModule } from '@alfa-client/api-root-shared'; import { ApiRootModule } from '@alfa-client/api-root-shared';
import { AppSharedModule } from '@alfa-client/app-shared'; import { AppSharedModule } from '@alfa-client/app-shared';
import { BuildInfoComponent } from '@alfa-client/common-lib'; import { BuildInfoComponent } from '@alfa-client/common';
import { EnvironmentModule } from '@alfa-client/environment-shared'; import { EnvironmentModule } from '@alfa-client/environment-shared';
import { HintSharedModule } from '@alfa-client/hint-shared'; import { HintSharedModule } from '@alfa-client/hint-shared';
import { NavigationModule } from '@alfa-client/navigation'; import { NavigationModule } from '@alfa-client/navigation';
......
# common-lib # common
This library was generated with [Nx](https://nx.dev). This library was generated with [Nx](https://nx.dev).
## Running unit tests ## Running unit tests
Run `nx test common-lib` to execute the unit tests. Run `nx test common` to execute the unit tests.
export default { export default {
displayName: 'common-lib', displayName: 'common',
preset: '../../jest.preset.js', preset: '../../jest.preset.js',
setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'], setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
coverageDirectory: '../../coverage/libs/common-lib', coverageDirectory: '../../coverage/libs/common',
transform: { transform: {
'^.+\\.(ts|mjs|js|html)$': [ '^.+\\.(ts|mjs|js|html)$': [
'jest-preset-angular', 'jest-preset-angular',
......
{ {
"name": "common-lib", "name": "common",
"$schema": "../../node_modules/nx/schemas/project-schema.json", "$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/common-lib/src", "sourceRoot": "libs/common/src",
"prefix": "lib", "prefix": "lib",
"projectType": "library", "projectType": "library",
"tags": [], "tags": [],
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
"executor": "@nx/jest:jest", "executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
"options": { "options": {
"jestConfig": "libs/common-lib/jest.config.ts" "jestConfig": "libs/common/jest.config.ts"
} }
}, },
"lint": { "lint": {
......
...@@ -36,10 +36,6 @@ ...@@ -36,10 +36,6 @@
transform-origin: right bottom; transform-origin: right bottom;
} }
:host-context(.dark) {
color: #ccc;
}
p { p {
margin: 0; margin: 0;
line-height: 1; line-height: 1;
...@@ -47,7 +43,7 @@ p { ...@@ -47,7 +43,7 @@ p {
font-style: normal; font-style: normal;
font-weight: 400; font-weight: 400;
font-size: 0.6875rem; font-size: 0.6875rem;
color: #999; color: theme('colors.text/70');
&.version { &.version {
span { span {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment