Skip to content

Commit 09f4d28

Browse files
olsenrasmusolsenrasmus
authored
Merge pull request #330 from navikt/Bytte-dekoratør
TOLK-2366 : Oppdatere NAV design på Kurs experience site
2 parents cb515e3 + 147c8dc commit 09f4d28

File tree

6 files changed

+103
-73
lines changed

6 files changed

+103
-73
lines changed

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

+12-3
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,10 @@
329329
font-size: 1.5rem;
330330
line-height: 1.75rem;
331331
}
332+
.typo-normal {
333+
font-size: 1rem;
334+
line-height: 1.75rem;
335+
}
332336
}
333337

334338
@media (max-width: 500px) {
@@ -403,14 +407,19 @@
403407
.decorator-wrapper .brodsmulesti li > * {
404408
margin: 0.25rem 0.25rem 0.25rem 0;
405409
}
406-
407-
.decorator-wrapper .brodsmulesti li .chevron--hoyre {
410+
.chevron {
408411
color: #78706a;
409412
display: inline-block;
410413
margin: 0 0.5em;
414+
display: inline-block;
415+
width: 10px; /* Adjust width as needed */
416+
height: 10px; /* Adjust height as needed */
417+
border-top: 2px solid #78706a; /* Adjust color and thickness as needed */
418+
border-right: 2px solid #78706a; /* Adjust color and thickness as needed */
419+
transform: rotate(45deg); /* Rotate the chevron */
411420
}
412421

413-
.decorator-wrapper .chevron--hoyre {
422+
.chevron--hoyre {
414423
display: inline-block;
415424
flex-shrink: 0;
416425
height: 2px;

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,22 @@
99
<li class="typo-normal">
1010
<a href="https://www.nav.no" class="lenke brodsmulesti__home"
1111
><img src={houseicon} alt="" class="brodsmulesti__icon" /> <span>nav.no</span
12-
><i class="nav-frontend-chevron chevronboks chevron--hoyre"></i
12+
><i class="chevron"></i
1313
></a>
1414
</li>
1515
<li class="typo-normal">
1616
<a href="https://www.nav.no/no/bedrift" class="lenke"
17-
><span>Arbeidsgiver</span><i class="nav-frontend-chevron chevronboks chevron--hoyre"></i
17+
><span>Arbeidsgiver</span><i class="chevron"></i
1818
></a>
1919
</li>
2020
<li class="typo-normal" aria-current="false">
2121
<a href="https://arbeidsgiver.nav.no/kursoversikt/" class="lenke brodsmulesti__transform"
22-
><span>Kurskalender</span><i class="nav-frontend-chevron chevronboks chevron--hoyre"></i
22+
><span>Kurskalender</span><i class="chevron"></i
2323
></a>
2424
</li>
2525
<li class="typo-normal" aria-current="false">
2626
<a href={url} class="lenke brodsmulesti__transform"
27-
><span>Om kurset</span><i class="nav-frontend-chevron chevronboks chevron--hoyre"></i
27+
><span>Om kurset</span><i class="chevron"></i
2828
></a>
2929
</li>
3030
<li class="typo-normal" aria-current="page">

‎force-app/main/default/lwc/courseRegistrationForm/courseRegistrationForm.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { NavigationMixin } from 'lightning/navigation';
33
import createRegistration from '@salesforce/apex/CourseRegistrationController.createRegistration';
44
import getCourseFields from '@salesforce/apex/CourseRegistrationController.getCourseFields';
55
import icons from '@salesforce/resourceUrl/icons';
6+
import houseIconNew from '@salesforce/resourceUrl/houseicon2';
67

78
export default class CourseRegistrationForm extends NavigationMixin(LightningElement) {
89
@track courseId;
@@ -46,7 +47,7 @@ export default class CourseRegistrationForm extends NavigationMixin(LightningEle
4647
successicon = icons + '/successicon.svg';
4748
erroricon = icons + '/erroricon.svg';
4849
chevrondown = icons + '/chevrondown.svg';
49-
houseicon = icons + '/houseicon.svg';
50+
houseicon = houseIconNew;
5051

5152
connectedCallback() {
5253
this.parameters = this.getQueryParameters();

‎force-app/main/default/staticresources/houseicon2.resource-meta.xml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<StaticResource xmlns="http://soap.sforce.com/2006/04/metadata">
3+
<cacheControl>Public</cacheControl>
4+
<contentType>image/svg+xml</contentType>
5+
</StaticResource>

‎force-app/main/default/staticresources/houseicon2.svg

+3
Loading

‎force-app/unpackagable/experiences/Kurs1/views/pamelding.json

+77-65
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,78 @@
11
{
2-
"appPageId" : "cb9e40c7-011a-4ff4-beca-31a17b141ae3",
3-
"componentName" : "siteforce:sldsOneColLayout",
4-
"dataProviders" : [ ],
5-
"id" : "b0d3525e-ab7a-4035-a41b-dca36c4d99a4",
6-
"label" : "Pamelding",
7-
"regions" : [ {
8-
"components" : [ {
9-
"componentAttributes" : {
10-
"NAVarea" : "Arbeidsgiver"
11-
},
12-
"componentName" : "c:globalCommunityHeader",
13-
"id" : "455afb95-379d-445d-9418-a183a38dfa4c",
14-
"renderPriority" : "NEUTRAL",
15-
"renditionMap" : { },
16-
"type" : "component"
17-
} ],
18-
"id" : "9b66a000-346f-4b37-8f95-534d146308c5",
19-
"regionName" : "header",
20-
"type" : "region"
21-
}, {
22-
"components" : [ {
23-
"componentAttributes" : { },
24-
"componentName" : "c:courseRegistrationForm",
25-
"id" : "5e7959c9-4599-4ea5-a425-b91f5e0a44d0",
26-
"renderPriority" : "NEUTRAL",
27-
"renditionMap" : { },
28-
"type" : "component"
29-
} ],
30-
"id" : "e11b7029-d0da-4b0e-bfaf-8375fb852845",
31-
"regionName" : "content",
32-
"type" : "region"
33-
}, {
34-
"components" : [ {
35-
"componentAttributes" : {
36-
"NAVarea" : "Arbeidsgiver"
37-
},
38-
"componentName" : "c:globalCommunityFooter",
39-
"id" : "a6522d52-b833-4c1e-987a-b9b9e93644b4",
40-
"renderPriority" : "NEUTRAL",
41-
"renditionMap" : { },
42-
"type" : "component"
43-
} ],
44-
"id" : "ef28094e-53e8-4616-977b-5977d9f9cb12",
45-
"regionName" : "footer",
46-
"type" : "region"
47-
}, {
48-
"components" : [ {
49-
"componentAttributes" : {
50-
"customHeadTags" : "",
51-
"description" : "",
52-
"title" : "Pamelding"
53-
},
54-
"componentName" : "forceCommunity:seoAssistant",
55-
"id" : "4ebc559c-c6c6-477e-ace3-7213de73ee5f",
56-
"renditionMap" : { },
57-
"type" : "component"
58-
} ],
59-
"id" : "e39a491b-a21d-42e7-a0ef-4f75c1ee3320",
60-
"regionName" : "sfdcHiddenRegion",
61-
"type" : "region"
62-
} ],
63-
"themeLayoutType" : "Inner",
64-
"type" : "view",
65-
"viewType" : "custom-pamelding"
66-
}
2+
"appPageId": "cb9e40c7-011a-4ff4-beca-31a17b141ae3",
3+
"componentName": "siteforce:sldsOneColLayout",
4+
"dataProviders": [],
5+
"id": "b0d3525e-ab7a-4035-a41b-dca36c4d99a4",
6+
"label": "Pamelding",
7+
"regions": [
8+
{
9+
"components": [
10+
{
11+
"componentAttributes": {
12+
"context": "Privatperson",
13+
"env": "Dev"
14+
},
15+
"componentName": "c:decoratorHeader",
16+
"id": "84cf6fa0-764c-4dcc-9cd5-23097d198b2a",
17+
"renderPriority": "NEUTRAL",
18+
"renditionMap": {},
19+
"type": "component"
20+
}
21+
],
22+
"id": "9b66a000-346f-4b37-8f95-534d146308c5",
23+
"regionName": "header",
24+
"type": "region"
25+
},
26+
{
27+
"components": [
28+
{
29+
"componentAttributes": {},
30+
"componentName": "c:courseRegistrationForm",
31+
"id": "5e7959c9-4599-4ea5-a425-b91f5e0a44d0",
32+
"renderPriority": "NEUTRAL",
33+
"renditionMap": {},
34+
"type": "component"
35+
}
36+
],
37+
"id": "e11b7029-d0da-4b0e-bfaf-8375fb852845",
38+
"regionName": "content",
39+
"type": "region"
40+
},
41+
{
42+
"components": [
43+
{
44+
"componentAttributes": {},
45+
"componentName": "c:decoratorFooter",
46+
"id": "4cbbd44d-9490-41f3-a4f1-331ecf79d6ee",
47+
"renderPriority": "NEUTRAL",
48+
"renditionMap": {},
49+
"type": "component"
50+
}
51+
],
52+
"id": "ef28094e-53e8-4616-977b-5977d9f9cb12",
53+
"regionName": "footer",
54+
"type": "region"
55+
},
56+
{
57+
"components": [
58+
{
59+
"componentAttributes": {
60+
"customHeadTags": "",
61+
"description": "",
62+
"title": "Pamelding"
63+
},
64+
"componentName": "forceCommunity:seoAssistant",
65+
"id": "4ebc559c-c6c6-477e-ace3-7213de73ee5f",
66+
"renditionMap": {},
67+
"type": "component"
68+
}
69+
],
70+
"id": "e39a491b-a21d-42e7-a0ef-4f75c1ee3320",
71+
"regionName": "sfdcHiddenRegion",
72+
"type": "region"
73+
}
74+
],
75+
"themeLayoutType": "Inner",
76+
"type": "view",
77+
"viewType": "custom-pamelding"
78+
}

0 commit comments

Comments
 (0)