diff --git a/api/collections/fieldLists/column.yml b/api/collections/fieldLists/column.yml index 72128f7..6164e02 100644 --- a/api/collections/fieldLists/column.yml +++ b/api/collections/fieldLists/column.yml @@ -148,12 +148,36 @@ meta: label: Zeilen Nr (0 Basiert) + - name: extendableRowNr + type: number + meta: + label: Ausfahrbare boxreihe (0 Basiert) + - name: image type: file meta: label: Bild dependsOn: eval: $parent.contentType == 'image' + +- name: icons + type: object[] + meta: + label: Icons + helperText: "Für Personpreview xing und linkedin icons gedacht." + dependsOn: + eval: $parent.contentType == 'image' + subFields: + - name: icon + type: file + meta: + label: Icon + + - name: link + type: string + meta: + label: Link + - name: iconCycleSquare type: object meta: diff --git a/frontend/src/App.svelte b/frontend/src/App.svelte index 8a6b203..06febef 100644 --- a/frontend/src/App.svelte +++ b/frontend/src/App.svelte @@ -33,7 +33,6 @@ pagesRes[e.path] = e }) $pages = pagesRes - console.log(pagesRes) } async function getNavigation() { @@ -90,7 +89,10 @@ .HP { h2 { - font-size: 3.2rem !important; + font-size: 2.1rem !important; + @media @tablet { + font-size: 3.2rem !important; + } } } .swiper-button-prev, diff --git a/frontend/src/lib/assets/css/base.less b/frontend/src/lib/assets/css/base.less index 6890e97..a8d7dea 100644 --- a/frontend/src/lib/assets/css/base.less +++ b/frontend/src/lib/assets/css/base.less @@ -141,9 +141,12 @@ swiper-slide { left: 0px; bottom: 0px; background: #000000; - height: 10px; + height: 5px; width: 0; animation: underlineEffect 4s linear forwards; + @media @tablet { + height: 10px; + } } &:not(.active) .underline { @@ -151,3 +154,23 @@ swiper-slide { } } } + +*::-webkit-scrollbar { + width: 10px; /* width of the entire scrollbar */ + height: 10px; +} + +*::-webkit-scrollbar-track { + background: rgb(0, 0, 0); /* color of the tracking area */ +} + +*::-webkit-scrollbar-thumb { + background-color: rgb(255, 255, 255); /* color of the scroll thumb */ + border-radius: 20px; /* roundness of the scroll thumb */ + //border: 3px solid black; /* creates padding around scroll thumb */ +} + +* { + scrollbar-width: thin; /* "auto" or "thin" */ + scrollbar-color: rgb(255, 255, 255) rgb(0, 0, 0); /* scroll thumb and track */ +} diff --git a/frontend/src/lib/components/Footer.svelte b/frontend/src/lib/components/Footer.svelte index 272ef0e..00e8482 100644 --- a/frontend/src/lib/components/Footer.svelte +++ b/frontend/src/lib/components/Footer.svelte @@ -5,7 +5,7 @@ $: nextpage = $navigation?.pages[0] function getNextPage(pages) { if (location.pathname == "/" || location.pathname == "") return - + let currPage = pages.find( (page) => Object.values($pages)?.find((o) => o.id == page.page)?.path == location.pathname ) @@ -18,31 +18,37 @@ nextIndex = currIndex + 1 } nextpage = pages[nextIndex] - console.log(nextpage, pages, nextIndex) } setInterval(() => { getNextPage($navigation.pages) }, 1000) + let showNext = true $: { if ($rerender) { if (location.pathname != "/") { getNextPage($navigation.pages) } + if (location.pathname.split("/").length >= 2) { + showNext = false + } else { + showNext = true + } } }