Merge pull request #205 from sophie-h/sophie-h/overhaul

Overhaul website design and content

Author: GuillaumeGomez

_config.yml

@@ -1,5 +1,5 @@
 # Site settings
-title: Gtk-rs
+title: gtk-rs
 description: > # this means to ignore newlines until "baseurl:"
   Rust bindings for GTK and GLib-based libraries
 baseurl: "" # the subpath of your site, e.g. /blog/

_data/crates.json

@@ -1,38 +1,38 @@
 [
   {
+    "section": "Core",
+
     "name": "cairo-rs",
-    "max_version": "0.9.0"
-  },
-  {
-    "name": "gdk",
-    "max_version": "0.13.0"
-  },
-  {
-    "name": "gdk-pixbuf",
-    "max_version": "0.9.0"
-  },
-  {
-    "name": "gdk-x11",
-    "max_version": "0.9.0"
+    "max_version": "0.14.0",
+    "repo": "gtk-rs-core"
   },
   {
     "name": "gio",
-    "max_version": "0.9.0"
+    "max_version": "0.14.0",
+    "repo": "gtk-rs-core"
   },
   {
     "name": "glib",
-    "max_version": "0.10.0"
+    "max_version": "0.14.0",
+    "repo": "gtk-rs-core"
   },
   {
-    "name": "gtk",
-    "max_version": "0.9.0"
+    "name": "pango",
+    "max_version": "0.14.0",
+    "repo": "gtk-rs-core"
   },
   {
-    "name": "pango",
-    "max_version": "0.9.0"
+    "section": "GTK 3",
+
+    "name": "gtk",
+    "max_version": "0.14.0",
+    "repo": "gtk3-rs"
   },
   {
-    "name": "sourceview",
-    "max_version": "0.9.0"
+    "section": "GTK 4",
+
+    "name": "gtk4",
+    "max_version": "0.1.0",
+    "repo": "gtk4-rs"
   }
 ]

_includes/badges.html

@@ -0,0 +1,9 @@
+<ul class="contact">
+  <li><a href="https://matrix.to/#/#rust:gnome.org"><svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Matrix</title><path d="M.632.55v22.9H2.28V24H0V0h2.28v.55zm7.043 7.26v1.157h.033c.309-.443.683-.784 1.117-1.024.433-.245.936-.365 1.5-.365.54 0 1.033.107 1.481.314.448.208.785.582 1.02 1.108.254-.374.6-.706 1.034-.992.434-.287.95-.43 1.546-.43.453 0 .872.056 1.26.167.388.11.716.286.993.53.276.245.489.559.646.951.152.392.23.863.23 1.417v5.728h-2.349V11.52c0-.286-.01-.559-.032-.812a1.755 1.755 0 0 0-.18-.66 1.106 1.106 0 0 0-.438-.448c-.194-.11-.457-.166-.785-.166-.332 0-.6.064-.803.189a1.38 1.38 0 0 0-.48.499 1.946 1.946 0 0 0-.231.696 5.56 5.56 0 0 0-.06.785v4.768h-2.35v-4.8c0-.254-.004-.503-.018-.752a2.074 2.074 0 0 0-.143-.688 1.052 1.052 0 0 0-.415-.503c-.194-.125-.476-.19-.854-.19-.111 0-.259.024-.439.074-.18.051-.36.143-.53.282-.171.138-.319.337-.439.595-.12.259-.18.6-.18 1.02v4.966H5.46V7.81zm15.693 15.64V.55H21.72V0H24v24h-2.28v-.55z"/></svg> #rust:gnome.org</a></li>
+
+  <li><a href="https://discourse.gnome.org/tag/rust"><svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Discourse</title><path d="M12.103 0C18.666 0 24 5.485 24 11.997c0 6.51-5.33 11.99-11.9 11.99L0 24V11.79C0 5.28 5.532 0 12.103 0zm.116 4.563c-2.593-.003-4.996 1.352-6.337 3.57-1.33 2.208-1.387 4.957-.148 7.22L4.4 19.61l4.794-1.074c2.745 1.225 5.965.676 8.136-1.39 2.17-2.054 2.86-5.228 1.737-7.997-1.135-2.778-3.84-4.59-6.84-4.585h-.008z"/></svg> discourse.gnome.org/tag/rust</a></li>
+
+  <li><a href="https://github.com/gtk-rs"><svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>GitHub</title><path d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12"/></svg> github.com/gtk-rs</a></li>
+
+  <li><a href="https://opencollective.com/gtk-rs"><svg role="img" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>Open Collective</title><path d="M12 0C5.373 0 0 5.373 0 12s5.373 12 12 12c2.54 0 4.894-.79 6.834-2.135l-3.107-3.109a7.715 7.715 0 1 1 0-13.512l3.107-3.109A11.943 11.943 0 0 0 12 0zm9.865 5.166l-3.109 3.107A7.67 7.67 0 0 1 19.715 12a7.682 7.682 0 0 1-.959 3.727l3.109 3.107A11.943 11.943 0 0 0 24 12c0-2.54-.79-4.894-2.135-6.834z"/></svg> opencollective.com/gtk-rs</a></li>
+</ul>

