Skip to content

Commit 404d48a

Browse files
authored
Merge pull request #1937 from navikt/fixPadding
fixed padding
2 parents bc6d55d + 1fd8f0f commit 404d48a

File tree

8 files changed

+31
-24
lines changed

8 files changed

+31
-24
lines changed

force-app/nksHomePage/lwc/nksHomePageCurrent/nksHomePageCurrent.css

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,18 @@
55
.slds-card__footer {
66
border-top: none !important;
77
justify-content: start;
8-
padding: 0 1rem 1rem 1rem;
98
}
109

1110
.header-icon {
1211
background-color: #4bca81;
1312
}
1413

15-
.slds-card__header {
16-
padding-top: 1rem;
14+
.slds-card {
15+
padding: 1.25rem 1rem;
1716
}
1817

19-
.slds-card__body {
20-
padding: 0 1rem;
18+
.slds-card__body,
19+
.slds-card__footer,
20+
.slds-card__header {
21+
padding: 0;
2122
}

force-app/nksHomePage/lwc/nksHomePageCurrent/nksHomePageCurrent.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
></lightning-icon>
1212
</div>
1313
<div class="slds-media__body">
14-
<h2 class="slds-text-heading_medium slds-truncate">{cardLabel}</h2>
14+
<h2 class="slds-card__header-title slds-truncate">{cardLabel}</h2>
1515
</div>
1616
<div class="slds-no-flex">
1717
<div lwc:if={hasPermission} class={buttonClass}>

force-app/nksHomePage/lwc/nksHomePageHighlightPanelTop/nksHomePageHighlightPanelTop.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
display: flex;
55
align-items: center;
66
justify-content: center;
7-
padding: 1rem;
7+
padding: 1.25rem 1rem 1rem 1rem;
88
}
99

1010
.icon-container {

force-app/nksHomePage/lwc/nksHomePageList/nksHomePageList.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,7 @@
22
overflow: hidden;
33
max-width: 100%;
44
}
5+
6+
.slds-card {
7+
padding: 1.25rem 1rem;
8+
}

force-app/nksHomePage/lwc/nksHomePageList/nksHomePageList.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<template lwc:if={hasRecord}>
3-
<section class="slds-box slds-theme_default slds-is-relative" aria-labelledby="nav1">
3+
<section class="slds-card slds-theme_default slds-is-relative" aria-labelledby="nav1">
44
<template lwc:if={showSpinner}>
55
<div class="slds-spinner_container">
66
<lightning-spinner alternative-text="Laster" size="medium" variant="brand"></lightning-spinner>
@@ -18,7 +18,7 @@
1818
</div>
1919
</template>
2020
<div class="slds-media__body">
21-
<h2 id="nav1" class="slds-text-heading_medium slds-truncate">{cardLabel}</h2>
21+
<h2 class="slds-card__header-title slds-truncate">{cardLabel}</h2>
2222
</div>
2323
<template lwc:if={enableRefresh}>
2424
<lightning-button-icon

force-app/nksHomePage/lwc/nksHomePageListEntry/nksHomePageListEntry.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ img {
1212
}
1313

1414
.title {
15-
font-size: 1.17rem;
15+
font-size: 1.075rem;
1616
font-weight: 600;
17-
color: black;
17+
color: #03234d;
1818
}
1919

2020
.summary {
Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
.icon {
22
background-color: rgb(211, 54, 54);
3-
}
3+
}
4+
5+
.slds-card {
6+
padding: 1.25rem 1rem;
7+
}

force-app/nksHomePage/lwc/nksHomePageText/nksHomePageText.html

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
22
<!-- Operational Card -->
33
<template lwc:if={showOperational}>
4-
<section class="slds-box slds-theme_default slds-m-bottom_none">
4+
<section class="slds-card slds-theme_default slds-m-bottom_none">
55
<div class="slds-media slds-media_center slds-align_absolute-center slds-var-p-bottom_small">
66
<div class="slds-media__figure">
77
<lightning-icon
@@ -15,15 +15,15 @@
1515
<h2 class="slds-text-heading_medium slds-truncate">{cardTitle}</h2>
1616
</div>
1717
</div>
18-
<p class="slds-var-p-horizontal_medium">
18+
<p>
1919
<lightning-formatted-rich-text value={information}></lightning-formatted-rich-text>
2020
</p>
2121
</section>
2222
</template>
2323

2424
<!-- Salesforce Update Card -->
2525
<template lwc:elseif={showSalesforceUpdate}>
26-
<section class="slds-box slds-theme_default slds-m-bottom_none">
26+
<section class="slds-card slds-theme_default slds-m-bottom_none">
2727
<div class="slds-media slds-media_center slds-align_absolute-center slds-var-p-bottom_small">
2828
<div class="slds-media__figure">
2929
<lightning-icon
@@ -37,7 +37,7 @@ <h2 class="slds-text-heading_medium slds-truncate">{cardTitle}</h2>
3737
<h2 class="slds-text-heading_medium slds-truncate">{cardTitle}</h2>
3838
</div>
3939
</div>
40-
<p class="slds-var-p-horizontal_medium">
40+
<p>
4141
<lightning-formatted-rich-text value={information}></lightning-formatted-rich-text>
4242
</p>
4343
<div class="slds-var-p-top_small">
@@ -49,7 +49,7 @@ <h2 class="slds-text-heading_medium slds-truncate">{cardTitle}</h2>
4949

5050
<!-- Traffic Card -->
5151
<template lwc:elseif={isTraffic}>
52-
<section class="slds-box slds-theme_default slds-is-relative">
52+
<section class="slds-card slds-theme_default slds-is-relative">
5353
<template lwc:if={showSpinner}>
5454
<div class="slds-spinner_container">
5555
<lightning-spinner title="Loading" size="small" type="brand"></lightning-spinner>
@@ -67,13 +67,12 @@ <h2 class="slds-text-heading_medium slds-truncate">{cardTitle}</h2>
6767
</div>
6868
</template>
6969
<div class="slds-media__body">
70-
<h2 class="slds-text-heading_medium slds-truncate">{cardTitle}</h2>
70+
<h2 class="slds-card__header-title slds-truncate">{cardTitle}</h2>
7171
</div>
7272
<div class="slds-var-p-right_small">
73-
<p>Sist oppdatert:&nbsp;
74-
<template lwc:if={isLastUpdatedToday}>
75-
i dag
76-
</template>
73+
<p>
74+
Sist oppdatert:&nbsp;
75+
<template lwc:if={isLastUpdatedToday}> i dag </template>
7776
<template lwc:else>
7877
<lightning-formatted-date-time
7978
value={lastModifiedDate}
@@ -86,7 +85,6 @@ <h2 class="slds-text-heading_medium slds-truncate">{cardTitle}</h2>
8685
</template>
8786
</p>
8887
</div>
89-
9088
<template lwc:if={enableRefresh}>
9189
<lightning-button-icon
9290
class="slds-float_right"
@@ -97,7 +95,7 @@ <h2 class="slds-text-heading_medium slds-truncate">{cardTitle}</h2>
9795
</template>
9896
</div>
9997
<template lwc:if={information}>
100-
<p class="slds-var-p-horizontal_medium">
98+
<p>
10199
<lightning-formatted-rich-text value={information}></lightning-formatted-rich-text>
102100
</p>
103101
<template lwc:if={hasOpeningHours}>

0 commit comments

Comments
 (0)