Skip to content

Commit 002c0b9

Browse files
authored
Merge pull request #513 from navikt/TOLK-3614
TOLK-3614 : Kurs - Erstatt den utdaterte knappen og oppdater border color på boksene
2 parents 171728b + 9af6ed9 commit 002c0b9

4 files changed

Lines changed: 31 additions & 20 deletions

File tree

force-app/main/default/lwc/courseRegistrationForm/courseRegistrationForm.css

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,16 @@
6161
}
6262

6363
.omKurset__panel {
64-
/*margin-top: 1rem;*/
6564
padding-bottom: 2.5rem;
65+
border: 1px solid #457c9d;
6666
}
6767

6868
.panel,
6969
.panel--stor {
7070
background-color: #fff;
7171
display: block;
7272
border-radius: 4px;
73+
border: 1px solid #457c9d;
7374
}
7475

7576
.metainfo__panel {
@@ -81,7 +82,10 @@
8182

8283
.typo-systemtittel {
8384
margin: 0;
84-
font-family: Source Sans Pro, Arial, sans-serif;
85+
font-family:
86+
Source Sans Pro,
87+
Arial,
88+
sans-serif;
8589
font-size: 1.375rem;
8690
line-height: 1.625rem;
8791
font-weight: 600;
@@ -160,7 +164,10 @@
160164
display: inline-grid;
161165
place-items: center;
162166
font-weight: 600;
163-
font-family: Source Sans Pro, Arial, sans-serif;
167+
font-family:
168+
Source Sans Pro,
169+
Arial,
170+
sans-serif;
164171
font-size: 1em;
165172
white-space: nowrap;
166173
border-radius: 0.125em;
@@ -223,17 +230,6 @@
223230
margin-top: 1rem;
224231
}
225232

226-
.btn2 {
227-
background-color: #0067c5;
228-
border-color: #0067c5;
229-
border: 2px solid #0067c5;
230-
color: #fff;
231-
margin-left: 1em;
232-
padding: 0.5rem;
233-
box-shadow: 0 2px 0 #c6c2bf;
234-
border-radius: 0.125em;
235-
}
236-
237233
.padding-small {
238234
padding-top: 0.75rem;
239235
padding-right: 0.75rem;
@@ -277,6 +273,10 @@
277273
fill: #0067c5;
278274
}
279275

276+
.access-text__header {
277+
font-size: 1.125rem;
278+
}
279+
280280
.skjemaelement__label {
281281
font-weight: 600;
282282
display: block;

force-app/main/default/lwc/courseRegistrationForm/courseRegistrationForm.html

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,9 @@ <h2 style="font-size: 1.2rem" class="omKurset__overskrift">
5959
</h2>
6060

6161
<div class="inline">
62-
<label for="invCode" class="skjemaelement__label">Tast inn din tilgangskode</label>
62+
<label for="invCode" class="access-text__header skjemaelement__label"
63+
>Tast inn din tilgangskode</label
64+
>
6365
<input
6466
type="text"
6567
class="skjemaelement__input"
@@ -70,9 +72,14 @@ <h2 style="font-size: 1.2rem" class="omKurset__overskrift">
7072
required
7173
/>
7274

73-
<button title="Vis aktivitet" class="btn2" type="submit" onclick={validateCode}>
74-
Vis aktivitet
75-
</button>
75+
<c-button
76+
button-label="Vis aktivitet"
77+
type="submit"
78+
onbuttonclick={validateCode}
79+
desktop-style="margin: 0.5rem"
80+
mobile-style="margin: 0.5rem"
81+
>
82+
</c-button>
7683
</div>
7784
<br />
7885
</form>

force-app/main/default/lwc/courseRegistrationInformation/courseRegistrationInformation.css

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@
1212

1313
.typo-element,
1414
.typo-feilmelding {
15-
font-family: Source Sans Pro, Arial, sans-serif;
15+
font-family:
16+
Source Sans Pro,
17+
Arial,
18+
sans-serif;
1619
font-size: 1rem;
1720
line-height: 1.375rem;
1821
/* font-weight: 600;*/
@@ -40,6 +43,7 @@
4043
display: flex;
4144
flex-direction: column;
4245
margin-bottom: 1rem;
46+
border: 1px solid #457c9d;
4347
}
4448

4549
.panel,

force-app/main/default/lwc/courseRegistrationInformation/courseRegistrationInformation.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</div>
1818
<div class="metainfo__egenskap">
1919
<img class="metainfo__ikon" src={staricon} alt="" />
20-
<p class="typo-element metainfo__infoTekst">Type kurs: {type}</p>
20+
<p class="typo-element metainfo__infoTekst">Type: {type}</p>
2121
</div>
2222
<div class="metainfo__egenskap">
2323
<img class="metainfo__ikon" src={staricon} alt="" />

0 commit comments

Comments
 (0)