_includes/book.svg

@@ -0,0 +1,25 @@
+<table>
+<thead>
+  <tr><th>Project</th><th colspan="2">Crate</th><th>Docs</th></tr>
+</thead>
+<tbody>
+{% for crate in site.data.crates %}
+  <tr>
+    <td class="section">
+      <a href="/{{crate.repo}}">{{crate.section}}</a>
+    </td>
+    <td>
+      <a href="https://crates.io/crates/{{crate.name}}">
+        {{crate.name}}
+      </a>
+    </td>
+    <td>
+      v{{crate.max_version}}
+    </td>
+    <td class="docs">
+      <a href="/{{crate.repo}}/stable/latest/docs/{{ crate.name | replace: "-rs", "" }}">🕮</a>
+    </td>
+  </tr>
+{% endfor %}
+</tbody>
+</table>

_includes/contact.html

@@ -1,53 +1,10 @@
 <footer class="site-footer">
 
   <div class="wrapper">
-
-    <div class="footer-col-wrapper">
-      <div class="footer-col  footer-col-1">
-        <ul class="contact-list">
-          <li>{{ site.title }}</li>
-          <li><a href="mailto:{{ site.email }}">{{ site.email }}</a></li>
-        </ul>
-      </div>
-
-      <div class="footer-col  footer-col-2">
-        <ul class="social-media-list">
-          {% if site.github_username %}
-          <li>
-            <a href="https://github.com/{{ site.github_username }}">
-              <span class="icon  icon--github">
-                <svg viewBox="0 0 16 16">
-                  <path fill="#828282" d="M7.999,0.431c-4.285,0-7.76,3.474-7.76,7.761 c0,3.428,2.223,6.337,5.307,7.363c0.388,0.071,0.53-0.168,0.53-0.374c0-0.184-0.007-0.672-0.01-1.32 c-2.159,0.469-2.614-1.04-2.614-1.04c-0.353-0.896-0.862-1.135-0.862-1.135c-0.705-0.481,0.053-0.472,0.053-0.472 c0.779,0.055,1.189,0.8,1.189,0.8c0.692,1.186,1.816,0.843,2.258,0.645c0.071-0.502,0.271-0.843,0.493-1.037 C4.86,11.425,3.049,10.76,3.049,7.786c0-0.847,0.302-1.54,0.799-2.082C3.768,5.507,3.501,4.718,3.924,3.65 c0,0,0.652-0.209,2.134,0.796C6.677,4.273,7.34,4.187,8,4.184c0.659,0.003,1.323,0.089,1.943,0.261 c1.482-1.004,2.132-0.796,2.132-0.796c0.423,1.068,0.157,1.857,0.077,2.054c0.497,0.542,0.798,1.235,0.798,2.082 c0,2.981-1.814,3.637-3.543,3.829c0.279,0.24,0.527,0.713,0.527,1.437c0,1.037-0.01,1.874-0.01,2.129 c0,0.208,0.14,0.449,0.534,0.373c3.081-1.028,5.302-3.935,5.302-7.362C15.76,3.906,12.285,0.431,7.999,0.431z"/>
-                </svg>
-              </span>
-
-              <span class="username">{{ site.github_username }}</span>
-            </a>
-          </li>
-          {% endif %}
-
-          {% if site.twitter_username %}
-          <li>
-            <a href="https://twitter.com/{{ site.twitter_username }}">
-              <span class="icon  icon--twitter">
-                <svg viewBox="0 0 16 16">
-                  <path fill="#828282" d="M15.969,3.058c-0.586,0.26-1.217,0.436-1.878,0.515c0.675-0.405,1.194-1.045,1.438-1.809
-                  c-0.632,0.375-1.332,0.647-2.076,0.793c-0.596-0.636-1.446-1.033-2.387-1.033c-1.806,0-3.27,1.464-3.27,3.27 c0,0.256,0.029,0.506,0.085,0.745C5.163,5.404,2.753,4.102,1.14,2.124C0.859,2.607,0.698,3.168,0.698,3.767 c0,1.134,0.577,2.135,1.455,2.722C1.616,6.472,1.112,6.325,0.671,6.08c0,0.014,0,0.027,0,0.041c0,1.584,1.127,2.906,2.623,3.206 C3.02,9.402,2.731,9.442,2.433,9.442c-0.211,0-0.416-0.021-0.615-0.059c0.416,1.299,1.624,2.245,3.055,2.271 c-1.119,0.877-2.529,1.4-4.061,1.4c-0.264,0-0.524-0.015-0.78-0.046c1.447,0.928,3.166,1.469,5.013,1.469 c6.015,0,9.304-4.983,9.304-9.304c0-0.142-0.003-0.283-0.009-0.423C14.976,4.29,15.531,3.714,15.969,3.058z"/>
-                </svg>
-              </span>
-
-              <span class="username">{{ site.twitter_username }}</span>
-            </a>
-          </li>
-          {% endif %}
-        </ul>
-      </div>
-
-      <div class="footer-col  footer-col-3">
-        <p class="text">{{ site.description }}</p>
-      </div>
-    </div>
-
+    {% include contact.html %}
+    <a href="https://circle.gnome.org/">
+      Proudly part of
+      <img src="https://gitlab.gnome.org/Teams/Circle/-/raw/91de93edbb3e75eb0882d56bd466e58b525135d5/assets/button/circle-button-fullcolor.svg" alt="GNOME Circle Logo" />
+    </a>
   </div>
