more changes according to PR comments

This commit is contained in:
Zaid Abed Jaser
2021-04-30 13:12:28 +02:00
parent b6c9219818
commit 2dc620c723
7 changed files with 24 additions and 34 deletions

View File

@@ -6,7 +6,7 @@ export interface Staff {
staffId: string;
firstName: string;
lastName: string;
Utforandeverksamhet: string;
utforandeverksamhet: string;
active: boolean;
service: string;
fullName?: string;

View File

@@ -10,16 +10,14 @@
<form [formGroup]="formGroup" (ngSubmit)="submitForm()">
<div class="create-account__block">
<h2>Personuppgifter</h2>
<div class="create-account__combined-inputs">
<digi-ng-form-input
class="create-account__input"
formControlName="firstName"
afLabel="Förnamn"
afInvalidMessage="Förnamn är obligatoriskt"
[afDisableValidStyle]="true"
[afInvalid]="firstNameControl.invalid && firstNameControl.dirty"
></digi-ng-form-input>
</div>
<digi-ng-form-input
class="create-account__input"
formControlName="firstName"
afLabel="Förnamn"
afInvalidMessage="Förnamn är obligatoriskt"
[afDisableValidStyle]="true"
[afInvalid]="firstNameControl.invalid && firstNameControl.dirty"
></digi-ng-form-input>
<digi-ng-form-input
class="create-account__input"
formControlName="lastName"

View File

@@ -17,14 +17,14 @@
&__permission-checkbox {
display: flex;
height: 5em;
height: 5rem;
align-items: center;
}
&__fieldset {
padding: 0;
border: 0;
margin-top: 2em;
margin-top: var(--digi--layout--gutter);
legend {
width: 100%;
@@ -32,7 +32,7 @@
align-items: center;
margin: 0;
font-weight: var(--digi--typography--font-weight--bold);
font-size: 1.5em;
font-size: 1.5rem;
padding-bottom: var(--digi--layout--gutter--s);
}
}
@@ -55,22 +55,16 @@
}
&__footer {
margin-top: 2em;
margin-top: var(--digi--layout--gutter);
display: flex;
gap: var(--digi--layout--gutter);
}
}
.assign-permission-checkbox {
display: flex;
height: 5em;
align-items: center;
}
.search-address {
width: 30%;
}
digi-ng-popover {
margin-left: 1em;
margin-left: var(--digi--layout--gutter);
}

View File

@@ -21,7 +21,7 @@
</button>
</th>
<th scope="col" class="staff-list__column-head">
<button class="staff-list__sort-button" (click)="handleSort('Utforandeverksamhet')">
<button class="staff-list__sort-button" (click)="handleSort('utforandeverksamhet')">
Utförandeverksamhet
<ng-container *ngIf="sortBy?.key === 'Utforandeverksamhet'">
<digi-icon-caret-up class="staff-list__sort-icon" *ngIf="!sortBy.reverse"></digi-icon-caret-up>

View File

@@ -20,7 +20,6 @@
align-items: center;
gap: var(--digi--layout--gutter);
cursor: pointer;
color: #1616b2;
}
&__sort-icon {

View File

@@ -5,18 +5,12 @@
</digi-typography>
<div class="start__wrapper">
<div class="start__main">
<!-- Syntax fel i digi info card? -->
<digi-info-card
af-heading="Notiser"
af-heading-level="h1"
af-type="info"
af-link-text="Deltagare"
af-link-href="/mina-deltagare"
>
<digi-info-card af-heading="Notiser" af-heading-level="h1" af-type="info" af-link-text="Deltagare">
<p>
Det har kommit in nya avrop med deltagare, länken nedan tar dig till fliken Nya deltagare. Du finner den också
i vänster menyn på sidan
</p>
<a [routerLink]="['/mina-deltagare']">Deltagare</a>
</digi-info-card>
</div>

View File

@@ -1,3 +1,4 @@
@import 'variables/gutters';
.start {
&__wrapper {
display: grid;
@@ -6,16 +7,20 @@
'header header '
'main sidebar'
'footer footer ';
grid-gap: 3em;
grid-gap: var(--digi--layout--gutter);
}
&__main {
grid-area: main;
a {
text-decoration: none;
color: var(--digi--typography--color--link);
}
}
&__sidebar {
grid-area: sidebar;
}
&__sidebar-alert {
margin-top: 5%;
margin-top: var(--digi--layout--gutter);
}
&__footer {
grid-area: footer;