diff --git a/README.md b/README.md index b50f4e4..b6618c0 100644 --- a/README.md +++ b/README.md @@ -19,28 +19,13 @@ Head to this [documentation](https://github.com/Sped0n/bridget/blob/main/doc/get ## Features - **Blazingly fast**: 100/100 on both desktop and mobile in [Google PageSpeed Insights](https://developers.google.com/speed/pagespeed/insights) -- Powered by **[Solid.js](https://www.solidjs.com)**, a declarative, efficient, and flexible JavaScript library for building user interfaces -- JS **dynamic loading** (powered by ESM) -- Image **Preloading**/**Lazy loading** +- Powered by **[SolidJS](https://www.solidjs.com)**, a declarative, efficient, and flexible JavaScript library for building user interfaces +- JS **dynamic loading** +- Image **preloading** + **lazy loading** - **Dynamic resolution** based on view mode - Multiple **analytics** services supported - Search engine **verification** supported (Google, Bind, Yandex and Baidu) -## Multilingual and i18n - -Bridget supports the following languages: - -- English -- Simplified Chinese -- Traditional Chinese -- Japanese -- Korean -- Deutsch -- Spanish -- Italian -- Tamil -- [Contribute with a new language](https://github.com/Sped0n/bridget/pulls) - ## Credits - https://github.com/tylermcrobert/bridget-pictures-www diff --git a/assets/scss/_core/_font.scss b/assets/scss/_core/_font.scss index 08ec785..deb4df7 100644 --- a/assets/scss/_core/_font.scss +++ b/assets/scss/_core/_font.scss @@ -7,59 +7,3 @@ font-style: normal; font-display: swap; } - -@font-face { - font-family: 'Noto Sans CJK SC'; - src: url('/lib/fonts/NotoSansCJKsc-Regular.woff2') format('woff2'); - font-weight: 400; - font-style: normal; - font-display: swap; -} - -@font-face { - font-family: 'Noto Sans CJK TC'; - src: url('/lib/fonts/NotoSansCJKtc-Regular.woff2') format('woff2'); - font-weight: 400; - font-style: normal; - font-display: swap; -} - -@font-face { - font-family: 'Noto Sans CJK JP'; - src: url('/lib/fonts/NotoSansCJKjp-Regular.woff2') format('woff2'); - font-weight: 400; - font-style: normal; - font-display: swap; -} - -@font-face { - font-family: 'Noto Sans CJK KR'; - src: url('/lib/fonts/NotoSansCJKkr-Regular.woff2') format('woff2'); - font-weight: 400; - font-style: normal; - font-display: swap; -} - -@font-face { - font-family: 'Noto Sans'; - src: url('/lib/fonts/NotoSans-Regular.woff2') format('woff2'); - font-weight: 400; - font-style: normal; - font-display: swap; -} - -@font-face { - font-family: 'FW'; - src: url('/lib/fonts/fw.woff2') format('woff2'); - font-weight: 400; - font-style: normal; - font-display: swap; -} - -@font-face { - font-family: 'Noto Sans'; - src: url('/lib/fonts/NotoSansTamil-Regular.woff2') format('woff2'); - font-weight: 400; - font-style: normal; - font-display: swap; -} diff --git a/assets/scss/_core/_typography.scss b/assets/scss/_core/_typography.scss index dca9819..4168157 100644 --- a/assets/scss/_core/_typography.scss +++ b/assets/scss/_core/_typography.scss @@ -3,10 +3,10 @@ body { line-height: 1.2; font-size: 16px; - font-family: sans-serif; + font-family: 'Geist', sans-serif; button { - font-family: 'FW'; + font-family: 'FW', sans-serif; } @include min-width('tablet') { @@ -16,51 +16,3 @@ body { font-size: 19px; } } - -body:lang(en) { - font-family: 'Geist', sans-serif; -} - -body:lang(de) { - font-family: 'Geist', sans-serif; -} - -body:lang(es) { - font-family: 'Geist', sans-serif; -} - -body:lang(fr) { - font-family: 'Geist', sans-serif; -} - -body:lang(it) { - font-family: 'Geist', sans-serif; -} - -body:lang(zh-cn) { - font-family: 'Noto Sans', 'Noto Sans CJK SC', sans-serif; -} - -body:lang(zh-sg) { - font-family: 'Noto Sans', 'Noto Sans CJK SC', sans-serif; -} - -body:lang(zh-hk) { - font-family: 'Noto Sans', 'Noto Sans CJK TC', sans-serif; -} - -body:lang(zh-mo) { - font-family: 'Noto Sans', 'Noto Sans CJK TC', sans-serif; -} - -body:lang(zh-tw) { - font-family: 'Noto Sans', 'Noto Sans CJK TC', sans-serif; -} - -body:lang(ja) { - font-family: 'Noto Sans', 'Noto Sans CJK JP', sans-serif; -} - -body:lang(ko) { - font-family: 'Noto Sans', 'Noto Sans CJK KR', sans-serif; -} diff --git a/exampleSite/config/_default/hugo.toml b/exampleSite/config/_default/hugo.toml index a62aa97..2e0aa7e 100644 --- a/exampleSite/config/_default/hugo.toml +++ b/exampleSite/config/_default/hugo.toml @@ -8,18 +8,6 @@ title = 'Bridget' disableKinds = ["section", "taxonomy", "term", "home"] # robots.txt enableRobotsTXT = true -# available options -# * en (powered by Geist) -# * de (powered by Geist) -# * es (powered by Geist) -# * fr (powered by Geist) -# * it (powered by Geist) -# * zh-sg zh-cn (powered by Noto Sans SC) -# * zh-hk zh-tw zh-mo (powered by Noto Sans TC) -# * ja (powered by Noto Sans JP) -# * ko (powered by Noto Sans KR) -# * ta (powered by Noto Sans TA) -defaultContentLanguage = 'en' # theme as module [module] diff --git a/layouts/partials/function/langCode.html b/layouts/partials/function/langCode.html deleted file mode 100644 index 68e892d..0000000 --- a/layouts/partials/function/langCode.html +++ /dev/null @@ -1,9 +0,0 @@ -{{- $res := false -}} - -{{- range . -}} - {{- if eq site.LanguageCode . -}} - {{- $res = true -}} - {{- end -}} -{{- end -}} - -{{- return $res -}} diff --git a/layouts/partials/head/link.html b/layouts/partials/head/link.html index c41ac48..edf5112 100644 --- a/layouts/partials/head/link.html +++ b/layouts/partials/head/link.html @@ -4,7 +4,7 @@ {{/* critical style */}} {{- $style := dict "Source" "scss/critical.scss" "Fingerprint" $fingerprint -}} {{- $options := dict "enableSourceMap" true "includePaths" (slice "node_modules") "transpiler" "dartsass" -}} -{{- $style = dict "Context" . "ToCSS" $options "Inline" true | merge $style -}} +{{- $style = dict "Context" . "ToCSS" $options "Inline" true "Template" true | merge $style -}} {{- partial "plugin/style.html" $style -}} {{- $style := dict "Link" "/bundled/css/main.css" "Defer" true -}} @@ -26,46 +26,4 @@ {{/* fonts */}} -{{- if (partial "function/langCode.html" (slice "en" "de" "fr" "es" "it")) -}} - -{{- else if (partial "function/langCode.html" (slice "zh-cn" "zh-sg")) -}} - - -{{- else if (partial "function/langCode.html" (slice "zh-tw" "zh-hk" "zh-mo")) -}} - - -{{- else if (partial "function/langCode.html" (slice "ja")) -}} - - -{{- else if (partial "function/langCode.html" (slice "ko")) -}} - - -{{- else if (partial "function/langCode.html" (slice "ta")) -}} - - -{{- end -}} + diff --git a/layouts/partials/plugin/style.html b/layouts/partials/plugin/style.html index 13039d6..671f316 100644 --- a/layouts/partials/plugin/style.html +++ b/layouts/partials/plugin/style.html @@ -11,13 +11,13 @@ {{- $resource = resources.FromString $.Path . -}} {{- end -}} {{- if $resource -}} - {{- with .Template -}} - {{- $resource = $resource | resources.ExecuteAsTemplate . $.Context -}} - {{- end -}} {{- with .ToCSS -}} {{- $options := . | merge (dict "outputStyle" "compressed") -}} {{- $resource = $resource | toCSS $options -}} {{- end -}} + {{- with .Template -}} + {{- $resource = $resource | resources.ExecuteAsTemplate . $.Context -}} + {{- end -}} {{- if or .Minify .Inline -}} {{- $resource = $resource | minify -}} {{- end -}} diff --git a/static/lib/fonts/NotoSans-Regular.woff2 b/static/lib/fonts/NotoSans-Regular.woff2 deleted file mode 100644 index 7e1323e..0000000 Binary files a/static/lib/fonts/NotoSans-Regular.woff2 and /dev/null differ diff --git a/static/lib/fonts/NotoSansCJKjp-Regular.woff2 b/static/lib/fonts/NotoSansCJKjp-Regular.woff2 deleted file mode 100644 index b80b676..0000000 Binary files a/static/lib/fonts/NotoSansCJKjp-Regular.woff2 and /dev/null differ diff --git a/static/lib/fonts/NotoSansCJKkr-Regular.woff2 b/static/lib/fonts/NotoSansCJKkr-Regular.woff2 deleted file mode 100644 index 8805b66..0000000 Binary files a/static/lib/fonts/NotoSansCJKkr-Regular.woff2 and /dev/null differ diff --git a/static/lib/fonts/NotoSansCJKsc-Regular.woff2 b/static/lib/fonts/NotoSansCJKsc-Regular.woff2 deleted file mode 100644 index 05a6a1b..0000000 Binary files a/static/lib/fonts/NotoSansCJKsc-Regular.woff2 and /dev/null differ diff --git a/static/lib/fonts/NotoSansCJKtc-Regular.woff2 b/static/lib/fonts/NotoSansCJKtc-Regular.woff2 deleted file mode 100644 index 712228f..0000000 Binary files a/static/lib/fonts/NotoSansCJKtc-Regular.woff2 and /dev/null differ diff --git a/static/lib/fonts/NotoSansTamil-Regular.woff2 b/static/lib/fonts/NotoSansTamil-Regular.woff2 deleted file mode 100644 index d01a009..0000000 Binary files a/static/lib/fonts/NotoSansTamil-Regular.woff2 and /dev/null differ diff --git a/theme.toml b/theme.toml index 967bb0c..4176737 100644 --- a/theme.toml +++ b/theme.toml @@ -6,9 +6,9 @@ license = "MIT" licenselink = "https://github.com/Sped0n/bridget/blob/main/LICENSE" description = "Bridget is a minimal Hugo theme designed for photographers/visual artists." homepage = "https://github.com/Sped0n/bridget" -demosite = "https://bridget-demo.sped0nwen.com" +demosite = "https://bridget-demo.sped0n.com" tags = ["gallery", "minimal", "portfolio", "responsive"] -features = ["SEO optimized", "TypeScript", "multi-language support"] +features = ["SEO optimized", "TypeScript"] [author] name = "sped0n"