-
 </footer>

_includes/crates.html

@@ -1,11 +1,12 @@
 <head>
-    <meta charset="utf-8">
+    <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width initial-scale=1" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
 
     <title>{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</title>
-    <meta name="description" content="{{ site.description }}">
+    <meta name="description" content="{{ site.description }}" />
 
-    <link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}">
-    <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
+    <link rel="icon" type="image/svg+xml" href="/logo.svg" />
+    <link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}" />
+    <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}" />
 </head>

_includes/footer.html

@@ -1,9 +1,7 @@
 <header class="site-header">
 
-  <div class="wrapper">
-
-    <a class="site-title" href="{{ site.baseurl }}/">{{ site.title }}</a>
 
+  <div class="wrapper">
     <nav class="site-nav">
       <a href="#" class="menu-icon">
         <svg viewBox="0 0 18 15">
@@ -15,17 +13,13 @@
 
       <div class="trigger">
         <a class="page-link" href="/blog">Blog</a>
-        <a class="page-link" href="/docs-src">Gtk-rs documentation</a>
-        <a class="page-link" href="/docs-src/tutorial">Tutorial</a>
-        <a class="page-link" href="/docs-src/faq">F.A.Q.</a>
-        <a class="page-link" href="/docs-src/useful-links">Useful links</a>
-        <a class="page-link" href="/docs-src/contact">Contact us</a>
+        <a class="page-link" href="/faq">FAQ</a>
+        <a class="page-link" href="/contact">Contact</a>
       </div>
     </nav>
