Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WIP: Theme changes #32

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

WIP: Theme changes #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
301b74f
chore: changes to colors variables and font
Nov 15, 2021
8bf0e8d
chore: style tweaks
Nov 15, 2021
97bd076
Merge branch 'master' into theme-changes
Dec 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/nuxt-typo3-theme/.storybook/preview-head.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<!-- .storybook/preview-head.html -->
<link href="https://fonts.googleapis.com/css2?family=Jost&display=swap" rel="stylesheet">
<link href="https://fonts.googleapis.com/css2?family=Rubik&display=swap" rel="stylesheet">
12 changes: 4 additions & 8 deletions packages/nuxt-typo3-theme/src/components/CwFooter/CwFooter.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<footer class="cw-footer">
<UiContainer class="cw-footer__container">
<UiRow>
<UiCol col="lg">
<UiLogo :width="250" invert />
<UiCol col="sm">
<UiLogo />
</UiCol>
<UiCol v-if="footerNavigation" col="lg">
<UiCol v-if="footerNavigation" col="8">
<UiLinksList :links="footerNavigation" />
</UiCol>
<UiCol v-if="footerContactData" col="lg">
Expand Down Expand Up @@ -50,7 +50,7 @@ export default CwFooterTheme as typeof CwFooterTheme

.cw-footer {
padding: var(--space-6) 0;
background: var(--color-bg-primary);
background: var(--color-bg-secondary);

&__text {
.t3-ce-header {
Expand All @@ -60,10 +60,6 @@ export default CwFooterTheme as typeof CwFooterTheme
}
}

@include media-query(lg) {
background: var(--color-bg-secondary);
}

.col {
margin-top: var(--space-2);
}
Expand Down
2 changes: 1 addition & 1 deletion packages/nuxt-typo3-theme/src/components/UiGrid/UiCol/UiCol.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div class="col-12" :class="[colClasses]">
<div :class="[colClasses]">
<slot />
<UiOffset v-if="offset" />
<UiOrder v-if="order" />
Expand Down
8 changes: 4 additions & 4 deletions packages/nuxt-typo3-theme/src/components/UiLogo/UiLogo.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<template>
<T3NavLink class="ui-logo" to="/">
<img
:style="{ filter: invert ? 'invert(1)' : 'none' }"
:width="width"
:style="{ filter: invert ? 'invert(1)' : 'none', width: `${width}px` }"
:src="src"
:alt="alt"/>
</T3NavLink>
:alt="alt"
/>
</T3NavLink>
</template>
<script lang="ts">
import { defineComponent } from '@vue/composition-api'
Expand Down
3 changes: 1 addition & 2 deletions packages/nuxt-typo3-theme/src/components/UiNavbar/UiNavbar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ export default defineComponent({
z-index: $z-index-over;
width: 100%;
background: var(--ui-navbar-bg);
border-bottom: 1px solid transparent;
box-shadow: var(--box-shadow-base);

@include media-query($ui-navbar-break-on) {
Expand All @@ -149,7 +148,7 @@ export default defineComponent({
}

&__logo {
flex: 1;
flex: 0 1 200px;
}

&__nav {
Expand Down
2 changes: 1 addition & 1 deletion packages/nuxt-typo3-theme/src/components/UiNavigation/UiNavigationList/UiNavigationList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ export default defineComponent({
flex-direction: column;
min-width: 100%;
white-space: nowrap;
background: white;
background: var(--ui-navbar-bg);
border: 1px solid var(--color-border);
border-top: 0;

Expand Down
2 changes: 1 addition & 1 deletion packages/nuxt-typo3-theme/src/nuxt/module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const NuxtTypo3Theme: Module = async function (options: TYPO3ThemeOptions) {
'@nuxtjs/google-fonts',
this.nuxt.options.googleFonts || {
families: {
'Open Sans': {
Rubik: {
wght: [300, 400, 500, 700]
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/nuxt-typo3-theme/src/styles/shared/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: "Open Sans", #{$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;
Expand Down