diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | docs/_includes/preload-font-files.html | 3 | ||||
| -rw-r--r-- | docs/_layouts/default.html | 1 | ||||
| -rwxr-xr-x | misc/tools/versionize-css.py | 32 | ||||
| -rwxr-xr-x | misc/tools/versionize.py | 33 |
5 files changed, 38 insertions, 33 deletions
@@ -251,7 +251,7 @@ pre_dist: dist: zip_dist $(MAKE) -j docs - misc/tools/versionize-css.py + misc/tools/versionize.py @echo "——————————————————————————————————————————————————————————————————" @echo "" @echo "Next steps:" diff --git a/docs/_includes/preload-font-files.html b/docs/_includes/preload-font-files.html new file mode 100644 index 000000000..9ea577a33 --- /dev/null +++ b/docs/_includes/preload-font-files.html @@ -0,0 +1,3 @@ +<link rel="preload" href="font-files/Inter-UI.var.woff2?v=3.2" as="font" type="font/woff2" crossorigin> +<link rel="preload" href="font-files/Inter-UI-upright.var.woff2?v=3.2" as="font" type="font/woff2" crossorigin> +<link rel="preload" href="font-files/Inter-UI-italic.var.woff2?v=3.2" as="font" type="font/woff2" crossorigin> diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html index b030a0fec..7c4fb12cf 100644 --- a/docs/_layouts/default.html +++ b/docs/_layouts/default.html @@ -35,6 +35,7 @@ endfor <link rel="stylesheet" href="{{url_root}}inter-ui.css?v={{ release_version }}"> <link rel="stylesheet" href="{{url_root}}res/base.css?v={{ base_css_v }}"> <link rel="icon" type="image/png" href="{{url_root}}res/favicon.png"> + {% include preload-font-files.html %} <meta name="format-detection" content="telephone=no"> <meta property="twitter:card" content="summary"> <meta property="twitter:site" content="@rsms"> diff --git a/misc/tools/versionize-css.py b/misc/tools/versionize-css.py deleted file mode 100755 index 4649ad88c..000000000 --- a/misc/tools/versionize-css.py +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env python -# encoding: utf8 -# -# Updates the "?v=x" in docs/inter-ui.css -# -import os, sys -from os.path import dirname, basename, abspath, relpath, join as pjoin -sys.path.append(abspath(pjoin(dirname(__file__), 'tools'))) -from common import BASEDIR, getVersion - -import re - - -def main(): - version = getVersion() - regex = re.compile(r'(url\("[^"]+?v=)([^"]+)("\))') - cssFileName = pjoin(BASEDIR, 'docs', 'inter-ui.css') - - s = '' - with open(cssFileName, 'r') as f: - s = f.read() - - s = regex.sub( - lambda m: '%s%s%s' % (m.group(1), version, m.group(3)), - s - ) - - with open(cssFileName, 'w') as f: - f.write(s) - -if __name__ == '__main__': - main() diff --git a/misc/tools/versionize.py b/misc/tools/versionize.py new file mode 100755 index 000000000..6064294e6 --- /dev/null +++ b/misc/tools/versionize.py @@ -0,0 +1,33 @@ +#!/usr/bin/env python +# encoding: utf8 +# +# Updates the "?v=x" in docs/inter-ui.css +# +import os, sys, re +from os.path import dirname, basename, abspath, relpath, join as pjoin +sys.path.append(abspath(pjoin(dirname(__file__), 'tools'))) +from common import BASEDIR, getVersion + +version = getVersion() + + +def updateCSSFile(filename): + regex = re.compile(r'(url\("[^"]+?v=)([^"]+)("\))') + with open(filename, 'r') as f: + s = f.read() + s = regex.sub(lambda m: '%s%s%s' % (m.group(1), version, m.group(3)), s) + with open(filename, 'w') as f: + f.write(s) + + +def updateHTMLFile(filename): + regex = re.compile(r'(href="[^"]+?v=)([^"]+)(")') + with open(filename, 'r') as f: + s = f.read() + s = regex.sub(lambda m: '%s%s%s' % (m.group(1), version, m.group(3)), s) + with open(filename, 'w') as f: + f.write(s) + + +updateCSSFile(pjoin(BASEDIR, 'docs', 'inter-ui.css')) +updateHTMLFile(pjoin(BASEDIR, 'docs', '_includes', 'preload-font-files.html')) |