-    <a id="support-button" href="https://opencollective.com/gtk-rs">
-      <svg viewBox="0 0 12 16" width="12" height="16" aria-hidden="true">
-        <path fill-rule="evenodd" d="M9 2c-.97 0-1.69.42-2.2 1-.51.58-.78.92-.8 1-.02-.08-.28-.42-.8-1-.52-.58-1.17-1-2.2-1-1.632.086-2.954 1.333-3 3 0 .52.09 1.52.67 2.67C1.25 8.82 3.01 10.61 6 13c2.98-2.39 4.77-4.17 5.34-5.33C11.91 6.51 12 5.5 12 5c-.047-1.69-1.342-2.913-3-3z"></path>
-      </svg> Support our work!</a>
+
+    <a class="site-title" href="{{ site.baseurl }}/">{{ site.title }}</a>
+
   </div>
 
 </header>

_includes/head.html

@@ -0,0 +1,43 @@
+* [Banner Viewer](https://gitlab.gnome.org/World/design/banner-viewer)
+* [BrewStillery](https://gitlab.com/MonkeyLog/BrewStillery)
+* [Cigale](https://github.com/emmanueltouzery/cigale)
+* [color_blinder_gtk](https://gitlab.com/dns2utf8/color_blinder_gtk)
+* [Contrast](https://gitlab.gnome.org/World/design/contrast)
+* [Cookbook](https://github.com/MacKarp/Cookbook)
+* [Czkawka](https://github.com/qarmin/czkawka)
+* [Epicwar Downloader](https://github.com/ab0v3g4me/epicwar-downloader)
+* [Font Finder](https://github.com/mmstick/fontfinder)
+* [Fractal](https://gitlab.gnome.org/GNOME/fractal)
+* [Garta](https://github.com/zaari/garta)
+* [Gattii](https://gitlab.com/susurrus/gattii)
+* [GNvim](https://github.com/vhakulinen/gnvim)
+* [gled](https://gitlab.com/pentagonum/gled)
+* [glide](https://github.com/philn/glide)
+* [gpsami](https://gitlab.gnome.org/hub/gpsami)
+* [gtktranslate](https://github.com/skylinecc/gtktranslate)
+* [Icon Library](https://gitlab.gnome.org/World/design/icon-library)
+* [Iridium](https://github.com/matze/iridium)
+* [lognplot](https://github.com/windelbouwman/lognplot)
+* [Marmoset](https://github.com/sprang/marmoset)
+* [mcmmtk](https://github.com/pwil3058/mcmmtk)
+* [media-toc](https://github.com/fengalin/media-toc)
+* [Myxer](https://github.com/Aurailus/Myxer)
+* [neovim-gtk](https://github.com/daa84/neovim-gtk)
+* [noaa-apt](https://github.com/martinber/noaa-apt)
+* [pcatk](https://github.com/pwil3058/pcatk)
+* [Pika Backup](https://gitlab.gnome.org/World/pika-backup)
+* [PNMixer-rs](https://github.com/hasufell/pnmixer-rust)
+* [Podcasts](https://gitlab.gnome.org/World/podcasts)
+* [Popsicle](https://github.com/pop-os/popsicle/)
+* [process-viewer](https://github.com/GuillaumeGomez/process-viewer)
+* [Projectpad](https://github.com/emmanueltouzery/projectpad2)
+* [relm](https://github.com/antoyo/relm)
+* [rrun](https://github.com/buster/rrun)
+* [Shortwave](https://gitlab.gnome.org/World/Shortwave)
+* [Social](https://gitlab.gnome.org/World/Social)
+* [SolidOak](https://github.com/oakes/SolidOak)
+* [systemd-manager](https://gitlab.com/mmstick/systemd-manager)
+* [Tau](https://gitlab.gnome.org/World/Tau)
+* [tv-renamer](https://github.com/mmstick/tv-renamer)
+* [Whatschanging](https://github.com/mothsART/whatschanging)
+

_includes/header.html

@@ -7,10 +7,8 @@
 
     {% include header.html %}
 
-    <div class="page-content">
-      <div class="wrapper wide-wrapper">
+    <div class="page-content no-wrapper">
         {{ content }}
-      </div>
     </div>
 
     {% include footer.html %}