From b0169e7e682b074a596b81b30d0518b53276ad80 Mon Sep 17 00:00:00 2001 From: Richard Dodd Date: Thu, 20 Apr 2023 21:29:14 +0100 Subject: [PATCH 01/11] Move over to Zola. Still needs a github action configuring. --- .gitignore | 1 + 404.html | 24 - CNAME | 1 - Gemfile | 27 - Gemfile.lock | 259 --------- _config.yml | 40 -- _layouts/home.html | 13 - _posts/2019-11-10-welcome-to-jekyll.markdown | 25 - config.toml | 18 + index.md | 13 - sass/main.scss | 579 +++++++++++++++++++ static/minima-social-icons.svg | 33 ++ templates/base.html | 78 +++ templates/index.html | 11 + 14 files changed, 720 insertions(+), 402 deletions(-) delete mode 100644 404.html delete mode 100644 CNAME delete mode 100644 Gemfile delete mode 100644 Gemfile.lock delete mode 100644 _config.yml delete mode 100644 _layouts/home.html delete mode 100644 _posts/2019-11-10-welcome-to-jekyll.markdown create mode 100644 config.toml delete mode 100644 index.md create mode 100644 sass/main.scss create mode 100644 static/minima-social-icons.svg create mode 100644 templates/base.html create mode 100644 templates/index.html diff --git a/.gitignore b/.gitignore index 45c1505..2217580 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ _site .sass-cache .jekyll-metadata +/public diff --git a/404.html b/404.html deleted file mode 100644 index c472b4e..0000000 --- a/404.html +++ /dev/null @@ -1,24 +0,0 @@ ---- -layout: default ---- - - - -
-

404

- -

