diff --git a/src/App.vue b/src/App.vue index 3b1090ce..6bd794d1 100644 --- a/src/App.vue +++ b/src/App.vue @@ -453,7 +453,7 @@ export default defineComponent({ } .search-to-home-enter-from { - margin-top: -50px; + // margin-top: -50px; opacity: 0; position: relative; } @@ -492,7 +492,7 @@ export default defineComponent({ } .home-to-search-enter-from { - margin-top: -50px; + // margin-top: -50px; opacity: 0; position: relative; } @@ -526,7 +526,7 @@ export default defineComponent({ } .record-to-search-enter-from { - margin-top: -50px; + // margin-top: -50px; opacity: 0; position: relative; } @@ -580,7 +580,7 @@ export default defineComponent({ } .search-to-record-leave-to { - margin-top: -50px; + // margin-top: -50px; opacity: 0; position: relative; } diff --git a/src/assets/fonts/iconfont/material-icons.css b/src/assets/fonts/iconfont/material-icons.css index fc4d3f37..68018ab2 100644 --- a/src/assets/fonts/iconfont/material-icons.css +++ b/src/assets/fonts/iconfont/material-icons.css @@ -37,3 +37,41 @@ /* Support for IE. */ font-feature-settings: 'liga'; } +.category-image { + width: 16px; + height: 16px; + background-image: url('@/assets/icons/blue/diverse-blue.svg'); +} +.category-image.diverse { + background-image: url('@/assets/icons/blue/diverse-blue.svg'); +} +.category-image.dokumentar { + background-image: url('@/assets/icons/blue/dokumentar-blue.svg'); +} +.category-image.film-og-serier { + background-image: url('@/assets/icons/blue/fiktion-blue.svg'); +} +.category-image.kultur-og-oplysning { + background-image: url('@/assets/icons/blue/kultur-blue.svg'); +} +.category-image.livsstil { + background-image: url('@/assets/icons/blue/livsstil-blue.svg'); +} +.category-image.musik { + background-image: url('@/assets/icons/blue/musik-blue.svg'); +} +.category-image.nyheder-politik-og-samfund { + background-image: url('@/assets/icons/blue/nyheder-blue.svg'); +} +.category-image.sport { + background-image: url('@/assets/icons/blue/sport-blue.svg'); +} +.category-image.humor-quiz-og-underholdning { + background-image: url('@/assets/icons/blue/underholdning-blue.svg'); +} +.category-image.natur-og-videnskab { + background-image: url('@/assets/icons/blue/videnskab-blue.svg'); +} +.category-image.brn-og-unge { + background-image: url('@/assets/icons/blue/born-blue.svg'); +} \ No newline at end of file diff --git a/src/assets/styles/elements.css b/src/assets/styles/elements.css index 27423fb1..8e25e01f 100644 --- a/src/assets/styles/elements.css +++ b/src/assets/styles/elements.css @@ -15,7 +15,7 @@ --bg-secondary-light: #324666; --bg-secondary-light-20: #F0FBFF; --bg-header: #002e70; - --bg-footer: #002e70; + --bg-footer: #013277; /*colors*/ --color-main:#ea9fbc; @@ -27,7 +27,7 @@ /*borders*/ --color-border-active: #001C43; - --color-border-light:#96e2fd; + --color-border-light:#FBECF2; --color-border-golden:#e0b500; --color-border-success:#ea9fbc; --color-border-disabled:#757575; diff --git a/src/components/common/AdvancedSpot.vue b/src/components/common/AdvancedSpot.vue new file mode 100644 index 00000000..c2fa2ca0 --- /dev/null +++ b/src/components/common/AdvancedSpot.vue @@ -0,0 +1,171 @@ + + + + + + + {{ t('hero.progress', { index: Math.round(currentProgress) }) }} + + {{ t('hero.explanation') }} + + + + + + + + + + + + + + diff --git a/src/components/common/KBButton.vue b/src/components/common/KBButton.vue index f97516bb..863f8629 100644 --- a/src/components/common/KBButton.vue +++ b/src/components/common/KBButton.vue @@ -9,15 +9,17 @@ :style="customStyle" > {{ leftIconName }} {{ buttonText }} {{ rightIconName }} @@ -33,15 +35,17 @@ :style="customStyle" > {{ leftIconName }} {{ buttonText }} {{ rightIconName }} @@ -57,15 +61,17 @@ :style="customStyle" > {{ leftIconName }} {{ buttonText }} {{ rightIconName }} @@ -135,6 +141,18 @@ export default defineComponent({ return false; }, }, + customIconLeft: { + type: String, + default() { + return ''; + }, + }, + customIconRight: { + type: String, + default() { + return ''; + }, + }, }, setup(props) { const attrs = useAttrs(); @@ -164,6 +182,7 @@ export default defineComponent({ width: fit-content; min-height: 34px; line-height: 1; + box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.15); } .btn-text::first-letter { text-transform: capitalize; @@ -239,7 +258,6 @@ export default defineComponent({ /* Call to action buttons */ .btn-cta { border-radius: var(--rounded-medium); - box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.15); } .btn-cta .btn-text { border-bottom: 1px solid transparent; @@ -247,10 +265,10 @@ export default defineComponent({ transition: 200ms; } .btn-cta:not(:disabled):hover { - transition: all 5s ease 0s; - .btn-text { - border-color: var(--color-border-active); - } + transition: all 0.3s ease 0s; + background-color: var(--bg-main-2); + border-color: var(--color-border-light); + box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0); } .btn-cta.medium .material-icons { font-size: calc(var(--fs-lead) + 8px); diff --git a/src/components/common/PortalContent.vue b/src/components/common/PortalContent.vue index 03742bd0..4f5f99b6 100644 --- a/src/components/common/PortalContent.vue +++ b/src/components/common/PortalContent.vue @@ -1,5 +1,6 @@ + diff --git a/src/components/common/SimpleSpot.vue b/src/components/common/SimpleSpot.vue new file mode 100644 index 00000000..25d2ba60 --- /dev/null +++ b/src/components/common/SimpleSpot.vue @@ -0,0 +1,131 @@ + + + + + {{ iconName }} + + + + + + + + + diff --git a/src/components/common/SpotCategories.vue b/src/components/common/SpotCategories.vue new file mode 100644 index 00000000..30bd9b83 --- /dev/null +++ b/src/components/common/SpotCategories.vue @@ -0,0 +1,245 @@ + + + + {{ categories.length }} kategorier: + + + + + + + kategorier: + + + + + + + + + + + + + + diff --git a/src/components/common/SpotContainer.vue b/src/components/common/SpotContainer.vue new file mode 100644 index 00000000..9da4c545 --- /dev/null +++ b/src/components/common/SpotContainer.vue @@ -0,0 +1,81 @@ + + + + + + + + En kasse til noget display 349.994 minutters noget helt tilbage fra 1931. + + + + {{ t('hero.linkText') }} + + + + + + + + + + diff --git a/src/views/Home.vue b/src/views/Home.vue index 2f11e0fe..0744e454 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -51,6 +51,7 @@ temporary styling until patterns from design system are implemented padding-right: 12px; padding-left: 12px; background-color: var(--bg-default); + /* margin-top: -85px; */ } .home-container {
+ {{ t('hero.explanation') }} +