From 301b74f6555b973fe6b5ac5480630dcb35ce4ecb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Chamier-Ciemi=C5=84ski?= Date: Mon, 15 Nov 2021 12:36:49 +0100 Subject: [PATCH 1/2] chore: changes to colors variables and font --- packages/nuxt-typo3-theme/.storybook/preview-head.html | 2 +- .../nuxt-typo3-theme/src/components/UiNavbar/UiNavbar.vue | 2 +- .../UiNavigation/UiNavigationLink/UiNavigationLink.vue | 4 ++-- .../UiNavigation/UiNavigationList/UiNavigationList.vue | 2 +- packages/nuxt-typo3-theme/src/nuxt/module.ts | 2 +- packages/nuxt-typo3-theme/src/styles/shared/_variables.scss | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/nuxt-typo3-theme/.storybook/preview-head.html b/packages/nuxt-typo3-theme/.storybook/preview-head.html index 05c268d..7873f0c 100644 --- a/packages/nuxt-typo3-theme/.storybook/preview-head.html +++ b/packages/nuxt-typo3-theme/.storybook/preview-head.html @@ -1,2 +1,2 @@ - + diff --git a/packages/nuxt-typo3-theme/src/components/UiNavbar/UiNavbar.vue b/packages/nuxt-typo3-theme/src/components/UiNavbar/UiNavbar.vue index c05983b..d5d1db2 100644 --- a/packages/nuxt-typo3-theme/src/components/UiNavbar/UiNavbar.vue +++ b/packages/nuxt-typo3-theme/src/components/UiNavbar/UiNavbar.vue @@ -149,7 +149,7 @@ export default defineComponent({ } &__logo { - flex: 1; + flex: 0 1 200px; } &__nav { diff --git a/packages/nuxt-typo3-theme/src/components/UiNavigation/UiNavigationLink/UiNavigationLink.vue b/packages/nuxt-typo3-theme/src/components/UiNavigation/UiNavigationLink/UiNavigationLink.vue index d568fb7..550b8a4 100644 --- a/packages/nuxt-typo3-theme/src/components/UiNavigation/UiNavigationLink/UiNavigationLink.vue +++ b/packages/nuxt-typo3-theme/src/components/UiNavigation/UiNavigationLink/UiNavigationLink.vue @@ -119,11 +119,11 @@ export default defineComponent({ &.nuxt-link-exact-active { @include media-query(max-width $ui-navbar-break-on) { color: #fff; - background: var(--color-bg-secondary); + background: var(--color-primary); } @include media-query($ui-navbar-break-on) { - border-color: var(--color-bg-secondary); + border-color: var(--color-primary); } } diff --git a/packages/nuxt-typo3-theme/src/components/UiNavigation/UiNavigationList/UiNavigationList.vue b/packages/nuxt-typo3-theme/src/components/UiNavigation/UiNavigationList/UiNavigationList.vue index 39e653d..97510ab 100644 --- a/packages/nuxt-typo3-theme/src/components/UiNavigation/UiNavigationList/UiNavigationList.vue +++ b/packages/nuxt-typo3-theme/src/components/UiNavigation/UiNavigationList/UiNavigationList.vue @@ -115,7 +115,7 @@ export default defineComponent({ position: absolute; flex-direction: column; min-width: 100%; - background: white; + background: var(--ui-navbar-bg); border: 1px solid black; border-top: 0; diff --git a/packages/nuxt-typo3-theme/src/nuxt/module.ts b/packages/nuxt-typo3-theme/src/nuxt/module.ts index 9f82be0..59c85b7 100644 --- a/packages/nuxt-typo3-theme/src/nuxt/module.ts +++ b/packages/nuxt-typo3-theme/src/nuxt/module.ts @@ -30,7 +30,7 @@ const NuxtTypo3Theme: Module = async function (options: TYPO3ThemeOptions) { '@nuxtjs/google-fonts', this.nuxt.options.googleFonts || { families: { - Jost: { + Rubik: { wght: [300, 400, 500, 700] } } diff --git a/packages/nuxt-typo3-theme/src/styles/shared/_variables.scss b/packages/nuxt-typo3-theme/src/styles/shared/_variables.scss index edf8416..642d4df 100644 --- a/packages/nuxt-typo3-theme/src/styles/shared/_variables.scss +++ b/packages/nuxt-typo3-theme/src/styles/shared/_variables.scss @@ -2,7 +2,7 @@ // ========== // Setup family fallback when primary is not available yet $font-family-fallback: '-apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif' !default; -$font-family-primary: "Jost", #{$font-family-fallback} !default; +$font-family-primary: "Rubik", #{$font-family-fallback} !default; // Main copy font-size - body tag and all inherited elements $font-size-2xs: 0.75rem !default; From 8bf0e8d0b6703528a985ed9affa0c6bdf1dcaf18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Chamier-Ciemi=C5=84ski?= Date: Mon, 15 Nov 2021 17:04:42 +0100 Subject: [PATCH 2/2] chore: style tweaks --- .../src/components/CwFooter/CwFooter.vue | 12 ++++-------- .../src/components/UiGrid/UiCol/UiCol.vue | 2 +- .../src/components/UiLogo/UiLogo.vue | 9 +++++---- .../src/components/UiNavbar/UiNavbar.vue | 1 - .../UiNavigationList/UiNavigationList.vue | 3 +-- 5 files changed, 11 insertions(+), 16 deletions(-) diff --git a/packages/nuxt-typo3-theme/src/components/CwFooter/CwFooter.vue b/packages/nuxt-typo3-theme/src/components/CwFooter/CwFooter.vue index 934bc84..1c98dc6 100644 --- a/packages/nuxt-typo3-theme/src/components/CwFooter/CwFooter.vue +++ b/packages/nuxt-typo3-theme/src/components/CwFooter/CwFooter.vue @@ -2,10 +2,10 @@