Page not found :(

-

The requested page could not be found.

-
diff --git a/CNAME b/CNAME deleted file mode 100644 index 4831970..0000000 --- a/CNAME +++ /dev/null @@ -1 +0,0 @@ -linebender.org \ No newline at end of file diff --git a/Gemfile b/Gemfile deleted file mode 100644 index a820e90..0000000 --- a/Gemfile +++ /dev/null @@ -1,27 +0,0 @@ -source "https://rubygems.org" - -# Hello! This is where you manage which Jekyll version is used to run. -# When you want to use a different version, change it below, save the -# file and run `bundle install`. Run Jekyll with `bundle exec`, like so: -# -# bundle exec jekyll serve -# - -# This is the default theme for new Jekyll sites. You may change this to anything you like. -gem "minima", "~> 2.0" - -# If you want to use GitHub Pages, remove the "gem "jekyll"" above and -# uncomment the line below. To upgrade, run `bundle update github-pages`. - gem "github-pages", group: :jekyll_plugins - -# If you have any plugins, put them here! -group :jekyll_plugins do - gem "jekyll-feed", "~> 0.6" -end - -# Windows does not include zoneinfo files, so bundle the tzinfo-data gem -gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby] - -# Performance-booster for watching directories on Windows -gem "wdm", "~> 0.1.0" if Gem.win_platform? - diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index c39e51f..0000000 --- a/Gemfile.lock +++ /dev/null @@ -1,259 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - activesupport (4.2.11.1) - i18n (~> 0.7) - minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) - tzinfo (~> 1.1) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) - coffee-script (2.4.1) - coffee-script-source - execjs - coffee-script-source (1.11.1) - colorator (1.1.0) - commonmarker (0.17.13) - ruby-enum (~> 0.5) - concurrent-ruby (1.1.5) - dnsruby (1.61.3) - addressable (~> 2.5) - em-websocket (0.5.1) - eventmachine (>= 0.12.9) - http_parser.rb (~> 0.6.0) - ethon (0.12.0) - ffi (>= 1.3.0) - eventmachine (1.2.7) - eventmachine (1.2.7-x64-mingw32) - execjs (2.7.0) - faraday (0.17.0) - multipart-post (>= 1.2, < 3) - ffi (1.11.1) - ffi (1.11.1-x64-mingw32) - forwardable-extended (2.6.0) - gemoji (3.0.1) - github-pages (202) - activesupport (= 4.2.11.1) - github-pages-health-check (= 1.16.1) - jekyll (= 3.8.5) - jekyll-avatar (= 0.6.0) - jekyll-coffeescript (= 1.1.1) - jekyll-commonmark-ghpages (= 0.1.6) - jekyll-default-layout (= 0.1.4) - jekyll-feed (= 0.11.0) - jekyll-gist (= 1.5.0) - jekyll-github-metadata (= 2.12.1) - jekyll-mentions (= 1.4.1) - jekyll-optional-front-matter (= 0.3.0) - jekyll-paginate (= 1.1.0) - jekyll-readme-index (= 0.2.0) - jekyll-redirect-from (= 0.14.0) - jekyll-relative-links (= 0.6.0) - jekyll-remote-theme (= 0.4.0) - jekyll-sass-converter (= 1.5.2) - jekyll-seo-tag (= 2.5.0) - jekyll-sitemap (= 1.2.0) - jekyll-swiss (= 0.4.0) - jekyll-theme-architect (= 0.1.1) - jekyll-theme-cayman (= 0.1.1) - jekyll-theme-dinky (= 0.1.1) - jekyll-theme-hacker (= 0.1.1) - jekyll-theme-leap-day (= 0.1.1) - jekyll-theme-merlot (= 0.1.1) - jekyll-theme-midnight (= 0.1.1) - jekyll-theme-minimal (= 0.1.1) - jekyll-theme-modernist (= 0.1.1) - jekyll-theme-primer (= 0.5.3) - jekyll-theme-slate (= 0.1.1) - jekyll-theme-tactile (= 0.1.1) - jekyll-theme-time-machine (= 0.1.1) - jekyll-titles-from-headings (= 0.5.1) - jemoji (= 0.10.2) - kramdown (= 1.17.0) - liquid (= 4.0.0) - listen (= 3.1.5) - mercenary (~> 0.3) - minima (= 2.5.0) - nokogiri (>= 1.10.4, < 2.0) - rouge (= 3.11.0) - terminal-table (~> 1.4) - github-pages-health-check (1.16.1) - addressable (~> 2.3) - dnsruby (~> 1.60) - octokit (~> 4.0) - public_suffix (~> 3.0) - typhoeus (~> 1.3) - html-pipeline (2.12.0) - activesupport (>= 2) - nokogiri (>= 1.4) - http_parser.rb (0.6.0) - i18n (0.9.5) - concurrent-ruby (~> 1.0) - jekyll (3.8.5) - addressable (~> 2.4) - colorator (~> 1.0) - em-websocket (~> 0.5) - i18n (~> 0.7) - jekyll-sass-converter (~> 1.0) - jekyll-watch (~> 2.0) - kramdown (~> 1.14) - liquid (~> 4.0) - mercenary (~> 0.3.3) - pathutil (~> 0.9) - rouge (>= 1.7, < 4) - safe_yaml (~> 1.0) - jekyll-avatar (0.6.0) - jekyll (~> 3.0) - jekyll-coffeescript (1.1.1) - coffee-script (~> 2.2) - coffee-script-source (~> 1.11.1) - jekyll-commonmark (1.3.1) - commonmarker (~> 0.14) - jekyll (>= 3.7, < 5.0) - jekyll-commonmark-ghpages (0.1.6) - commonmarker (~> 0.17.6) - jekyll-commonmark (~> 1.2) - rouge (>= 2.0, < 4.0) - jekyll-default-layout (0.1.4) - jekyll (~> 3.0) - jekyll-feed (0.11.0) - jekyll (~> 3.3) - jekyll-gist (1.5.0) - octokit (~> 4.2) - jekyll-github-metadata (2.12.1) - jekyll (~> 3.4) - octokit (~> 4.0, != 4.4.0) - jekyll-mentions (1.4.1) - html-pipeline (~> 2.3) - jekyll (~> 3.0) - jekyll-optional-front-matter (0.3.0) - jekyll (~> 3.0) - jekyll-paginate (1.1.0) - jekyll-readme-index (0.2.0) - jekyll (~> 3.0) - jekyll-redirect-from (0.14.0) - jekyll (~> 3.3) - jekyll-relative-links (0.6.0) - jekyll (~> 3.3) - jekyll-remote-theme (0.4.0) - addressable (~> 2.0) - jekyll (~> 3.5) - rubyzip (>= 1.2.1, < 3.0) - jekyll-sass-converter (1.5.2) - sass (~> 3.4) - jekyll-seo-tag (2.5.0) - jekyll (~> 3.3) - jekyll-sitemap (1.2.0) - jekyll (~> 3.3) - jekyll-swiss (0.4.0) - jekyll-theme-architect (0.1.1) - jekyll (~> 3.5) - jekyll-seo-tag (~> 2.0) - jekyll-theme-cayman (0.1.1) - jekyll (~> 3.5) - jekyll-seo-tag (~> 2.0) - jekyll-theme-dinky (0.1.1) - jekyll (~> 3.5) - jekyll-seo-tag (~> 2.0) - jekyll-theme-hacker (0.1.1) - jekyll (~> 3.5) - jekyll-seo-tag (~> 2.0) - jekyll-theme-leap-day (0.1.1) - jekyll (~> 3.5) - jekyll-seo-tag (~> 2.0) - jekyll-theme-merlot (0.1.1) - jekyll (~> 3.5) - jekyll-seo-tag (~> 2.0) - jekyll-theme-midnight (0.1.1) - jekyll (~> 3.5) - jekyll-seo-tag (~> 2.0) - jekyll-theme-minimal (0.1.1) - jekyll (~> 3.5) - jekyll-seo-tag (~> 2.0) - jekyll-theme-modernist (0.1.1) - jekyll (~> 3.5) - jekyll-seo-tag (~> 2.0) - jekyll-theme-primer (0.5.3) - jekyll (~> 3.5) - jekyll-github-metadata (~> 2.9) - jekyll-seo-tag (~> 2.0) - jekyll-theme-slate (0.1.1) - jekyll (~> 3.5) - jekyll-seo-tag (~> 2.0) - jekyll-theme-tactile (0.1.1) - jekyll (~> 3.5) - jekyll-seo-tag (~> 2.0) - jekyll-theme-time-machine (0.1.1) - jekyll (~> 3.5) - jekyll-seo-tag (~> 2.0) - jekyll-titles-from-headings (0.5.1) - jekyll (~> 3.3) - jekyll-watch (2.2.1) - listen (~> 3.0) - jemoji (0.10.2) - gemoji (~> 3.0) - html-pipeline (~> 2.2) - jekyll (~> 3.0) - kramdown (1.17.0) - liquid (4.0.0) - listen (3.1.5) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - ruby_dep (~> 1.2) - mercenary (0.3.6) - mini_portile2 (2.8.1) - minima (2.5.0) - jekyll (~> 3.5) - jekyll-feed (~> 0.9) - jekyll-seo-tag (~> 2.1) - minitest (5.13.0) - multipart-post (2.1.1) - nokogiri (1.14.3) - mini_portile2 (~> 2.8.0) - racc (~> 1.4) - octokit (4.14.0) - sawyer (~> 0.8.0, >= 0.5.3) - pathutil (0.16.2) - forwardable-extended (~> 2.6) - public_suffix (3.1.1) - racc (1.6.2) - rb-fsevent (0.10.3) - rb-inotify (0.10.0) - ffi (~> 1.0) - rouge (3.11.0) - ruby-enum (0.7.2) - i18n - ruby_dep (1.5.0) - rubyzip (2.0.0) - safe_yaml (1.0.5) - sass (3.7.4) - sass-listen (~> 4.0.0) - sass-listen (4.0.0) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - sawyer (0.8.2) - addressable (>= 2.3.5) - faraday (> 0.8, < 2.0) - terminal-table (1.8.0) - unicode-display_width (~> 1.1, >= 1.1.1) - thread_safe (0.3.6) - typhoeus (1.3.1) - ethon (>= 0.9.0) - tzinfo (1.2.10) - thread_safe (~> 0.1) - tzinfo-data (1.2020.1) - tzinfo (>= 1.0.0) - unicode-display_width (1.6.0) - -PLATFORMS - ruby - x64-mingw32 - -DEPENDENCIES - github-pages - jekyll-feed (~> 0.6) - minima (~> 2.0) - tzinfo-data - -BUNDLED WITH - 2.1.4 diff --git a/_config.yml b/_config.yml deleted file mode 100644 index c2b17e8..0000000 --- a/_config.yml +++ /dev/null @@ -1,40 +0,0 @@ -# Welcome to Jekyll! -# -# This config file is meant for settings that affect your whole blog, values -# which you are expected to set up once and rarely edit after that. If you find -# yourself editing this file very often, consider using Jekyll's data files -# feature for the data you need to update frequently. -# -# For technical reasons, this file is *NOT* reloaded automatically when you use -# 'bundle exec jekyll serve'. If you change this file, please restart the server process. - -# Site settings -# These are used to personalize your new site. If you look in the HTML files, -# you will see them accessed via {{ site.title }}, {{ site.email }}, and so on. -# You can create any custom variable you would like, and they will be accessible -# in the templates via {{ site.myvariable }}. -title: Linebender -email: raph@levien.com -description: >- # this means to ignore newlines until "baseurl:" - Homepage for Linebender organization -baseurl: "" # the subpath of your site, e.g. /blog -url: "" # the base hostname & protocol for your site, e.g. http://example.com -github_username: linebender - -# Build settings -markdown: kramdown -theme: minima -plugins: - - jekyll-feed - -# Exclude from processing. -# The following items will not be processed, by default. Create a custom list -# to override the default setting. -# exclude: -# - Gemfile -# - Gemfile.lock -# - node_modules -# - vendor/bundle/ -# - vendor/cache/ -# - vendor/gems/ -# - vendor/ruby/ diff --git a/_layouts/home.html b/_layouts/home.html deleted file mode 100644 index 5f43fbf..0000000 --- a/_layouts/home.html +++ /dev/null @@ -1,13 +0,0 @@ ---- -layout: default ---- - -
- {%- if page.title -%} -

{{ page.title }}

- {%- endif -%} - - {{ content }} - - -
\ No newline at end of file diff --git a/_posts/2019-11-10-welcome-to-jekyll.markdown b/_posts/2019-11-10-welcome-to-jekyll.markdown deleted file mode 100644 index 8ecbc74..0000000 --- a/_posts/2019-11-10-welcome-to-jekyll.markdown +++ /dev/null @@ -1,25 +0,0 @@ ---- -layout: post -title: "Welcome to Jekyll!" -date: 2019-11-10 15:06:08 -0800 -categories: jekyll update ---- -You’ll find this post in your `_posts` directory. Go ahead and edit it and re-build the site to see your changes. You can rebuild the site in many different ways, but the most common way is to run `jekyll serve`, which launches a web server and auto-regenerates your site when a file is updated. - -To add new posts, simply add a file in the `_posts` directory that follows the convention `YYYY-MM-DD-name-of-post.ext` and includes the necessary front matter. Take a look at the source for this post to get an idea about how it works. - -Jekyll also offers powerful support for code snippets: - -{% highlight ruby %} -def print_hi(name) - puts "Hi, #{name}" -end -print_hi('Tom') -#=> prints 'Hi, Tom' to STDOUT. -{% endhighlight %} - -Check out the [Jekyll docs][jekyll-docs] for more info on how to get the most out of Jekyll. File all bugs/feature requests at [Jekyll’s GitHub repo][jekyll-gh]. If you have questions, you can ask them on [Jekyll Talk][jekyll-talk]. - -[jekyll-docs]: https://jekyllrb.com/docs/home -[jekyll-gh]: https://github.com/jekyll/jekyll -[jekyll-talk]: https://talk.jekyllrb.com/ diff --git a/config.toml b/config.toml new file mode 100644 index 0000000..92e09e2 --- /dev/null +++ b/config.toml @@ -0,0 +1,18 @@ +title = "Linebender" +description = "Homepage for the Linebender organisation" +base_url = "https://linebender.org/" + +# Whether to automatically compile all Sass files in the sass directory +compile_sass = true + +# Whether to build a search index to be used later on by a JavaScript library +build_search_index = true + +[markdown] +# Whether to do syntax highlighting +# Theme can be customised by setting the `highlight_theme` variable to a theme supported by Zola +highlight_code = true + +[extra] +# Put all your custom variables here +name = "Linebender" diff --git a/index.md b/index.md deleted file mode 100644 index f2d6f92..0000000 --- a/index.md +++ /dev/null @@ -1,13 +0,0 @@ ---- -# Feel free to add content and custom Front Matter to this file. -# To modify the layout, see https://jekyllrb.com/docs/themes/#overriding-theme-defaults - -layout: home ---- -Homepage for the [Linebender organization]. - -* [Druid](/druid/) - -TODO: links to other projects etc. - -[Linebender organization]: https://github.com/linebender diff --git a/sass/main.scss b/sass/main.scss new file mode 100644 index 0000000..42a215f --- /dev/null +++ b/sass/main.scss @@ -0,0 +1,579 @@ +body, +h1, +h2, +h3, +h4, +h5, +h6, +p, +blockquote, +pre, +hr, +dl, +dd, +ol, +ul, +figure { + margin:0; + padding:0 +} +body { + font:400 16px/1.5 -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Helvetica,Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol"; + color:#111; + background-color:#fdfdfd; + -webkit-text-size-adjust:100%; + -webkit-font-feature-settings:"kern" 1; + -moz-font-feature-settings:"kern" 1; + -o-font-feature-settings:"kern" 1; + font-feature-settings:"kern" 1; + font-kerning:normal; + display:flex; + min-height:100vh; + flex-direction:column +} +h1, +h2, +h3, +h4, +h5, +h6, +p, +blockquote, +pre, +ul, +ol, +dl, +figure, +.highlight { + margin-bottom:15px +} +main { + display:block +} +img { + max-width:100%; + vertical-align:middle +} +figure>img { + display:block +} +figcaption { + font-size:14px +} +ul, +ol { + margin-left:30px +} +li>ul, +li>ol { + margin-bottom:0 +} +h1, +h2, +h3, +h4, +h5, +h6 { + font-weight:400 +} +a { + color:#2a7ae2; + text-decoration:none +} +a:visited { + color:#1756a9 +} +a:hover { + color:#111; + text-decoration:underline +} +.social-media-list a:hover { + text-decoration:none +} +.social-media-list a:hover .username { + text-decoration:underline +} +blockquote { + color:#828282; + border-left:4px solid #e8e8e8; + padding-left:15px; + font-size:18px; + letter-spacing:-1px; + font-style:italic +} +blockquote>:last-child { + margin-bottom:0 +} +pre, +code { + font-size:15px; + border:1px solid #e8e8e8; + border-radius:3px; + background-color:#eef +} +code { + padding:1px 5px +} +pre { + padding:8px 12px; + overflow-x:auto +} +pre>code { + border:0; + padding-right:0; + padding-left:0 +} +.wrapper { + max-width:-webkit-calc(800px - (30px * 2)); + max-width:calc(800px - (30px * 2)); + margin-right:auto; + margin-left:auto; + padding-right:30px; + padding-left:30px +} +@media screen and (max-width: 800px) { + .wrapper { + max-width:-webkit-calc(800px - (30px)); + max-width:calc(800px - (30px)); + padding-right:15px; + padding-left:15px + } +} +.wrapper:after, +.footer-col-wrapper:after { + content:""; + display:table; + clear:both +} +.svg-icon { + width:16px; + height:16px; + display:inline-block; + fill:#828282; + padding-right:5px; + vertical-align:text-top +} +.social-media-list li+li { + padding-top:5px +} +table { + margin-bottom:30px; + width:100%; + text-align:left; + color:#3f3f3f; + border-collapse:collapse; + border:1px solid #e8e8e8 +} +table tr:nth-child(even) { + background-color:#f7f7f7 +} +table th, +table td { + padding:10px 15px +} +table th { + background-color:#f0f0f0; + border:1px solid #dedede; + border-bottom-color:#c9c9c9 +} +table td { + border:1px solid #e8e8e8 +} +.site-header { + border-top:5px solid #424242; + border-bottom:1px solid #e8e8e8; + min-height:55.95px; + position:relative +} +.site-title { + font-size:26px; + font-weight:300; + line-height:54px; + letter-spacing:-1px; + margin-bottom:0; + float:left +} +.site-title, +.site-title:visited { + color:#424242 +} +.site-nav { + float:right; + line-height:54px +} +.site-nav .nav-trigger { + display:none +} +.site-nav .menu-icon { + display:none +} +.site-nav .page-link { + color:#111; + line-height:1.5 +} +.site-nav .page-link:not(:last-child) { + margin-right:20px +} +@media screen and (max-width: 600px) { + .site-nav { + position:absolute; + top:9px; + right:15px; + background-color:#fdfdfd; + border:1px solid #e8e8e8; + border-radius:5px; + text-align:right + } + .site-nav label[for="nav-trigger"] { + display:block; + float:right; + width:36px; + height:36px; + z-index:2; + cursor:pointer + } + .site-nav .menu-icon { + display:block; + float:right; + width:36px; + height:26px; + line-height:0; + padding-top:10px; + text-align:center + } + .site-nav .menu-icon>svg { + fill:#424242 + } + .site-nav input ~ .trigger { + clear:both; + display:none + } + .site-nav input:checked ~ .trigger { + display:block; + padding-bottom:5px + } + .site-nav .page-link { + display:block; + padding:5px 10px; + margin-left:20px + } + .site-nav .page-link:not(:last-child) { + margin-right:0 + } +} +.site-footer { + border-top:1px solid #e8e8e8; + padding:30px 0 +} +.footer-heading { + font-size:18px; + margin-bottom:15px +} +.contact-list, +.social-media-list { + list-style:none; + margin-left:0 +} +.footer-col-wrapper { + font-size:15px; + color:#828282; + margin-left:-15px +} +.footer-col { + float:left; + margin-bottom:15px; + padding-left:15px +} +.footer-col-1 { + width:-webkit-calc(35% - (30px / 2)); + width:calc(35% - (30px / 2)) +} +.footer-col-2 { + width:-webkit-calc(20% - (30px / 2)); + width:calc(20% - (30px / 2)) +} +.footer-col-3 { + width:-webkit-calc(45% - (30px / 2)); + width:calc(45% - (30px / 2)) +} +@media screen and (max-width: 800px) { + .footer-col-1, + .footer-col-2 { + width:-webkit-calc(50% - (30px / 2)); + width:calc(50% - (30px / 2)) + } + .footer-col-3 { + width:-webkit-calc(100% - (30px / 2)); + width:calc(100% - (30px / 2)) + } +} +@media screen and (max-width: 600px) { + .footer-col { + float:none; + width:-webkit-calc(100% - (30px / 2)); + width:calc(100% - (30px / 2)) + } +} +.page-content { + padding:30px 0; + flex:1 +} +.page-heading { + font-size:32px +} +.post-list-heading { + font-size:28px +} +.post-list { + margin-left:0; + list-style:none +} +.post-list>li { + margin-bottom:30px +} +.post-meta { + font-size:14px; + color:#828282 +} +.post-link { + display:block; + font-size:24px +} +.post-header { + margin-bottom:30px +} +.post-title { + font-size:42px; + letter-spacing:-1px; + line-height:1 +} +@media screen and (max-width: 800px) { + .post-title { + font-size:36px + } +} +.post-content { + margin-bottom:30px +} +.post-content h2 { + font-size:32px +} +@media screen and (max-width: 800px) { + .post-content h2 { + font-size:28px + } +} +.post-content h3 { + font-size:26px +} +@media screen and (max-width: 800px) { + .post-content h3 { + font-size:22px + } +} +.post-content h4 { + font-size:20px +} +@media screen and (max-width: 800px) { + .post-content h4 { + font-size:18px + } +} +.highlight { + background:#fff +} +.highlighter-rouge .highlight { + background:#eef +} +.highlight .c { + color:#998; + font-style:italic +} +.highlight .err { + color:#a61717; + background-color:#e3d2d2 +} +.highlight .k { + font-weight:bold +} +.highlight .o { + font-weight:bold +} +.highlight .cm { + color:#998; + font-style:italic +} +.highlight .cp { + color:#999; + font-weight:bold +} +.highlight .c1 { + color:#998; + font-style:italic +} +.highlight .cs { + color:#999; + font-weight:bold; + font-style:italic +} +.highlight .gd { + color:#000; + background-color:#fdd +} +.highlight .gd .x { + color:#000; + background-color:#faa +} +.highlight .ge { + font-style:italic +} +.highlight .gr { + color:#a00 +} +.highlight .gh { + color:#999 +} +.highlight .gi { + color:#000; + background-color:#dfd +} +.highlight .gi .x { + color:#000; + background-color:#afa +} +.highlight .go { + color:#888 +} +.highlight .gp { + color:#555 +} +.highlight .gs { + font-weight:bold +} +.highlight .gu { + color:#aaa +} +.highlight .gt { + color:#a00 +} +.highlight .kc { + font-weight:bold +} +.highlight .kd { + font-weight:bold +} +.highlight .kp { + font-weight:bold +} +.highlight .kr { + font-weight:bold +} +.highlight .kt { + color:#458; + font-weight:bold +} +.highlight .m { + color:#099 +} +.highlight .s { + color:#d14 +} +.highlight .na { + color:teal +} +.highlight .nb { + color:#0086B3 +} +.highlight .nc { + color:#458; + font-weight:bold +} +.highlight .no { + color:teal +} +.highlight .ni { + color:purple +} +.highlight .ne { + color:#900; + font-weight:bold +} +.highlight .nf { + color:#900; + font-weight:bold +} +.highlight .nn { + color:#555 +} +.highlight .nt { + color:navy +} +.highlight .nv { + color:teal +} +.highlight .ow { + font-weight:bold +} +.highlight .w { + color:#bbb +} +.highlight .mf { + color:#099 +} +.highlight .mh { + color:#099 +} +.highlight .mi { + color:#099 +} +.highlight .mo { + color:#099 +} +.highlight .sb { + color:#d14 +} +.highlight .sc { + color:#d14 +} +.highlight .sd { + color:#d14 +} +.highlight .s2 { + color:#d14 +} +.highlight .se { + color:#d14 +} +.highlight .sh { + color:#d14 +} +.highlight .si { + color:#d14 +} +.highlight .sx { + color:#d14 +} +.highlight .sr { + color:#009926 +} +.highlight .s1 { + color:#d14 +} +.highlight .ss { + color:#990073 +} +.highlight .bp { + color:#999 +} +.highlight .vc { + color:teal +} +.highlight .vg { + color:teal +} +.highlight .vi { + color:teal +} +.highlight .il { + color:#099 +} diff --git a/static/minima-social-icons.svg b/static/minima-social-icons.svg new file mode 100644 index 0000000..fa7399f --- /dev/null +++ b/static/minima-social-icons.svg @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/templates/base.html b/templates/base.html new file mode 100644 index 0000000..2bb8a52 --- /dev/null +++ b/templates/base.html @@ -0,0 +1,78 @@ + + + + + + + + {{config.title}} | {{config.description}} + + + + + + + + + + + + + + + {% if config.generate_feed %} + + {% endif %} + + + +
+
+ {% block content %}{% endblock content %} +
+
+ + + diff --git a/templates/index.html b/templates/index.html new file mode 100644 index 0000000..568fc35 --- /dev/null +++ b/templates/index.html @@ -0,0 +1,11 @@ +{% extends "base.html" %} + +{% block content %} +
+

Homepage for the Linebender organization.

+ +

TODO: links to other projects etc.

+
+{% endblock content %} From a89eaa99fd774b1a5d830f84802430ea783726b2 Mon Sep 17 00:00:00 2001 From: Richard Dodd Date: Sat, 22 Apr 2023 12:45:28 +0100 Subject: [PATCH 02/11] WIP --- config.toml | 5 +++- content/_index.md | 61 ++++++++++++++++++++++++++++++++++++++++++++ templates/index.html | 8 +----- 3 files changed, 66 insertions(+), 8 deletions(-) create mode 100644 content/_index.md diff --git a/config.toml b/config.toml index 92e09e2..a23f92a 100644 --- a/config.toml +++ b/config.toml @@ -1,6 +1,8 @@ +base_url = "https://linebender.org/" + title = "Linebender" description = "Homepage for the Linebender organisation" -base_url = "https://linebender.org/" +default_language = "en" # Whether to automatically compile all Sass files in the sass directory compile_sass = true @@ -12,6 +14,7 @@ build_search_index = true # Whether to do syntax highlighting # Theme can be customised by setting the `highlight_theme` variable to a theme supported by Zola highlight_code = true +render_emoji = true [extra] # Put all your custom variables here diff --git a/content/_index.md b/content/_index.md new file mode 100644 index 0000000..06d348b --- /dev/null +++ b/content/_index.md @@ -0,0 +1,61 @@ ++++ +title = "Homepage" +description = "Homepage for the Linebender organization" ++++ + +Homepage for the [Linebender organization](https://github.com/linebender). + +# Linebender projects + +Below is a list of the main linebender projects, and a short description of each project's purpose. + +## Crates (actively developed) + +These crates are under active development. + + - [`xilem`][xilem] - An experimental Rust architecture for reactive UI. + + This crate is a spiritual successor to Druid, aiming to keep what is good while + improving on Druid's shortcomings. It uses a reactive architecture built on + top of view trees (this aproach is sometimes called 'virtual-DOM' or 'VDOM', which + comes from its roots in single-page web apps). + - [`vello`][vello] - An experimental GPU compute-centric 2D renderer. + + This crate contains a set of compute shaders and framework for rasterizing 2D + geometry on the GPU. The goal is high performance, low resource usage and easy + interoperability between platforms. + - [`glazier`][glazier] + - [`kurbo`][kurbo] + - [`peniko`][norad] + - [`velato`][velato] + - [`norad`][norad] - A crate for reading, writing, and manipulating [Unified Font Object] + files, a common font-design format. + +## Crates (passively maintained) + + - [`druid`][druid] + - [`piet`][piet] + - [`druid-shell`][druid-shell] + - [`druid-widget-nursery`][druid-widget-nursery] + - [`runebender`][runebender] + - [`skribo`][skribo] + +## Non-code repos + + - [`2d.graphics`][2d.graphics] + +[piet]: https://github.com/linebender/piet +[kurbo]: https://github.com/linebender/kurbo +[druid]: https://github.com/linebender/druid +[druid-shell]: https://github.com/linebender/druid/tree/master/druid-shell +[glazier]: https://github.com/linebender/glazier +[vello]: https://github.com/linebender/vello +[runebender]: https://github.com/linebender/runebender +[xilem]: https://github.com/linebender/xilem +[2d.graphics]: https://github.com/linebender/2d.graphics +[velato]: https://github.com/linebender/velato +[norad]: https://github.com/linebender/norad +[peniko]: https://github.com/linebender/peniko +[druid-widget-nursery]: https://github.com/linebender/druid-widget-nursery +[skribo]: https://github.com/linebender/skribo +[Unified Font Object]: http://unifiedfontobject.org/ diff --git a/templates/index.html b/templates/index.html index 568fc35..575141f 100644 --- a/templates/index.html +++ b/templates/index.html @@ -1,11 +1,5 @@ {% extends "base.html" %} {% block content %} -
-

Homepage for the Linebender organization.

- -

TODO: links to other projects etc.

-
+{{ section.content | safe }} {% endblock content %} From 6079e653353971cd2dac75376af47713ee6ebcce Mon Sep 17 00:00:00 2001 From: Richard Dodd Date: Sat, 22 Apr 2023 15:09:01 +0100 Subject: [PATCH 03/11] Initial content --- content/_index.md | 75 +++++++++++++++++++++++++++------- content/about.md | 19 +++++++++ static/minima-social-icons.svg | 1 - templates/base.html | 6 ++- templates/index.html | 4 ++ templates/page.html | 9 ++++ 6 files changed, 96 insertions(+), 18 deletions(-) create mode 100644 content/about.md create mode 100644 templates/page.html diff --git a/content/_index.md b/content/_index.md index 06d348b..60aee99 100644 --- a/content/_index.md +++ b/content/_index.md @@ -3,11 +3,11 @@ title = "Homepage" description = "Homepage for the Linebender organization" +++ -Homepage for the [Linebender organization](https://github.com/linebender). +Welcome to the homepage for the [Linebender organization](https://github.com/linebender). We are a friendly group of people who share an interest in 2D graphics and user interface design, with everything that entails. We hang out on [the Xi Zulip instance][xi.zulip] and always welcome new people. # Linebender projects -Below is a list of the main linebender projects, and a short description of each project's purpose. +Below is a list of the main linebender projects, and a short description of each project's purpose, as of 2023-04-22. ## Crates (actively developed) @@ -19,31 +19,63 @@ These crates are under active development. improving on Druid's shortcomings. It uses a reactive architecture built on top of view trees (this aproach is sometimes called 'virtual-DOM' or 'VDOM', which comes from its roots in single-page web apps). + - [`vello`][vello] - An experimental GPU compute-centric 2D renderer. This crate contains a set of compute shaders and framework for rasterizing 2D geometry on the GPU. The goal is high performance, low resource usage and easy interoperability between platforms. - - [`glazier`][glazier] - - [`kurbo`][kurbo] - - [`peniko`][norad] - - [`velato`][velato] - - [`norad`][norad] - A crate for reading, writing, and manipulating [Unified Font Object] - files, a common font-design format. + + - [`glazier`][glazier] - An experimental windowing library. + + This crate provides access to the platform API, in order to create windows and contexts to draw to, and to feed platform events like keypresses and mouse/touch events into an application. It serves a similar purpose to [`winit`][winit], and indeed either `winit` or `glazier` can be used as the windowing layer with `vello`. It exists because we have slightly different goals to `winit`: we want to provide rich desktop integration including things like menus, but there is a chance in the future that we can merge the functionality that we need into `winit` and use that crate instead. + + - [`kurbo`][kurbo] - A library for creating, manipulating and interrogating 2D curve shapes. + + At its core, `kurbo` is a library for contructing paths and splines out of straight lines and Bézier curves up to order 3 (known as cubic Béziers). It turns out that a series of cubic Bézier curves can be used to approximate any smooth curve with a very high degree of accuracy, compared to the number of curves required. They are also relatively easy to work with, and form the basis of the approach to curve rendering used in `vello`. The key abstraction is [`kurbo::Shape`](https://docs.rs/kurbo/latest/kurbo/trait.Shape.html), which provides the `path_elements` method. This method returns an interator over Bézier curves that approximate the type implementing the `Shape` trait, which `vello` can then draw. + + - [`peniko`][peniko] - A library for non-geometric drawing primitives. + + This crate provides a set of shared types for concepts that are important for drawing/stroking paths, but excluding the path geometry itself (which can be found in [`kurbo`][kurbo]). It includes types for brush styles (including gradient) and color. + +The following crates are not part of the `xilem`/`vello` stack, but are under active development. + + - [`velato`][velato] - A crate that renders lottie animations to vello. + - [`norad`][norad] - A crate for reading, writing, and manipulating [Unified Font Object] files, a common font-design format. ## Crates (passively maintained) - - [`druid`][druid] - - [`piet`][piet] - - [`druid-shell`][druid-shell] - - [`druid-widget-nursery`][druid-widget-nursery] - - [`runebender`][runebender] - - [`skribo`][skribo] + - [`druid`][druid] - A GUI framework for Rust + + `druid` is the original Linebender UI framework, and was the main focus of development until recently. There are many good things about `druid`, but the data model it uses (primarily `Lens`es) gets complicated in Rust, and doesn't compose as well as it would in a [GC'd][garbage collection] functional programming language. However, a lot of the things that work will will be copied straight over to `xilem`, and today `druid` is a solid choice for a new UI app projected to have low to medium complexity. The [#druid-help channel on Zulip](https://xi.zulipchat.com/#narrow/stream/255910-druid-help) is still monitored and you will likely get good answers to any quesitons you have. + + - [`piet`][piet] - An abstraction layer over platform 2D rendering facilities. + + The purpose of the `piet` library is to provide abstraction over the libraries used for 2D rendering on any particular platform ([Direct2D] on Windows, [Core Graphics] on Mac, and [cairo]/[pango] on Linux). The goal is for `piet` to be superseeded by the `vello` crate, which will provide state-of-the-art 2D rendering on any platform supported by [WebGPU]. + + - [`druid-shell`][druid-shell] - The old name for `glazier`. + + Previously, the windowing library `glazier` lived within the `druid` repository, and was called `druid-shell`. When work moved over to `vello`/`xilem`, there was debate over whether to split this code into its own crate, or move over to `winit`. We decided to keep using our own windowing library for now, to give us the flexibility to add or change what we need to, but we may try to unify with `winit` in the future. + + - [`druid-widget-nursery`][druid-widget-nursery] - A crate with widgets for `druid`. + + This crate contains lots of `druid` widgets that may be useful to UI developers. It includes things like widgets for [Material Icons], and a tree view (a way to draw data stored in a tree). It followed the very liberal [optimistic merging] strategy for handling PRs to minimize contributor friction, but the widgets contributed are all robust and high quality. + + - [`runebender`][runebender] - An experimental font editor. + + This was the motivating application for `druid` development. It is not currently seeing active development, but this may be revisited in the future. + + - [`skribo`][skribo] - A library for text layout. + + This library aims to perform the conversion from text and font attributes to glyph runs, similar to [harfbuzz]. It's not recommended to use this library as better alternatives exist, for example [`parley`] or [`cosmic-text`]. ## Non-code repos - - [`2d.graphics`][2d.graphics] + - [`2d.graphics`][2d.graphics] - A work-in-progress book explaining the current state of the art of different aspects of 2D graphics. + Currently the book mostly contains annotated reference lists, although some sections have written content. Pull requests welcome! The goal is to cover topics like color, shapes/curves, 2D GPU rendering, text, etc. + +[xi.zulip]: https://xi.zulipchat.com [piet]: https://github.com/linebender/piet [kurbo]: https://github.com/linebender/kurbo [druid]: https://github.com/linebender/druid @@ -59,3 +91,16 @@ These crates are under active development. [druid-widget-nursery]: https://github.com/linebender/druid-widget-nursery [skribo]: https://github.com/linebender/skribo [Unified Font Object]: http://unifiedfontobject.org/ +[winit]: https://github.com/rust-windowing/winit +[garbage collection]: https://en.wikipedia.org/wiki/Garbage_collection_(computer_science) +[Direct2D]: https://learn.microsoft.com/en-us/windows/win32/direct2d/direct2d-portal +[Core Graphics]: https://developer.apple.com/documentation/coregraphics +[cairo]: https://www.cairographics.org/ +[pango]: https://pango.gnome.org/ +[WebGPU]: https://www.w3.org/TR/webgpu/#intro +[Material Icons]: https://fonts.google.com/icons +[optimistic merging]: http://hintjens.com/blog:106 +[harfbuzz]: https://github.com/harfbuzz/harfbuzz +[`parley`]: https://github.com/dfrg/parley +[`cosmic-text`]: https://github.com/pop-os/cosmic-text + diff --git a/content/about.md b/content/about.md new file mode 100644 index 0000000..ad02001 --- /dev/null +++ b/content/about.md @@ -0,0 +1,19 @@ ++++ +title = "About" +slug = "about" ++++ + +This is the website for the [Linebender organization on GitHub]. The Linebender organization contains a collection of repositories, which when taken as a whole provide the tools and utilities required to create applications in Rust with a user interface. + +It is also a group of volunteers and enthusiasts who hang out on [our Zulip][xi.zulip], and who collaborate on designing and coding the different parts of the stack required for UI. We are a friendly bunch, and always welcome newcomers, whether they have any experience with 2D graphics and user interfaces or not. + +All the work of the Linebender is done in the open, and the full history of all conversations is available on Zulip. In fact, we recommend searching the chat history for any topic that you are interested in, as there have been many discussions in the past with novel and valuable ideas. All code is dual-licenses under the MIT and Apache-2.0 licenses (where possible) and we aim to license non-code material under the [CC-BY Creative Commons license][CC-BY]. In fact, the non-code portion of this website is licensed under CC-BY, while all code, including any JavaScript written by the authors, is available under the Apache-2.0 license. A copy of the Apache-2.0 license is available in [this website's repository][website repository]. + +The organisation was started by [Raph Levien], and he informally leads and drives the work forward. + +[Linebender organization on GitHub]: https://github.com/linebender +[xi.zulip]: https://xi.zulipchat.com +[Raph Levien]: https://levien.com/ +[CC-BY]: http://creativecommons.org/licenses/by/4.0/ +[Apache-2.0]: https://apache.org/licenses/LICENSE-2.0 +[website repository]: https://github.com/linebender/linebender.github.io/ diff --git a/static/minima-social-icons.svg b/static/minima-social-icons.svg index fa7399f..f7c3b81 100644 --- a/static/minima-social-icons.svg +++ b/static/minima-social-icons.svg @@ -29,5 +29,4 @@ - diff --git a/templates/base.html b/templates/base.html index 2bb8a52..bbb828b 100644 --- a/templates/base.html +++ b/templates/base.html @@ -39,7 +39,7 @@ -
+
{% block navlinks %}{% endblock navlinks %}
{% endblock header %} @@ -68,7 +68,9 @@

{{config.title}}

-

Homepage for Linebender organization

+

© 2023 The Linebender Authors.

+

Creative Commons License
This website's content is licensed under a Creative Commons Attribution 4.0 International License.

+

All code used in this website is available under the Apache-2.0 license.

{% endblock footer %} diff --git a/templates/index.html b/templates/index.html index 575141f..697a39f 100644 --- a/templates/index.html +++ b/templates/index.html @@ -1,5 +1,9 @@ {% extends "base.html" %} +{% block navlinks %} + About +{% endblock navlinks %} + {% block content %} {{ section.content | safe }} {% endblock content %} diff --git a/templates/page.html b/templates/page.html new file mode 100644 index 0000000..2a4fc75 --- /dev/null +++ b/templates/page.html @@ -0,0 +1,9 @@ +{% extends "base.html" %} + +{% block navlinks %} + About +{% endblock navlinks %} + +{% block content %} +{{ page.content | safe }} +{% endblock content %} From d423d453f43d27e79213a2ac124ad20e2bd83b79 Mon Sep 17 00:00:00 2001 From: "Richard Dodd (dodj)" Date: Sun, 23 Apr 2023 16:47:55 +0100 Subject: [PATCH 04/11] Update content/_index.md Co-authored-by: Raph Levien --- content/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/_index.md b/content/_index.md index 60aee99..681dc51 100644 --- a/content/_index.md +++ b/content/_index.md @@ -15,7 +15,7 @@ These crates are under active development. - [`xilem`][xilem] - An experimental Rust architecture for reactive UI. - This crate is a spiritual successor to Druid, aiming to keep what is good while +Xilem is a new UI toolkit with a medium-grained reactive architecture strongly inspired by SwiftUI. It is an evolution of Druid, aiming to keep what is good while improving on Druid's shortcomings. improving on Druid's shortcomings. It uses a reactive architecture built on top of view trees (this aproach is sometimes called 'virtual-DOM' or 'VDOM', which comes from its roots in single-page web apps). From b8d344b78b7919bee38ece991a5173ccf973964a Mon Sep 17 00:00:00 2001 From: "Richard Dodd (dodj)" Date: Sun, 23 Apr 2023 16:50:56 +0100 Subject: [PATCH 05/11] Update content/_index.md typo Co-authored-by: Raph Levien --- content/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/_index.md b/content/_index.md index 681dc51..26d701e 100644 --- a/content/_index.md +++ b/content/_index.md @@ -47,7 +47,7 @@ The following crates are not part of the `xilem`/`vello` stack, but are under ac - [`druid`][druid] - A GUI framework for Rust - `druid` is the original Linebender UI framework, and was the main focus of development until recently. There are many good things about `druid`, but the data model it uses (primarily `Lens`es) gets complicated in Rust, and doesn't compose as well as it would in a [GC'd][garbage collection] functional programming language. However, a lot of the things that work will will be copied straight over to `xilem`, and today `druid` is a solid choice for a new UI app projected to have low to medium complexity. The [#druid-help channel on Zulip](https://xi.zulipchat.com/#narrow/stream/255910-druid-help) is still monitored and you will likely get good answers to any quesitons you have. + `druid` is the original Linebender UI framework, and was the main focus of development until recently. There are many good things about `druid`, but the data model it uses (primarily `Lens`es) gets complicated in Rust, and doesn't compose as well as it would in a [GC'd][garbage collection] functional programming language. However, a lot of the things that work will will be copied straight over to `xilem`, and today `druid` is a solid choice for a new UI app projected to have low to medium complexity. The [#druid-help channel on Zulip](https://xi.zulipchat.com/#narrow/stream/255910-druid-help) is still monitored and you will likely get good answers to any questions you have. - [`piet`][piet] - An abstraction layer over platform 2D rendering facilities. From 81abaf78b8efefbdd75e73eb1c3ea753f93c80f4 Mon Sep 17 00:00:00 2001 From: "Richard Dodd (dodj)" Date: Sun, 23 Apr 2023 16:51:07 +0100 Subject: [PATCH 06/11] Update content/_index.md typo Co-authored-by: Raph Levien --- content/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/_index.md b/content/_index.md index 26d701e..b915c5f 100644 --- a/content/_index.md +++ b/content/_index.md @@ -51,7 +51,7 @@ The following crates are not part of the `xilem`/`vello` stack, but are under ac - [`piet`][piet] - An abstraction layer over platform 2D rendering facilities. - The purpose of the `piet` library is to provide abstraction over the libraries used for 2D rendering on any particular platform ([Direct2D] on Windows, [Core Graphics] on Mac, and [cairo]/[pango] on Linux). The goal is for `piet` to be superseeded by the `vello` crate, which will provide state-of-the-art 2D rendering on any platform supported by [WebGPU]. + The purpose of the `piet` library is to provide abstraction over the libraries used for 2D rendering on any particular platform ([Direct2D] on Windows, [Core Graphics] on Mac, and [cairo]/[pango] on Linux). The goal is for `piet` to be superseded by the `vello` crate, which will provide state-of-the-art 2D rendering on any platform supported by [WebGPU]. - [`druid-shell`][druid-shell] - The old name for `glazier`. From d7b1e16283b366fc0adc5b6cb93610f0ae8fca06 Mon Sep 17 00:00:00 2001 From: "Richard Dodd (dodj)" Date: Sun, 23 Apr 2023 16:56:40 +0100 Subject: [PATCH 07/11] Create LICENSE.apache-2.0 --- LICENSE.apache-2.0 | 201 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 201 insertions(+) create mode 100644 LICENSE.apache-2.0 diff --git a/LICENSE.apache-2.0 b/LICENSE.apache-2.0 new file mode 100644 index 0000000..261eeb9 --- /dev/null +++ b/LICENSE.apache-2.0 @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. From f4916c714b64380b19aa113b6e4f0c79309d5f0e Mon Sep 17 00:00:00 2001 From: Richard Dodd Date: Sun, 23 Apr 2023 16:55:10 +0100 Subject: [PATCH 08/11] Tidy up Raph's github suggestion. --- content/_index.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/content/_index.md b/content/_index.md index b915c5f..eefd351 100644 --- a/content/_index.md +++ b/content/_index.md @@ -15,10 +15,7 @@ These crates are under active development. - [`xilem`][xilem] - An experimental Rust architecture for reactive UI. -Xilem is a new UI toolkit with a medium-grained reactive architecture strongly inspired by SwiftUI. It is an evolution of Druid, aiming to keep what is good while improving on Druid's shortcomings. - improving on Druid's shortcomings. It uses a reactive architecture built on - top of view trees (this aproach is sometimes called 'virtual-DOM' or 'VDOM', which - comes from its roots in single-page web apps). + Xilem is a new UI toolkit with a medium-grained reactive architecture strongly inspired by SwiftUI. It is an evolution of Druid, aiming to keep what is good while improving on Druid's shortcomings. - [`vello`][vello] - An experimental GPU compute-centric 2D renderer. From 63877091c5d54ffa9ff397513455d7b375120d15 Mon Sep 17 00:00:00 2001 From: Richard Dodd Date: Sun, 23 Apr 2023 17:17:20 +0100 Subject: [PATCH 09/11] Implement suggestions in reivews --- content/_index.md | 4 +++- content/about.md | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/content/_index.md b/content/_index.md index eefd351..13e224e 100644 --- a/content/_index.md +++ b/content/_index.md @@ -72,6 +72,8 @@ The following crates are not part of the `xilem`/`vello` stack, but are under ac Currently the book mostly contains annotated reference lists, although some sections have written content. Pull requests welcome! The goal is to cover topics like color, shapes/curves, 2D GPU rendering, text, etc. + - [`linebender.github.io`][linebender.github.io] - This website. If you see anything that looks incorrect, please submit a PR to [the repo][linebender.github.io]. + [xi.zulip]: https://xi.zulipchat.com [piet]: https://github.com/linebender/piet [kurbo]: https://github.com/linebender/kurbo @@ -100,4 +102,4 @@ The following crates are not part of the `xilem`/`vello` stack, but are under ac [harfbuzz]: https://github.com/harfbuzz/harfbuzz [`parley`]: https://github.com/dfrg/parley [`cosmic-text`]: https://github.com/pop-os/cosmic-text - +[linebender.github.io]: https://github.com/linebender/linebender.github.io diff --git a/content/about.md b/content/about.md index ad02001..88381f2 100644 --- a/content/about.md +++ b/content/about.md @@ -7,7 +7,7 @@ This is the website for the [Linebender organization on GitHub]. The Linebender It is also a group of volunteers and enthusiasts who hang out on [our Zulip][xi.zulip], and who collaborate on designing and coding the different parts of the stack required for UI. We are a friendly bunch, and always welcome newcomers, whether they have any experience with 2D graphics and user interfaces or not. -All the work of the Linebender is done in the open, and the full history of all conversations is available on Zulip. In fact, we recommend searching the chat history for any topic that you are interested in, as there have been many discussions in the past with novel and valuable ideas. All code is dual-licenses under the MIT and Apache-2.0 licenses (where possible) and we aim to license non-code material under the [CC-BY Creative Commons license][CC-BY]. In fact, the non-code portion of this website is licensed under CC-BY, while all code, including any JavaScript written by the authors, is available under the Apache-2.0 license. A copy of the Apache-2.0 license is available in [this website's repository][website repository]. +All the work of the Linebender is done in the open, and the full history of all conversations is available on Zulip. In fact, we recommend searching the chat history for any topic that you are interested in, as there have been many discussions in the past with novel and valuable ideas. All code is dual-licenses under the MIT and Apache-2.0 licenses (where possible) and we aim to license non-code material under the [CC-BY Creative Commons license][CC-BY]. In fact, the non-code portion of this website is licensed under CC-BY, while all code, including any JavaScript written by the authors, is available under the Apache-2.0 license. A copy of the Apache-2.0 license is available in [this website's repository][website repository]. We reuse some code from the 'minima' Jekyll theme under the MIT license. The aim is to make any of the code on this website reuseable, so if the lincensing is causing friction please contact us [on Zulip][xi.zulip] and we'll work together to solve the problem. The organisation was started by [Raph Levien], and he informally leads and drives the work forward. From 36e5f58dc5360ca3c8699ec64585b327ba2b7135 Mon Sep 17 00:00:00 2001 From: Richard Dodd Date: Thu, 27 Apr 2023 14:51:51 +0100 Subject: [PATCH 10/11] Remove about slug since it's auto-generated --- content/about.md | 1 - 1 file changed, 1 deletion(-) diff --git a/content/about.md b/content/about.md index 88381f2..c9d5017 100644 --- a/content/about.md +++ b/content/about.md @@ -1,6 +1,5 @@ +++ title = "About" -slug = "about" +++ This is the website for the [Linebender organization on GitHub]. The Linebender organization contains a collection of repositories, which when taken as a whole provide the tools and utilities required to create applications in Rust with a user interface. From a8db1198e2e422b76fe1064ecb1c129111e1b20d Mon Sep 17 00:00:00 2001 From: Richard Dodd Date: Thu, 27 Apr 2023 14:56:49 +0100 Subject: [PATCH 11/11] Add README with details on how to build. --- README.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..d335433 --- /dev/null +++ b/README.md @@ -0,0 +1,14 @@ +This repository contains the website for [linebender.org](https://linebender.org). More details are +available on the website. + +# Development + +The steps you need to get building the website locally are: + + 1. [Install Zola](https://www.getzola.org/documentation/getting-started/installation/) + 2. Run `zola serve` in a terminal + 3. Go to the address logged to the terminal window (usually [localhost:1111](http://localhost:1111)). + + # Deployment + + This website is automatically deployed every time a PR is merged using Github actions.