website: adjustments to "using" after #497 (and update jekyll script while at it)

This commit is contained in:
Rasmus Andersson 2022-09-29 12:10:43 -07:00
parent 4e99e332a5
commit 47f233286a
6 changed files with 37 additions and 24 deletions

1
docs/.gitignore vendored
View file

@ -1,3 +1,4 @@
/.jekyll* /.jekyll*
/.ruby*
/_site /_site
/lab/fonts /lab/fonts

View file

@ -32,4 +32,6 @@ gem "wdm", "~> 0.1.1", :platforms => [:mingw, :x64_mingw, :mswin]
# do not have a Java counterpart. # do not have a Java counterpart.
gem "http_parser.rb", "~> 0.6.0", :platforms => [:jruby] gem "http_parser.rb", "~> 0.6.0", :platforms => [:jruby]
gem "webrick", "~> 1.7" gem "jekyll-redirect-from"
gem "webrick"

View file

@ -1,8 +1,8 @@
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
addressable (2.8.0) addressable (2.8.1)
public_suffix (>= 2.0.2, < 5.0) public_suffix (>= 2.0.2, < 6.0)
colorator (1.1.0) colorator (1.1.0)
concurrent-ruby (1.1.10) concurrent-ruby (1.1.10)
em-websocket (0.5.3) em-websocket (0.5.3)
@ -12,7 +12,7 @@ GEM
ffi (1.15.5) ffi (1.15.5)
forwardable-extended (2.6.0) forwardable-extended (2.6.0)
http_parser.rb (0.8.0) http_parser.rb (0.8.0)
i18n (1.10.0) i18n (1.12.0)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
jekyll (4.2.2) jekyll (4.2.2)
addressable (~> 2.4) addressable (~> 2.4)
@ -31,6 +31,8 @@ GEM
terminal-table (~> 2.0) terminal-table (~> 2.0)
jekyll-feed (0.16.0) jekyll-feed (0.16.0)
jekyll (>= 3.7, < 5.0) jekyll (>= 3.7, < 5.0)
jekyll-redirect-from (0.16.0)
jekyll (>= 3.3, < 5.0)
jekyll-sass-converter (2.2.0) jekyll-sass-converter (2.2.0)
sassc (> 2.0.1, < 3.0) sassc (> 2.0.1, < 3.0)
jekyll-seo-tag (2.8.0) jekyll-seo-tag (2.8.0)
@ -52,12 +54,12 @@ GEM
jekyll-seo-tag (~> 2.1) jekyll-seo-tag (~> 2.1)
pathutil (0.16.2) pathutil (0.16.2)
forwardable-extended (~> 2.6) forwardable-extended (~> 2.6)
public_suffix (4.0.7) public_suffix (5.0.0)
rb-fsevent (0.11.1) rb-fsevent (0.11.2)
rb-inotify (0.10.1) rb-inotify (0.10.1)
ffi (~> 1.0) ffi (~> 1.0)
rexml (3.2.5) rexml (3.2.5)
rouge (3.28.0) rouge (3.30.0)
safe_yaml (1.0.5) safe_yaml (1.0.5)
sassc (2.4.0) sassc (2.4.0)
ffi (~> 1.9) ffi (~> 1.9)
@ -67,17 +69,18 @@ GEM
webrick (1.7.0) webrick (1.7.0)
PLATFORMS PLATFORMS
arm64-darwin-21 x86_64-darwin-19
DEPENDENCIES DEPENDENCIES
http_parser.rb (~> 0.6.0) http_parser.rb (~> 0.6.0)
jekyll (~> 4.2.2) jekyll (~> 4.2.2)
jekyll-feed (~> 0.12) jekyll-feed (~> 0.12)
jekyll-redirect-from
minima (~> 2.5) minima (~> 2.5)
tzinfo (~> 1.2) tzinfo (~> 1.2)
tzinfo-data tzinfo-data
wdm (~> 0.1.1) wdm (~> 0.1.1)
webrick (~> 1.7) webrick
BUNDLED WITH BUNDLED WITH
2.3.14 2.3.22

View file

@ -6,13 +6,22 @@ export PATH := $(BIN):$(PATH)
default: default:
@echo "Please specify a target: build, serve or dist" >&2 @echo "Please specify a target: build, serve or dist" >&2
build: build: .ruby-bundle
rm -rf _site rm -rf _site
bundle exec jekyll build bundle exec jekyll build
serve: serve: .ruby-bundle
./_scripts/serve.sh ./_scripts/serve.sh
.ruby-bundle: Gemfile Gemfile.lock
@if ! (command -v bundle >/dev/null && command -v jekyll >/dev/null); then \
echo "Please install Ruby bundle and jekyll: gem install bundler jekyll" >&2; \
exit 1; \
fi
bundle update
bundle install
touch .ruby-bundle
# ----------------------------------------------------------------------- # -----------------------------------------------------------------------
dist: fonts info dist: fonts info

View file

@ -5,5 +5,5 @@ assign url_root = "/" %}{% else %}{%
assign url_root = "/inter/" %}{% endif %}{% assign url_root = "/inter/" %}{% endif %}{%
assign font_v = site.data.fontinfo[0].version assign font_v = site.data.fontinfo[0].version
%}<link rel="preload" href="{{url_root}}font-files/Inter-roman.latin.var.woff2?v={{font_v}}" as="font" type="font/woff2" crossorigin="anonymous"> %}<link rel="preload" href="{{url_root}}font-files/Inter-roman.var.woff2?v={{font_v}}" as="font" type="font/woff2" crossorigin="anonymous">
<link rel="preload" href="{{url_root}}font-files/Inter-italic.latin.var.woff2?v={{font_v}}" as="font" type="font/woff2" crossorigin="anonymous"> <link rel="preload" href="{{url_root}}font-files/Inter-italic.var.woff2?v={{font_v}}" as="font" type="font/woff2" crossorigin="anonymous">

View file

@ -84,19 +84,17 @@ endfor
<p> <p>
Using Inter is as easy as Using Inter is as easy as
<a class="download-link" href="download/">downloading &amp; installing</a> <a class="download-link" href="download/">downloading &amp; installing</a>
the font files. If you're making a web thing, you can use the following CSS. the font files.<br>
<!-- or get it from <a href="https://fonts.google.com/specimen/Inter">Google Fonts</a>. --> If you're making a web thing, you can use the following HTML and CSS:
</p> </p>
<pre>&lt;link rel=&quot;preconnect&quot; href=&quot;https://rsms.me/&quot;&gt; <pre>&lt;!-- HTML in your document's head --&gt;
&lt;link rel=&quot;stylesheet&quot; href=&quot;https://rsms.me/inter/inter.css&quot;&gt;</pre> &lt;link rel=&quot;preconnect&quot; href=&quot;https://rsms.me/&quot;&gt;
<pre>html { &lt;link rel=&quot;stylesheet&quot; href=&quot;https://rsms.me/inter/inter.css&quot;&gt;
font-family: 'Inter', sans-serif;
}
/* CSS */
:root { font-family: 'Inter', sans-serif; }
@supports (font-variation-settings: normal) { @supports (font-variation-settings: normal) {
html { :root { font-family: 'Inter var', sans-serif; }
font-family: 'Inter var', sans-serif;
}
}</pre> }</pre>
</c> </c>