DMC/studentportalen
1
1
Fork 0
Code Issues 24 Pull Requests 3 Actions Projects 1 Wiki Activity

List components #31

Open
stne3960 wants to merge 57 commits from list_item into main
pull from: list_item
merge into: DMC:main
Conversation 10 Commits 57 Files Changed 30 +40 -8
1 changed files with 40 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit edca5aec6f - Show all commits

48
frontend/src/index.css
View File

@ -166,75 +166,107 @@
/* Text styles - Body */ /* Text styles - Body */
.body-light-sm { .body-light-sm {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
font-family: "TheSans Light", "TheSans", system-ui, sans-serif; font-family: "TheSans Light", "TheSans", system-ui, sans-serif;
======= =======
font-family: 'TheSans Light', 'TheSans', system-ui, sans-serif; font-family: 'TheSans Light', 'TheSans', system-ui, sans-serif;
>>>>>>> 91e7d0f (Add font family and text styles) >>>>>>> 91e7d0f (Add font family and text styles)
=======
font-family: 'TheSans Light', 'TheSans', system-ui, sans-serif;
>>>>>>> 67f45746ca5a15f1bc7d955ff66e9c0d02739f88
font-size: 14px; font-size: 14px;
} }
.body-normal-md { .body-normal-md {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
font-family: "TheSans SemiLight", "TheSans", system-ui, sans-serif; font-family: "TheSans SemiLight", "TheSans", system-ui, sans-serif;
======= =======
font-family: 'TheSans SemiLight', 'TheSans', system-ui, sans-serif; font-family: 'TheSans SemiLight', 'TheSans', system-ui, sans-serif;
>>>>>>> 91e7d0f (Add font family and text styles) >>>>>>> 91e7d0f (Add font family and text styles)
=======
font-family: 'TheSans SemiLight', 'TheSans', system-ui, sans-serif;
>>>>>>> 67f45746ca5a15f1bc7d955ff66e9c0d02739f88
font-size: 16px; font-size: 16px;
} }
.body-normal-lg { .body-normal-lg {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
font-family: "TheSans SemiLight", "TheSans", system-ui, sans-serif; font-family: "TheSans SemiLight", "TheSans", system-ui, sans-serif;
======= =======
font-family: 'TheSans SemiLight', 'TheSans', system-ui, sans-serif; font-family: 'TheSans SemiLight', 'TheSans', system-ui, sans-serif;
>>>>>>> 91e7d0f (Add font family and text styles) >>>>>>> 91e7d0f (Add font family and text styles)
=======
font-family: 'TheSans SemiLight', 'TheSans', system-ui, sans-serif;
>>>>>>> 67f45746ca5a15f1bc7d955ff66e9c0d02739f88
font-size: 18px; font-size: 18px;
} }
.body-semibold-md { .body-semibold-md {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
font-family: "TheSans Plain", "TheSans", system-ui, sans-serif; font-family: "TheSans Plain", "TheSans", system-ui, sans-serif;
======= =======
font-family: 'TheSans Plain', 'TheSans', system-ui, sans-serif; font-family: 'TheSans Plain', 'TheSans', system-ui, sans-serif;
>>>>>>> 91e7d0f (Add font family and text styles) >>>>>>> 91e7d0f (Add font family and text styles)
=======
font-family: 'TheSans Plain', 'TheSans', system-ui, sans-serif;
>>>>>>> 67f45746ca5a15f1bc7d955ff66e9c0d02739f88
font-size: 16px; font-size: 16px;
} }
.body-semibold-lg { .body-semibold-lg {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
font-family: "TheSans Plain", "TheSans", system-ui, sans-serif; font-family: "TheSans Plain", "TheSans", system-ui, sans-serif;
======= =======
font-family: 'TheSans Plain', 'TheSans', system-ui, sans-serif; font-family: 'TheSans Plain', 'TheSans', system-ui, sans-serif;
>>>>>>> 91e7d0f (Add font family and text styles) >>>>>>> 91e7d0f (Add font family and text styles)
=======
font-family: 'TheSans Plain', 'TheSans', system-ui, sans-serif;
>>>>>>> 67f45746ca5a15f1bc7d955ff66e9c0d02739f88
font-size: 18px; font-size: 18px;
} }
.body-bold-md { .body-bold-md {
<<<<<<< HEAD <<<<<<< HEAD
font-family: "TheSans SemiBold", "TheSans", system-ui, sans-serif;
=======
font-family: 'TheSans SemiBold', 'TheSans', system-ui, sans-serif;
>>>>>>> 91e7d0f (Add font family and text styles)
font-size: 16px;
}
.body-bold-lg {
<<<<<<< HEAD <<<<<<< HEAD
font-family: "TheSans SemiBold", "TheSans", system-ui, sans-serif; font-family: "TheSans SemiBold", "TheSans", system-ui, sans-serif;
======= =======
font-family: 'TheSans SemiBold', 'TheSans', system-ui, sans-serif; font-family: 'TheSans SemiBold', 'TheSans', system-ui, sans-serif;
>>>>>>> 91e7d0f (Add font family and text styles) >>>>>>> 91e7d0f (Add font family and text styles)
=======
font-family: 'TheSans SemiBold', 'TheSans', system-ui, sans-serif;
>>>>>>> 67f45746ca5a15f1bc7d955ff66e9c0d02739f88
font-size: 16px;
}
.body-bold-lg {
<<<<<<< HEAD
<<<<<<< HEAD
font-family: "TheSans SemiBold", "TheSans", system-ui, sans-serif;
=======
font-family: 'TheSans SemiBold', 'TheSans', system-ui, sans-serif;
>>>>>>> 91e7d0f (Add font family and text styles)
=======
font-family: 'TheSans SemiBold', 'TheSans', system-ui, sans-serif;
>>>>>>> 67f45746ca5a15f1bc7d955ff66e9c0d02739f88
font-size: 18px; font-size: 18px;
} }
/* Text styles - Heading */ /* Text styles - Heading */
.heading-semibold-lg { .heading-semibold-lg {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
font-family: "TheSans SemiBold", "TheSans", system-ui, sans-serif; font-family: "TheSans SemiBold", "TheSans", system-ui, sans-serif;
======= =======
font-family: 'TheSans SemiBold', 'TheSans', system-ui, sans-serif; font-family: 'TheSans SemiBold', 'TheSans', system-ui, sans-serif;
>>>>>>> 91e7d0f (Add font family and text styles) >>>>>>> 91e7d0f (Add font family and text styles)
=======
font-family: 'TheSans SemiBold', 'TheSans', system-ui, sans-serif;
>>>>>>> 67f45746ca5a15f1bc7d955ff66e9c0d02739f88
font-size: 32px; font-size: 32px;
} }