Add RTL support using BSv5 (#2002)

google · May 16, 2024 · 3674691 · 3674691
1 parent 102892d
commit 3674691
Show file tree

Hide file tree

Showing 8 changed files with 50 additions and 16 deletions.
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
@@ -1,5 +1,8 @@
 <!doctype html>
-<html itemscope itemtype="http://schema.org/WebPage" lang="{{ .Site.Language.Lang }}" class="no-js">
+<html itemscope itemtype="http://schema.org/WebPage"
+    {{- with .Site.Language.LanguageDirection }} dir="{{ . }}" {{- end -}}
+    {{ with .Site.Language.Lang }} lang="{{ . }}" {{- end }} {{/**/ -}}
+    class="no-js">
   <head>
     {{ partial "head.html" . }}
   </head>

diff --git a/layouts/blog/baseof.html b/layouts/blog/baseof.html
@@ -1,5 +1,8 @@
 <!doctype html>
-<html itemscope itemtype="http://schema.org/WebPage" lang="{{ .Site.Language.Lang }}" class="no-js">
+<html itemscope itemtype="http://schema.org/WebPage"
+    {{- with .Site.Language.LanguageDirection }} dir="{{ . }}" {{- end -}}
+    {{ with .Site.Language.Lang }} lang="{{ . }}" {{- end }} {{/**/ -}}
+    class="no-js">
   <head>
     {{ partial "head.html" . }}
   </head>

diff --git a/layouts/blog/baseof.print.html b/layouts/blog/baseof.print.html
@@ -1,5 +1,8 @@
 <!doctype html>
-<html itemscope itemtype="http://schema.org/WebPage" lang="{{ .Site.Language.Lang }}" class="no-js">
+<html itemscope itemtype="http://schema.org/WebPage"
+    {{- with .Site.Language.LanguageDirection }} dir="{{ . }}" {{- end -}}
+    {{ with .Site.Language.Lang }} lang="{{ . }}" {{- end }} {{/**/ -}}
+    class="no-js">
   <head>
     {{ partial "head.html" . }}
   </head>

diff --git a/layouts/docs/baseof.html b/layouts/docs/baseof.html
@@ -1,5 +1,8 @@
 <!doctype html>
-<html itemscope itemtype="http://schema.org/WebPage" lang="{{ .Site.Language.Lang }}" class="no-js">
+<html itemscope itemtype="http://schema.org/WebPage"
+    {{- with .Site.Language.LanguageDirection }} dir="{{ . }}" {{- end -}}
+    {{ with .Site.Language.Lang }} lang="{{ . }}" {{- end }} {{/**/ -}}
+    class="no-js">
   <head>
     {{ partial "head.html" . }}
   </head>

diff --git a/layouts/docs/baseof.print.html b/layouts/docs/baseof.print.html
@@ -1,5 +1,8 @@
 <!doctype html>
-<html itemscope itemtype="http://schema.org/WebPage" lang="{{ .Site.Language.Lang }}" class="no-js">
+<html itemscope itemtype="http://schema.org/WebPage"
+    {{- with .Site.Language.LanguageDirection }} dir="{{ . }}" {{- end -}}
+    {{ with .Site.Language.Lang }} lang="{{ . }}" {{- end }} {{/**/ -}}
+    class="no-js">
   <head>
     {{ partial "head.html" . }}
   </head>

diff --git a/layouts/partials/head-css.html b/layouts/partials/head-css.html
@@ -1,11 +1,27 @@
+{{ $scssMain := "scss/main.scss" -}}
+{{ $css := resources.Get $scssMain
+      | toCSS (dict "enableSourceMap" (not hugo.IsProduction)) -}}
+{{ $rtlCSS :=
+    cond (eq .Site.Language.LanguageDirection "rtl")
+        (resources.Get "vendor/bootstrap/dist/css/bootstrap.rtl.css")
+        nil -}}
+
+{{ if hugo.IsProduction -}}
+  {{ with $rtlCSS -}}
+    {{ $rtlCSS = . | postCSS | minify | fingerprint -}}
+  {{ end -}}
+  {{ $css   = $css | postCSS | minify | fingerprint -}}
+  <link rel="preload" href="{{ $css.RelPermalink }}" as="style">
+{{- end -}}
+
+{{/* NOTE: when not in production, we don't apply `postCSS`. This makes it
+snappier to develop in Chrome, but makes it look sub-optimal in other browsers.
+*/ -}}
 
-{{ $scssMain := "scss/main.scss"}}
-{{ if not hugo.IsProduction }}
-{{/* Note the missing postCSS. This makes it snappier to develop in Chrome, but makes it look sub-optimal in other browsers. */}}
-{{ $css := resources.Get $scssMain | toCSS (dict "enableSourceMap" true) }}
 <link href="{{ $css.RelPermalink }}" rel="stylesheet">
-{{ else }}
-{{ $css := resources.Get $scssMain | toCSS (dict "enableSourceMap" false) | postCSS | minify | fingerprint }}
-<link rel="preload" href="{{ $css.RelPermalink }}" as="style">
-<link href="{{ $css.RelPermalink }}" rel="stylesheet" integrity="{{ $css.Data.integrity }}">
-{{ end }}
+
+{{ with $rtlCSS -}}
+  <link href="{{ $rtlCSS.RelPermalink }}" rel="stylesheet">
+{{ end -}}
+
+{{- /**/ -}}
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
@@ -24,7 +24,7 @@
 {{ template "_internal/opengraph.html" . -}}
 {{ template "_internal/schema.html" . -}}
 {{ template "_internal/twitter_cards.html" . -}}
-{{ partialCached "head-css.html" . "asdf" -}}
+{{ partialCached "head-css.html" . "head-css-cache-key" }}
 <script
   src="https://code.jquery.com/jquery-3.7.1.min.js"
   integrity="sha512-v2CJ7UaYy4JwqLDIrZUI/4hqeoQieOmAZNXBeQyjo21dadnwR+8ZaIJVT8EE2iyI61OV8e6M8PP2/4hpQINQ/g=="

diff --git a/layouts/swagger/baseof.html b/layouts/swagger/baseof.html
@@ -1,5 +1,8 @@
 <!doctype html>
-<html itemscope itemtype="http://schema.org/WebPage" lang="{{ .Site.Language.Lang }}" class="no-js">
+<html itemscope itemtype="http://schema.org/WebPage"
+    {{- with .Site.Language.LanguageDirection }} dir="{{ . }}" {{- end -}}
+    {{ with .Site.Language.Lang }} lang="{{ . }}" {{- end }} {{/**/ -}}
+    class="no-js">
   <head>
     {{ partial "head.html" . }}
     <title>{{ if .IsHome }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{ . }} | {{ end }}{{ .Site.Title }}{{ end }}</title>