Skip to content

Commit b946efb

Browse files
author
Sine Jespersen
committed
Merge branch 'develop' into feature/menu-width-anonymous
2 parents 288299c + af4acc4 commit b946efb

File tree

12 files changed

+44
-13
lines changed

12 files changed

+44
-13
lines changed

src/stories/Blocks/header/header.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,9 @@
192192
.header__button {
193193
height: 56px;
194194
width: 56px;
195+
display: flex;
196+
justify-content: center;
197+
align-items: center;
195198

196199
@include breakpoint-s {
197200
height: 70px;

src/stories/Blocks/status-userprofile/status-userprofile.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,5 @@
1414
flex-basis: 50%;
1515
display: flex;
1616
flex-direction: column;
17-
row-gap: 16px;
1817
}
1918
}

src/stories/Blocks/status-userprofile/statusUserprofile.tsx

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,10 @@ export const StatusUserprofile = (props: StatusUserprofileProps) => {
3535
</div>
3636
))
3737
) : (
38-
<ListEmpty text="Du har i øjeblikket 0 fysiske lån" />
38+
<ListEmpty
39+
className="mt-16"
40+
text="Du har i øjeblikket 0 fysiske lån"
41+
/>
3942
)}
4043
</div>
4144
<div className="status-userprofile__column">
@@ -57,7 +60,10 @@ export const StatusUserprofile = (props: StatusUserprofileProps) => {
5760
</div>
5861
))
5962
) : (
60-
<ListEmpty text="Du har i øjebilkket 0 reserveringer" />
63+
<ListEmpty
64+
className="mt-16"
65+
text="Du har i øjebilkket 0 reserveringer"
66+
/>
6167
)}
6268
</div>
6369
</div>

src/stories/Library/Lists/list-empty/ListEmpty.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ import { Links, LinksProps } from "../../links/Links";
33
interface ListEmptyProps {
44
text: string;
55
links?: LinksProps[];
6+
className: string;
67
}
78

8-
const ListEmpty = ({ text, links }: ListEmptyProps) => {
9+
const ListEmpty = ({ text, links, className }: ListEmptyProps) => {
910
return (
10-
<div className="dpl-list-empty">
11+
<div className={`dpl-list-empty ${className}`}>
1112
{text}
1213
{links && (
1314
<div className="dpl-list-empty__links">

src/stories/Library/Lists/list-materials/ListMaterials.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ export const ListMaterials: FC<ListMaterialsProps> = ({
4242
<div className="list-materials__content-status">
4343
<StatusLabel {...statusMaterialType} />
4444
</div>
45-
<p className="text-header-h5 mt-8">{title}</p>
45+
<p className="list-materials__content__header mt-8">{title}</p>
4646
<p className="text-small-caption">
4747
{author} ({year})
4848
</p>
@@ -87,7 +87,7 @@ export const ListMaterials: FC<ListMaterialsProps> = ({
8787
<div className="list-materials__content-status">
8888
<div className="status-label status-label--outline">Bog</div>
8989
</div>
90-
<p className="text-header-h5 mt-8">{title}</p>
90+
<p className="list-materials__content__header mt-8">{title}</p>
9191
<p className="text-small-caption">
9292
{author} ({year})
9393
</p>

src/stories/Library/Lists/list-materials/list-materials.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@
2626
flex: 1;
2727
}
2828

29+
.list-materials__content__header {
30+
@extend %ellipsis-two-lines;
31+
@extend %text-header-h5;
32+
}
33+
2934
.list-materials--disabled {
3035
.checkbox {
3136
.checkbox__icon {

src/stories/Library/Lists/list-reservation/ListReservationsAndLoans.stories.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@ export const Item1 = Template.bind({});
2323
Item1.args = {
2424
cover: {
2525
type: "bog",
26-
title: "Mennesket i naturen",
27-
description: "Af Anton M. Berg (2020)",
26+
title:
27+
"Den utrolige historie om den kæmpestore pære (eller beretningen om, hvordan Jeronimus Bjergstrøm Severin Olsen blev genindsat i sit retmæssige embede som Solbys borgmester til glæde for alle byens indbyggere på nær én)",
28+
description: "Af Jakob Martin Strid ",
2829
image: "images/book_cover_5.jpg",
2930
url: "",
3031
noteLabel: "Du pålægges et gebyr, når materialet afleveres",

src/stories/Library/Lists/list-reservation/ListReservationsAndLoans.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@ export const ListReservationsAndLoans = (
4444
</div>
4545
<div className="list-reservation__about">
4646
<button className="list-reservation__header">
47-
{cover.title}
47+
<span className="list-reservation__header__text">
48+
{cover.title}
49+
</span>
4850
</button>
4951
<p className="text-small-caption color-secondary-gray">
5052
{cover.description}

src/stories/Library/Lists/list-reservation/list-reservation.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,10 @@ $list-reservation-space-desktop: 24px;
118118
}
119119
}
120120

121+
.list-reservation__header__text {
122+
@extend %ellipsis-two-lines;
123+
}
124+
121125
.list-reservation__status {
122126
height: 100%;
123127
display: grid;

src/stories/Library/Modals/modal-loan/ModalLoan.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ const listExpired: LoanMaterials = [
1919
list: [
2020
{
2121
year: "2001",
22-
title: "Audrey Hepburn",
23-
author: "Af Isabel Sánchez Vegara, Amaia Arrazola",
22+
title:
23+
"Den utrolige historie om den kæmpestore pære (eller beretningen om, hvordan Jeronimus Bjergstrøm Severin Olsen blev genindsat i sit retmæssige embede som Solbys borgmester til glæde for alle byens indbyggere på nær én)",
24+
author: "Af Jakob Martin Strid",
2425
statusMessage: "The item cannot be renewed further",
2526
isChecked: true,
2627
disabled: true,

0 commit comments

Comments
 (0)