diff --git a/.stylelintrc.json b/.stylelintrc.json index 4da40ce7..b3676ec2 100644 --- a/.stylelintrc.json +++ b/.stylelintrc.json @@ -7,5 +7,8 @@ ], "rules": { "scss/comment-no-empty": null - } + }, + "ignoreFiles": [ + "src/components/SVGLogo.vue" + ] } diff --git a/src/App.vue b/src/App.vue index 19fd6b7a..07550168 100755 --- a/src/App.vue +++ b/src/App.vue @@ -1,13 +1,18 @@ diff --git a/src/components/layout/MobileMenu.vue b/src/components/layout/MobileMenu.vue index 83a7d54c..f571fd3f 100755 --- a/src/components/layout/MobileMenu.vue +++ b/src/components/layout/MobileMenu.vue @@ -41,7 +41,8 @@ watch(smallerThanMd, (value) => { :href="href" :target="target ? target : null" :to="to ? { name: to } : null" - class="head-6 link block py-4 cursor-pointer border-b border-b-slate-300 dark:border-b-slate-50/[0.06] " + secondary + class="head-6 block py-4 !border-b-solid !border-b !border-b-slate-300 rounded-none !dark:border-b-slate-50/[0.06]" @click="$emit('close')" > {{ $t(text as string) }} @@ -53,7 +54,6 @@ watch(smallerThanMd, (value) => { diff --git a/src/i18n/messages.ts b/src/i18n/messages.ts index f332c543..b7bdf22b 100644 --- a/src/i18n/messages.ts +++ b/src/i18n/messages.ts @@ -304,8 +304,8 @@ const messages = { gitHub: 'GitHub', }, main: { - h1: 'An Italian open source community', - h2: 'Schrödinger Hat is a community, podcast, livestream and much more!', + h1: 'Schrödinger Hat', + h2: 'The Open Source community', links: { youtube: 'YouTube', spotify: 'Spotify', diff --git a/src/router.ts b/src/router.ts index ec74cefa..3ab44be7 100755 --- a/src/router.ts +++ b/src/router.ts @@ -4,12 +4,7 @@ const routes = [ { path: '/', name: 'Home', - component: () => import('@/views/HomeView.vue'), - }, - { - path: '/video', - name: 'RedirectVideo', - component: () => import('@/views/RedirectVideo.vue'), + component: () => import('@/views/PageHome.vue'), }, { path: '/code-of-conduct', diff --git a/src/styles/_variables.scss b/src/styles/_variables.scss index 505e7c78..7f23e912 100755 --- a/src/styles/_variables.scss +++ b/src/styles/_variables.scss @@ -18,9 +18,3 @@ $dark-bg-primary: $nord0; $dark-bg-secondary: $nord1; $dark-bg-secondary: $nord3; $dark-text-primary: $nord6; - -// Breakpoints variables -$breakpoint-sm: 576px; -$breakpoint-md: 768px; -$breakpoint-lg: 992px; -$breakpoint-xl: 1200px; diff --git a/src/styles/dark.scss b/src/styles/dark.scss deleted file mode 100755 index 9d0e5cb7..00000000 --- a/src/styles/dark.scss +++ /dev/null @@ -1,25 +0,0 @@ -// Dark mode that is gonna override the whole theme -html.dark{ - background: $dark-bg-primary; - color: $dark-text-primary; - transition: all 400ms ease-in-out 0s; - - * { - color: $dark-text-primary; - transition: all 400ms ease-in-out 0s; - } - - .external-link-color { - color: $nord8; - - &:hover { - color: $nord11; - } - } - - .btn { - &.btn-primary { - border: none; - } - } -} diff --git a/src/styles/global.scss b/src/styles/global.scss index 851128da..3cde6fde 100755 --- a/src/styles/global.scss +++ b/src/styles/global.scss @@ -1,6 +1,5 @@ // Global style @import 'variables'; -@import 'dark'; @import 'nord'; $root-font-size: 16px; @@ -54,71 +53,17 @@ $breakpoints: ( html { background: $bg-primary; color: $text-primary; - transition: all 400ms ease-in-out 0s; * { color: $text-primary; - text-decoration: none; - transition: all 400ms ease-in-out 0s; } +} - body { - padding: 0; - margin: 0; - } - - // .container { - // width: 100%; - // margin: 0 auto; - // // padding: 0 1.5em; - // padding-top: 2.5em; - // padding-bottom: 2.5em; - // } - - .overflow-hidden { - overflow: hidden; - } - - .external-link-color { - color: $nord7; - - &:hover { - color: $nord11; - } - } - - .btn { - display: inline-flex; - align-items: center; - padding: 0.675em 1.5em; - border-radius: 0.25em; - margin: 0 0.5em; - cursor: pointer; - font-size: 1.1em; - text-decoration: none; - transition: all 200ms ease-in 0s; - vertical-align: middle; - - &.btn-primary { - border: 1px solid $bg-secondary; - background: $dark-bg-secondary; - color: $text-secondary; - - &:hover { - background: $nord7; - color: $text-primary; - } - } - - &.btn-info { - border: 1px solid $bg-secondary; - background: transparent; +html.dark{ + background: $dark-bg-primary; + color: $dark-text-primary; - &:hover { - border: 1px solid $nord5; - background: $nord5; - color: $nord8; - } - } + * { + color: $dark-text-primary; } } diff --git a/src/utils/getAssetURL.ts b/src/utils/getAssetURL.ts new file mode 100644 index 00000000..8e9e7fd2 --- /dev/null +++ b/src/utils/getAssetURL.ts @@ -0,0 +1,3 @@ +export function getAssetURL(asset: string) { + return new URL(`../assets/${asset}`, import.meta.url).href +} diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue deleted file mode 100755 index 9bf410c6..00000000 --- a/src/views/HomeView.vue +++ /dev/null @@ -1,50 +0,0 @@ - - - - - diff --git a/src/views/PageHome.vue b/src/views/PageHome.vue new file mode 100755 index 00000000..92d5a973 --- /dev/null +++ b/src/views/PageHome.vue @@ -0,0 +1,55 @@ + + + diff --git a/src/views/RedirectVideo.vue b/src/views/RedirectVideo.vue deleted file mode 100644 index d8f37f99..00000000 --- a/src/views/RedirectVideo.vue +++ /dev/null @@ -1,53 +0,0 @@ - - - - - diff --git a/tsconfig.json b/tsconfig.json index 64cdb948..bcfd0916 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,23 +1,19 @@ { "compilerOptions": { - "baseUrl": ".", - "target": "ESNext", - "module": "ESNext", - "lib": [ - "DOM", - "ESNext" - ], - "strict": true, + "baseUrl": "./", "esModuleInterop": true, + "forceConsistentCasingInFileNames": true, "incremental": true, + "lib": [ "DOM", "ESNext"], + "module": "esnext", "moduleResolution": "node", - "skipLibCheck": true, "resolveJsonModule": true, - "forceConsistentCasingInFileNames": true, + "skipLibCheck": true, + "strict": true, + "target": "esnext", + "types": ["vite/client"], "paths": { - "@/*": [ - "src/*" - ] + "@/*": ["src/*"] } }, "exclude": [