vipassana-design-standards 0.0.13 → 0.0.16

package/lib/vipassana/translations.rb

@@ -1,6 +1,6 @@
 # this is a copy of i18n.js, using ruby syntax instead of javascript syntax
 
-VIPASSANA_TRANSLATIONS = {
+VDS_TRANSLATIONS = {
   "en": {
     "language": "English",
     "vipassana_meditation": "Vipassana Meditation",
@@ -8,6 +8,14 @@ VIPASSANA_TRANSLATIONS = {
     "in_the_tradition": "in the Tradition of Sayagyi U Ba Khin",
     "full": "Vipassana Meditation As Taught By S.N. Goenka in the Tradition of Sayagyi U Ba Khin",
   },
+  "ar": {
+    "rtl": true,
+    "language": "Arabic",
+    "vipassana_meditation": "تأمل فيباسانا",
+    "as_taught": "كما تم تدريسه بواسطة S.N. جوينكا",
+    "in_the_tradition": "في تقليد Sayagyi U Ba Khin",
+    "full": "تأمل فيباسانا كما علمه S.N. Goenka في تقليد Sayagyi U Ba Khin",
+  },
   "bg": {
     "language": "Bulgarian",
     "vipassana_meditation": "Випассана Медитация",

package/lib/vipassana-design-standards.rb

@@ -1,4 +1,3 @@
 # frozen_string_literal: true
 
-require "vipassana/engine"
-require "vipassana/logo_helper"
+require "vipassana/design_standards_helper"

package/package.json

@@ -1,12 +1,24 @@
 {
   "name": "vipassana-design-standards",
-  "version": "0.0.13",
+  "version": "0.0.16",
   "description": "Vipassana design standards materials",
   "homepage": "https://design-standards.dhamma.org",
   "author": "Dhamma Workers",
   "dependencies": {
-    "bootstrap5": "npm:bootstrap@5",
-    "@popperjs/core": "^2.9.1"
+    "@popperjs/core": "^2.9.1",
+    "bootstrap5": "npm:bootstrap@5"
   },
-  "sass": "app/assets/stylesheets/vds.scss"
-}
+  "sass": "src/stylesheets/bootstrap5-theme.scss",
+  "css": "dist/bootstrap5-theme.css",
+  "scripts" : {
+    "build-sass": "sass --load-path=node_modules src/stylesheets/bootstrap5-theme.scss dist/css/bootstrap5-theme.css && sass src/stylesheets/fonts.scss dist/css/fonts.css && sass src/stylesheets/logo.scss dist/css/logo.css",
+    "build-rtl": "rtlcss dist/css/bootstrap5-theme.css dist/css/bootstrap5-theme.rtl.css",
+    "build-fonts": "cp src/stylesheets/specific-fonts/* dist/css/",
+    "build-min": "cleancss --batch --batch-suffix '.min' dist/css/*.css",
+    "build-css": "rm -f dist/css/* && npm run build-fonts && npm run build-sass && npm run build-rtl && npm run build-min",
+    "build-js": "rm -f dist/js/* && cp node_modules/bootstrap5/dist/js/bootstrap.bundle* dist/js/",
+    "build": "npm run build-css && npm run build-js",
+    "dist": "npm run build && npm run dist-version-folder && npm publish",
+    "dist-version-folder": "mkdir -p dist/$npm_package_version/css && mkdir -p dist/$npm_package_version/js && cp dist/css/* dist/$npm_package_version/css && cp dist/js/* dist/$npm_package_version/js"
+  }
+}

package/{app/assets → src}/javascripts/index.js

@@ -1,5 +1,5 @@
 // i18n JSON
-import i18nJson from './i18n.js?ver=0.10'
+import i18nJson from './i18n.js?ver=0.16'
 
 // Dependencies
 import { Canvg } from 'https://cdn.skypack.dev/canvg@^4.0.0';
@@ -9,8 +9,8 @@ import jszip from 'https://cdn.jsdelivr.net/npm/jszip@3.10.1/+esm'
 // Graphicals element as JS
 import wheel from '../images/wheels/wheel-2023.svg.js'
 import wheelDuotone from '../images/wheels/wheel-2023-duotone.svg.js'
-import footlight from '../fonts/FootlightMTProLight.base64.js'
-import lato from '../fonts/Lato-Light.base64.js'
+import footlight from '../../dist/fonts/FootlightMTProLight.base64.js'
+import lato from '../../dist/fonts/Lato-Light.base64.js'
 
 export default {
   data() {
@@ -46,14 +46,11 @@ export default {
     isRtl() {
       return this.i18n[this.locale].rtl
     },
-    fontPath() {
-      return 'assets/fonts/'
-    },
     titleFontUrl() {
-      return this.embedSVG ? footlight : `${this.fontPath}FootlightMTProLight.woff`
+      return footlight
     },
     taglineFontUrl() {
-      return this.embedSVG ? lato : `${this.fontPath}Lato-Light.woff`
+      return lato
     },
     wheels() {
       return {
@@ -66,7 +63,7 @@ export default {
     },
     wheelPath() {
       const paths = {
-        wheel1: 'https://design-standards.dhamma.org/dist/Dhamma-Wheel.svg',
+        wheel1: 'https://design-standards.dhamma.org/dist/dhamma-wheel.svg',
         wheel2: 'https://design-standards.dhamma.org/assets/images/wheels/wheel-2023-duotone.svg',
       }
       return paths[this.wheel]
@@ -297,7 +294,7 @@ export default {
         if ((this.width / this.height) > 8.5) {
           this.disposition = 'left-two-lines'
         }
-        svgs[locale].normal = await this.generateSvgCode()
+        svgs[locale].default = await this.generateSvgCode()
 
         // All dispositions
         for (let disposition of this.dispositions) {
@@ -315,7 +312,7 @@ export default {
       # This file has been generated by design-standards.dhamma.org wesbite
       # index.js#generateAllInlineSVG
 
-      VIPASSANA_SVGS = ${JSON.stringify(svgs)}
+      VDS_SVGS = ${JSON.stringify(svgs)}
       `
       var blob = new Blob([result], {type: "text/plain;charset=utf-8"})
       fileSaver.saveAs(blob, "logos_inline_svg.rb")

package/src/stylesheets/bootstrap5-theme.scss

@@ -0,0 +1,24 @@
+@import "./custom-bootstrap-variables.scss";
+
+@import "bootstrap5/scss/bootstrap.scss";
+
+@import "./custom-bootstrap-utilities.scss";
+@import "./custom-bootstrap.scss";
+
+@import "./layout/vds-mixins.scss";
+@import "./layout/vds-layout.scss";
+@import "./layout/vds-header.scss";
+@import "./layout/vds-sidenav.scss";
+
+@import "./fonts.scss";
+@import "./logo.scss";
+
+html.vds-html {
+  font-size: 14px;
+  @include media-breakpoint-up(md) {
+    font-size: 15px;
+  }
+  @include media-breakpoint-up(xl) {
+    font-size: 16px;
+  }
+}

package/{app/assets → src}/stylesheets/custom-bootstrap-variables.scss

@@ -75,8 +75,8 @@ $dark-800: shade-color($dark, 60%);
 $dark-900: shade-color($dark, 80%);
 
 // Customize Bootstrap
-$font-family-sans-serif: var(--vipassana-font-family), 'Lato', system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", "Noto Sans", "Liberation Sans", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
-$headings-font-family: var(--vipassana-headings-font-family), 'FootLight', system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", "Noto Sans", "Liberation Sans", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+$font-family-sans-serif: var(--vds-font-family), 'Lato', system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", "Noto Sans", "Liberation Sans", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+$headings-font-family: var(--vds-headings-font-family), 'FootLight', system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", "Noto Sans", "Liberation Sans", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
 $headings-color: $blue;
 $headings-font-weight: 600;
 $headings-line-height: 1.5;

package/src/stylesheets/fonts.scss

@@ -0,0 +1,331 @@
+/* Declare font base on language.
+   Code generated in index.html #css-variables
+*/
+
+:root { --vds-font-family: 'Lato'; --vds-headings-font-family: 'FootLight'; }
+[lang="en"] { --vds-font-family: 'Lato'; --vds-headings-font-family: 'FootLight'; }
+[lang="bg"] { --vds-font-family: 'Noto Sans'; --vds-headings-font-family: 'FootLight'; }
+[lang="cs"] { --vds-font-family: 'Lato'; --vds-headings-font-family: 'FootLight'; }
+[lang="de"] { --vds-font-family: 'Lato'; --vds-headings-font-family: 'FootLight'; }
+[lang="el"] { --vds-font-family: 'Noto Sans'; --vds-headings-font-family: 'FootLight'; }
+[lang="es"] { --vds-font-family: 'Lato'; --vds-headings-font-family: 'FootLight'; }
+[lang="fa"] { --vds-font-family: 'Noto Sans Arabic'; --vds-headings-font-family: 'Noto Sans Arabic'; }
+[lang="fi"] { --vds-font-family: 'Lato'; --vds-headings-font-family: 'FootLight'; }
+[lang="fr"] { --vds-font-family: 'Lato'; --vds-headings-font-family: 'FootLight'; }
+[lang="gu"] { --vds-font-family: 'Noto Sans Gujarati'; --vds-headings-font-family: 'Noto Sans Gujarati'; }
+[lang="he"] { --vds-font-family: 'Lato'; --vds-headings-font-family: 'FootLight'; }
+[lang="hi"] { --vds-font-family: 'Lato'; --vds-headings-font-family: 'FootLight'; }
+[lang="hu"] { --vds-font-family: 'Lato'; --vds-headings-font-family: 'FootLight'; }
+[lang="id"] { --vds-font-family: 'Lato'; --vds-headings-font-family: 'FootLight'; }
+[lang="it"] { --vds-font-family: 'Lato'; --vds-headings-font-family: 'FootLight'; }
+[lang="ja"] { --vds-font-family: 'Noto Sans JP'; --vds-headings-font-family: 'Noto Sans JP'; }
+[lang="km"] { --vds-font-family: 'Noto Sans Khmer'; --vds-headings-font-family: 'Noto Sans Khmer'; }
+[lang="ko"] { --vds-font-family: 'Noto Sans KR'; --vds-headings-font-family: 'Noto Sans KR'; }
+[lang="lt"] { --vds-font-family: 'Lato'; --vds-headings-font-family: 'FootLight'; }
+[lang="lv"] { --vds-font-family: 'Lato'; --vds-headings-font-family: 'FootLight'; }
+[lang="mk"] { --vds-font-family: 'Noto Sans'; --vds-headings-font-family: 'FootLight'; }
+[lang="mr"] { --vds-font-family: 'Noto Sans'; --vds-headings-font-family: 'FootLight'; }
+[lang="nl"] { --vds-font-family: 'Lato'; --vds-headings-font-family: 'FootLight'; }
+[lang="or"] { --vds-font-family: 'Noto Sans'; --vds-headings-font-family: 'FootLight'; }
+[lang="pl"] { --vds-font-family: 'Lato'; --vds-headings-font-family: 'FootLight'; }
+[lang="pt"] { --vds-font-family: 'Lato'; --vds-headings-font-family: 'FootLight'; }
+[lang="ro"] { --vds-font-family: 'Noto Sans'; --vds-headings-font-family: 'FootLight'; }
+[lang="ru"] { --vds-font-family: 'Noto Sans'; --vds-headings-font-family: 'FootLight'; }
+[lang="si"] { --vds-font-family: 'Noto Sans Sinhala'; --vds-headings-font-family: 'Noto Sans Sinhala'; }
+[lang="sl"] { --vds-font-family: 'Lato'; --vds-headings-font-family: 'FootLight'; }
+[lang="sr"] { --vds-font-family: 'Lato'; --vds-headings-font-family: 'FootLight'; }
+[lang="sv"] { --vds-font-family: 'Lato'; --vds-headings-font-family: 'FootLight'; }
+[lang="ta"] { --vds-font-family: 'Lato'; --vds-headings-font-family: 'FootLight'; }
+[lang="te"] { --vds-font-family: 'Lato'; --vds-headings-font-family: 'FootLight'; }
+[lang="th"] { --vds-font-family: 'Lato'; --vds-headings-font-family: 'FootLight'; }
+[lang="tr"] { --vds-font-family: 'Noto Sans'; --vds-headings-font-family: 'FootLight'; }
+[lang="vi"] { --vds-font-family: 'Noto Sans'; --vds-headings-font-family: 'FootLight'; }
+[lang="zh-HANS"] { --vds-font-family: 'Lato'; --vds-headings-font-family: 'FootLight'; }
+[lang="zh-HANT"] { --vds-font-family: 'Lato'; --vds-headings-font-family: 'FootLight'; }
+[lang="zh-HANT-HK"] { --vds-font-family: 'Lato'; --vds-headings-font-family: 'FootLight'; }
+
+/* Main fonts */
+
+@font-face {
+  font-family: 'FootLight';
+  src: url('https://design-standards.dhamma.org/dist/fonts/FootlightMTProLight.woff');
+  font-weight: normal;
+  font-style: normal;
+}
+@font-face {
+  font-family: 'FootLight';
+  src: url('https://design-standards.dhamma.org/dist/fonts/FootlightMTProRegular.woff');
+  font-weight: 600;
+  font-style: normal;
+}
+@font-face {
+  font-family: 'Lato';
+  src: url('https://design-standards.dhamma.org/dist/fonts/Lato-Regular.woff');
+  font-weight: normal;
+  font-style: normal;
+}
+@font-face {
+  font-family: 'Lato';
+  src: url('https://design-standards.dhamma.org/dist/fonts/Lato-Light.woff');
+  font-weight: 300;
+  font-style: normal;
+}
+@font-face {
+  font-family: 'Lato';
+  src: url('https://design-standards.dhamma.org/dist/fonts/Lato-Bold.woff');
+  font-weight: 800;
+  font-style: normal;
+}
+
+/* Special fonts downloaded from google for specific languages */
+/* <link href="https://fonts.googleapis.com/css2?family=Noto+Sans+Gujarati:wght@300;400
+family=Noto+Sans+JP:wght@300;400
+family=Noto+Sans+KR:wght@300;400
+family=Noto+Sans+Sinhala:wght@300;500
+family=Noto+Sans:wght@200
+family=Noto+Sans+Khmer:wght@300;400
+family=Noto+Sans+Arabic:wght@200;400&display=swap" rel="stylesheet"> */
+/* <link href="https://fonts.googleapis.com/css2?
+
+family=Noto+Sans+Gujarati:wght@300;400
+family=Noto+Sans+JP:wght@300;400
+family=Noto+Sans+KR:wght@300;400
+family=Noto+Sans+Sinhala:wght@300;500
+family=Noto+Sans:wght@200
+family=Noto+Sans+Khmer:wght@300;400
+family=Noto+Sans+Arabic:wght@200;400
+
+
+/* cyrillic-ext */
+@font-face {
+  font-family: 'Noto Sans';
+  font-style: normal;
+  font-weight: 200;
+  font-display: swap;
+  src: url(https://fonts.gstatic.com/s/notosans/v28/o-0NIpQlx3QUlC5A4PNjKhVVadyB1Wk.woff2) format('woff2');
+  unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+
+/* cyrillic */
+@font-face {
+  font-family: 'Noto Sans';
+  font-style: normal;
+  font-weight: 200;
+  font-display: swap;
+  src: url(https://fonts.gstatic.com/s/notosans/v28/o-0NIpQlx3QUlC5A4PNjKhVVYNyB1Wk.woff2) format('woff2');
+  unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+
+/* devanagari */
+@font-face {
+  font-family: 'Noto Sans';
+  font-style: normal;
+  font-weight: 200;
+  font-display: swap;
+  src: url(https://fonts.gstatic.com/s/notosans/v28/o-0NIpQlx3QUlC5A4PNjKhVVZdyB1Wk.woff2) format('woff2');
+  unicode-range: U+0900-097F, U+1CD0-1CF9, U+200C-200D, U+20A8, U+20B9, U+25CC, U+A830-A839, U+A8E0-A8FF;
+}
+
+/* greek-ext */
+@font-face {
+  font-family: 'Noto Sans';
+  font-style: normal;
+  font-weight: 200;
+  font-display: swap;
+  src: url(https://fonts.gstatic.com/s/notosans/v28/o-0NIpQlx3QUlC5A4PNjKhVVaNyB1Wk.woff2) format('woff2');
+  unicode-range: U+1F00-1FFF;
+}
+
+/* greek */
+@font-face {
+  font-family: 'Noto Sans';
+  font-style: normal;
+  font-weight: 200;
+  font-display: swap;
+  src: url(https://fonts.gstatic.com/s/notosans/v28/o-0NIpQlx3QUlC5A4PNjKhVVZ9yB1Wk.woff2) format('woff2');
+  unicode-range: U+0370-03FF;
+}
+
+/* vietnamese */
+@font-face {
+  font-family: 'Noto Sans';
+  font-style: normal;
+  font-weight: 200;
+  font-display: swap;
+  src: url(https://fonts.gstatic.com/s/notosans/v28/o-0NIpQlx3QUlC5A4PNjKhVVa9yB1Wk.woff2) format('woff2');
+  unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+0300-0301, U+0303-0304, U+0308-0309, U+0323, U+0329, U+1EA0-1EF9, U+20AB;
+}
+
+/* latin-ext */
+@font-face {
+  font-family: 'Noto Sans';
+  font-style: normal;
+  font-weight: 200;
+  font-display: swap;
+  src: url(https://fonts.gstatic.com/s/notosans/v28/o-0NIpQlx3QUlC5A4PNjKhVVatyB1Wk.woff2) format('woff2');
+  unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* latin */
+@font-face {
+  font-family: 'Noto Sans';
+  font-style: normal;
+  font-weight: 200;
+  font-display: swap;
+  src: url(https://fonts.gstatic.com/s/notosans/v28/o-0NIpQlx3QUlC5A4PNjKhVVZNyB.woff2) format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* arabic */
+@font-face {
+  font-family: 'Noto Sans Arabic';
+  font-style: normal;
+  font-weight: 200;
+  font-stretch: 100%;
+  font-display: swap;
+  src: url(https://fonts.gstatic.com/s/notosansarabic/v18/nwpCtLGrOAZMl5nJ_wfgRg3DrWFZWsnVBJ_sS6tlqHHFlj4wv4o.woff2) format('woff2');
+  unicode-range: U+0600-06FF, U+0750-077F, U+0870-088E, U+0890-0891, U+0898-08E1, U+08E3-08FF, U+200C-200E, U+2010-2011, U+204F, U+2E41, U+FB50-FDFF, U+FE70-FE74, U+FE76-FEFC, U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* arabic */
+@font-face {
+  font-family: 'Noto Sans Arabic';
+  font-style: normal;
+  font-weight: 400;
+  font-stretch: 100%;
+  font-display: swap;
+  src: url(https://fonts.gstatic.com/s/notosansarabic/v18/nwpCtLGrOAZMl5nJ_wfgRg3DrWFZWsnVBJ_sS6tlqHHFlj4wv4o.woff2) format('woff2');
+  unicode-range: U+0600-06FF, U+0750-077F, U+0870-088E, U+0890-0891, U+0898-08E1, U+08E3-08FF, U+200C-200E, U+2010-2011, U+204F, U+2E41, U+FB50-FDFF, U+FE70-FE74, U+FE76-FEFC, U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* khmer */
+@font-face {
+  font-family: 'Noto Sans Khmer';
+  font-style: normal;
+  font-weight: 300;
+  font-stretch: 100%;
+  font-display: swap;
+  src: url(https://fonts.gstatic.com/s/notosanskhmer/v23/ijwCs5roRME5LLRxjsRb-gssOenAyendxrgV2c-Zw-9vR1IFeh7j.woff2) format('woff2');
+  unicode-range: U+1780-17FF, U+19E0-19FF, U+200C, U+25CC;
+}
+
+/* latin-ext */
+@font-face {
+  font-family: 'Noto Sans Khmer';
+  font-style: normal;
+  font-weight: 300;
+  font-stretch: 100%;
+  font-display: swap;
+  src: url(https://fonts.gstatic.com/s/notosanskhmer/v23/ijwCs5roRME5LLRxjsRb-gssOenAyendxrgV2c-Zw-9vR1cFeh7j.woff2) format('woff2');
+  unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* latin */
+@font-face {
+  font-family: 'Noto Sans Khmer';
+  font-style: normal;
+  font-weight: 300;
+  font-stretch: 100%;
+  font-display: swap;
+  src: url(https://fonts.gstatic.com/s/notosanskhmer/v23/ijwCs5roRME5LLRxjsRb-gssOenAyendxrgV2c-Zw-9vR1kFeg.woff2) format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* khmer */
+@font-face {
+  font-family: 'Noto Sans Khmer';
+  font-style: normal;
+  font-weight: 400;
+  font-stretch: 100%;
+  font-display: swap;
+  src: url(https://fonts.gstatic.com/s/notosanskhmer/v23/ijwCs5roRME5LLRxjsRb-gssOenAyendxrgV2c-Zw-9vR1IFeh7j.woff2) format('woff2');
+  unicode-range: U+1780-17FF, U+19E0-19FF, U+200C, U+25CC;
+}
+
+/* latin-ext */
+@font-face {
+  font-family: 'Noto Sans Khmer';
+  font-style: normal;
+  font-weight: 400;
+  font-stretch: 100%;
+  font-display: swap;
+  src: url(https://fonts.gstatic.com/s/notosanskhmer/v23/ijwCs5roRME5LLRxjsRb-gssOenAyendxrgV2c-Zw-9vR1cFeh7j.woff2) format('woff2');
+  unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* latin */
+@font-face {
+  font-family: 'Noto Sans Khmer';
+  font-style: normal;
+  font-weight: 400;
+  font-stretch: 100%;
+  font-display: swap;
+  src: url(https://fonts.gstatic.com/s/notosanskhmer/v23/ijwCs5roRME5LLRxjsRb-gssOenAyendxrgV2c-Zw-9vR1kFeg.woff2) format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* sinhala */
+@font-face {
+  font-family: 'Noto Sans Sinhala';
+  font-style: normal;
+  font-weight: 300;
+  font-stretch: 100%;
+  font-display: swap;
+  src: url(https://fonts.gstatic.com/s/notosanssinhala/v26/yMJ7MJBya43H0SUF_WmcBEEf4rQVO2P524V5N_MxQzQtb-t19Pqq4-E.woff2) format('woff2');
+  unicode-range: U+0964-0965, U+0D81-0DF4, U+200C-200D, U+25CC, U+111E1-111F4;
+}
+
+/* latin-ext */
+@font-face {
+  font-family: 'Noto Sans Sinhala';
+  font-style: normal;
+  font-weight: 300;
+  font-stretch: 100%;
+  font-display: swap;
+  src: url(https://fonts.gstatic.com/s/notosanssinhala/v26/yMJ7MJBya43H0SUF_WmcBEEf4rQVO2P524V5N_MxQzQtb-t15_qq4-E.woff2) format('woff2');
+  unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* latin */
+@font-face {
+  font-family: 'Noto Sans Sinhala';
+  font-style: normal;
+  font-weight: 300;
+  font-stretch: 100%;
+  font-display: swap;
+  src: url(https://fonts.gstatic.com/s/notosanssinhala/v26/yMJ7MJBya43H0SUF_WmcBEEf4rQVO2P524V5N_MxQzQtb-t16fqq.woff2) format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* sinhala */
+@font-face {
+  font-family: 'Noto Sans Sinhala';
+  font-style: normal;
+  font-weight: 500;
+  font-stretch: 100%;
+  font-display: swap;
+  src: url(https://fonts.gstatic.com/s/notosanssinhala/v26/yMJ7MJBya43H0SUF_WmcBEEf4rQVO2P524V5N_MxQzQtb-t19Pqq4-E.woff2) format('woff2');
+  unicode-range: U+0964-0965, U+0D81-0DF4, U+200C-200D, U+25CC, U+111E1-111F4;
+}
+
+/* latin-ext */
+@font-face {
+  font-family: 'Noto Sans Sinhala';
+  font-style: normal;
+  font-weight: 500;
+  font-stretch: 100%;
+  font-display: swap;
+  src: url(https://fonts.gstatic.com/s/notosanssinhala/v26/yMJ7MJBya43H0SUF_WmcBEEf4rQVO2P524V5N_MxQzQtb-t15_qq4-E.woff2) format('woff2');
+  unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* latin */
+@font-face {
+  font-family: 'Noto Sans Sinhala';
+  font-style: normal;
+  font-weight: 500;
+  font-stretch: 100%;
+  font-display: swap;
+  src: url(https://fonts.gstatic.com/s/notosanssinhala/v26/yMJ7MJBya43H0SUF_WmcBEEf4rQVO2P524V5N_MxQzQtb-t16fqq.woff2) format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}

package/{app/assets/stylesheets → src/stylesheets/layout}/vds-header.scss

@@ -20,8 +20,9 @@
     padding: var(--header-y-padding) var(--layout-padding);
   }
 
-  .vds-logo {
+  .vds-logo-link {
     display: inline-flex;
+    text-decoration: none;
 
     svg {
       max-height: 40px;
@@ -31,4 +32,12 @@
       }
     }
   }
+
+  .vds-locale-picker {
+    border: none;
+    padding-right: 2.3em;
+    padding-left: 0.7em;
+    color: $primary;
+    background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 8 18'%3e%3cpath fill='none' stroke='%231e3461' stroke-linecap='round' stroke-linejoin='round' stroke-width='3' d='M2 5l6 6 6-6'/%3e%3c/svg%3e");
+  }
 }

package/{app/assets/stylesheets → src/stylesheets/layout}/vds-layout.scss

@@ -3,6 +3,10 @@ html, body {
 }
 
 .vds-body {
+  min-height: 100vh;
+  display: flex;
+  flex-direction: column;
+
   --page-max-width: 100%;
 
   &:not(.iframe) {
@@ -53,11 +57,10 @@ html, body {
 
 //  Sticky footer
 .vds-header-and-content {
-  min-height: 100%;
-  padding-bottom: 3.5rem;
   position: relative;
   display: flex;
   flex-direction: column;
+  flex-grow: 1;
 
   .vds-page-content {
     padding: var(--layout-padding);
@@ -67,15 +70,13 @@ html, body {
 .vds-footer {
   background-color: var(--bs-primary);
   color: white;
-  margin-top: -3.5rem;
-  height: 3.5rem;
   position: relative;
   display: flex;
   flex-direction: column;
   justify-content: center;
 
   .vds-container {
-    padding: 0 var(--layout-padding);
+    padding: 1rem var(--layout-padding);
   }
 
   a {

package/{app/assets/stylesheets/logo.css → src/stylesheets/logo.scss}

@@ -32,7 +32,7 @@
   --vipassana-logo-title-color: white;
   --vipassana-logo-tagline-color: #ffffff90;
 }
-.vipassana-logo[data-disposition="auto"] {
+.vipassana-logo[data-disposition="default"] {
   max-width: 48em; /* the title will wrap if it's too long */
 }
 .vipassana-logo[data-disposition="centered"] {
@@ -46,10 +46,6 @@
   max-width: 3.9em;
   margin-right: 1em;
 }
-[dir="rtl"] .vipassana-logo .logo-wheel {
-  margin-left: 1em;
-  margin-right: 0;
-}
 .vipassana-logo[data-disposition="centered"] .logo-wheel {
   margin: 0 !important;
   margin-bottom: .6em !important;
@@ -70,7 +66,7 @@
 /* Title */
 .vipassana-logo .logo-title {
   color: var(--vipassana-logo-title-color);
-  font-family: var(--vipassana-headings-font-family);
+  font-family: var(--vds-headings-font-family);
   line-height: var(--vipassana-logo-title-line-height);
   font-size: var(--vipassana-logo-title-font-size);
   font-weight: normal;
@@ -101,10 +97,7 @@
   display: inline-flex;
 }
 .vipassana-logo:not([data-reverse="true"]) [data-start-with="v"] {
-  margin-left: -.17em;
-}
-[dir="rtl"] .vipassana-logo [data-start-with="v"] {
-  margin-left: 0 !important;
+  margin-left: -.17em /*rtl:0*/;
 }
 
 .vipassana-logo[data-disposition="left-two-lines"] .logo-title span {
@@ -118,7 +111,7 @@
 /* Tagline */
 .logo-subtitle {
   color: var(--vipassana-logo-tagline-color);
-  font-family: var(--vipassana-font-family);
+  font-family: var(--vds-font-family);
   font-weight: 300;
   font-size: var(--vipassana-logo-tagline-font-size);
   line-height: var(--vipassana-logo-tagline-line-height);

package/src/stylesheets/specific-fonts/fonts-gu.css

@@ -0,0 +1,65 @@
+/* gujarati */
+@font-face {
+  font-family: 'Noto Sans Gujarati';
+  font-style: normal;
+  font-weight: 300;
+  font-stretch: 100%;
+  font-display: swap;
+  src: url(https://fonts.gstatic.com/s/notosansgujarati/v23/wlpZgx_HC1ti5ViekvcxnhMlCVo3f5pv17ivlzsUB14gg1TMbXaYEL-C.woff2) format('woff2');
+  unicode-range: U+0964-0965, U+0A80-0AFF, U+200C-200D, U+20B9, U+25CC, U+A830-A839;
+}
+
+/* latin-ext */
+@font-face {
+  font-family: 'Noto Sans Gujarati';
+  font-style: normal;
+  font-weight: 300;
+  font-stretch: 100%;
+  font-display: swap;
+  src: url(https://fonts.gstatic.com/s/notosansgujarati/v23/wlpZgx_HC1ti5ViekvcxnhMlCVo3f5pv17ivlzsUB14gg1TMbWOYEL-C.woff2) format('woff2');
+  unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* latin */
+@font-face {
+  font-family: 'Noto Sans Gujarati';
+  font-style: normal;
+  font-weight: 300;
+  font-stretch: 100%;
+  font-display: swap;
+  src: url(https://fonts.gstatic.com/s/notosansgujarati/v23/wlpZgx_HC1ti5ViekvcxnhMlCVo3f5pv17ivlzsUB14gg1TMbW2YEA.woff2) format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+
+/* gujarati */
+@font-face {
+  font-family: 'Noto Sans Gujarati';
+  font-style: normal;
+  font-weight: 400;
+  font-stretch: 100%;
+  font-display: swap;
+  src: url(https://fonts.gstatic.com/s/notosansgujarati/v23/wlpZgx_HC1ti5ViekvcxnhMlCVo3f5pv17ivlzsUB14gg1TMbXaYEL-C.woff2) format('woff2');
+  unicode-range: U+0964-0965, U+0A80-0AFF, U+200C-200D, U+20B9, U+25CC, U+A830-A839;
+}
+
+/* latin-ext */
+@font-face {
+  font-family: 'Noto Sans Gujarati';
+  font-style: normal;
+  font-weight: 400;
+  font-stretch: 100%;
+  font-display: swap;
+  src: url(https://fonts.gstatic.com/s/notosansgujarati/v23/wlpZgx_HC1ti5ViekvcxnhMlCVo3f5pv17ivlzsUB14gg1TMbWOYEL-C.woff2) format('woff2');
+  unicode-range: U+0100-02AF, U+0304, U+0308, U+0329, U+1E00-1E9F, U+1EF2-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+
+/* latin */
+@font-face {
+  font-family: 'Noto Sans Gujarati';
+  font-style: normal;
+  font-weight: 400;
+  font-stretch: 100%;
+  font-display: swap;
+  src: url(https://fonts.gstatic.com/s/notosansgujarati/v23/wlpZgx_HC1ti5ViekvcxnhMlCVo3f5pv17ivlzsUB14gg1TMbW2YEA.woff2) format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}