diff --git a/package.json b/package.json index c6c37cd..5452e3b 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,6 @@ "webpack": "^5.99.5", "webpack-cli": "^6.0.1" }, - "version": "1.0.0", + "version": "1.1.0", "license": "GPL-3.0-or-later" } diff --git a/src/js/Functions/isHomepage.ts b/src/js/Functions/isHomepage.ts new file mode 100644 index 0000000..b4e9129 --- /dev/null +++ b/src/js/Functions/isHomepage.ts @@ -0,0 +1,4 @@ +export default function isHomepage(): Boolean +{ + return window.location.pathname === '/'; +} \ No newline at end of file diff --git a/src/js/loom.ts b/src/js/loom.ts index 2a03d6e..177b74a 100644 --- a/src/js/loom.ts +++ b/src/js/loom.ts @@ -1 +1,7 @@ -console.log('Welcome to Loom Forge!'); \ No newline at end of file +import isHomepage from './Functions/isHomepage'; + +document.addEventListener('DOMContentLoaded', () => { + if (isHomepage()) { + // Open for changes + } +}); \ No newline at end of file diff --git a/src/scss/_config.scss b/src/scss/_config.scss index 0265499..ba85cd8 100644 --- a/src/scss/_config.scss +++ b/src/scss/_config.scss @@ -1,4 +1,4 @@ -$spacingLevels: 8; +$spacingLevels: 12; $fontSizeIncrement: 0.125rem; $fontSizeBase: 1rem; $fontLevels: 20; \ No newline at end of file diff --git a/src/scss/core/_spacing.scss b/src/scss/core/_spacing.scss index ae32a73..ab7f092 100644 --- a/src/scss/core/_spacing.scss +++ b/src/scss/core/_spacing.scss @@ -1,27 +1,27 @@ @mixin marginClasses($i, $calc) { &-m { &-#{$i} { - margin: $calc; + margin: $calc !important; } &x-#{$i} { - margin-left: $calc; - margin-right: $calc; + margin-left: $calc !important; + margin-right: $calc !important; } &y-#{$i} { - margin-top: $calc; - margin-bottom: $calc; + margin-top: $calc !important; + margin-bottom: $calc !important; } &t-#{$i} { - margin-top: $calc; + margin-top: $calc !important; } &b-#{$i} { - margin-bottom: $calc; + margin-bottom: $calc !important; } &l-#{$i} { - margin-left: $calc; + margin-left: $calc !important; } &r-#{$i} { - margin-right: $calc; + margin-right: $calc !important; } } } @@ -29,27 +29,27 @@ @mixin paddingClasses($i, $calc) { &-p { &-#{$i} { - padding: $calc; + padding: $calc !important; } &x-#{$i} { - padding-left: $calc; - padding-right: $calc; + padding-left: $calc !important; + padding-right: $calc !important; } &y-#{$i} { - padding-top: $calc; - padding-bottom: $calc; + padding-top: $calc !important; + padding-bottom: $calc !important; } &t-#{$i} { - padding-top: $calc; + padding-top: $calc !important; } &b-#{$i} { - padding-bottom: $calc; + padding-bottom: $calc !important; } &l-#{$i} { - padding-left: $calc; + padding-left: $calc !important; } &r-#{$i} { - padding-right: $calc; + padding-right: $calc !important; } } } diff --git a/templates/base/head_navbar.tmpl b/templates/base/head_navbar.tmpl index ba6f741..00d9d5c 100644 --- a/templates/base/head_navbar.tmpl +++ b/templates/base/head_navbar.tmpl @@ -52,9 +52,15 @@ {{ctx.Locale.Tr "explore"}} {{else if .IsLandingPageOrganizations}} - {{ctx.Locale.Tr "explore"}} + + + {{ctx.Locale.Tr "explore"}} + {{else}} - {{ctx.Locale.Tr "explore"}} + + + {{ctx.Locale.Tr "explore"}} + {{end}} {{template "custom/extra_links" .}} diff --git a/templates/home.tmpl b/templates/home.tmpl index a6af086..e3048d3 100644 --- a/templates/home.tmpl +++ b/templates/home.tmpl @@ -1,10 +1,14 @@ {{template "base/head" .}}