[Git][reproducible-builds/reproducible-website][master] 4 commits: Migrate and merge the old _layouts/page.html into the new design.
Chris Lamb
gitlab at salsa.debian.org
Mon Jun 24 14:30:11 UTC 2019
Chris Lamb pushed to branch master at Reproducible Builds / reproducible-website
Commits:
3798f0aa by Chris Lamb at 2019-06-24T14:16:03Z
Migrate and merge the old _layouts/page.html into the new design.
- - - - -
c5d0eed7 by Chris Lamb at 2019-06-24T14:22:10Z
Inline the _includes/{head,header,footer}.html pages prior to their eventual removal.
- - - - -
4fa74ee2 by Chris Lamb at 2019-06-24T14:29:04Z
When linting for old layouts, don't print the command being run.
- - - - -
ae43b807 by Chris Lamb at 2019-06-24T14:29:27Z
Lint for URIs that are not using {{ "/foo" | prepend: site.baseurl }} relative URIs.
- - - - -
8 changed files:
- Makefile
- − _includes/footer.html
- − _includes/head.html
- − _includes/header.html
- _layouts/default.html
- − _layouts/page.html
- docs.html
- funding.md
Changes:
=====================================
Makefile
=====================================
@@ -7,8 +7,11 @@ clean:
rm -rf _site
lint:
- for X in $(OLD_LAYOUTS); do \
+ @for X in $(OLD_LAYOUTS); do \
grep -rl "layout: $$X" . | while read Y; do \
echo "W: $$Y is using legacy layout '$$X'"; \
done \
done
+ @grep -rl "href=[\"']/" . | while read X; do \
+ echo "W: $$X is using URIs that are not using '{{ \"/foo\" | prepend: site.baseurl }}'"; \
+ done
=====================================
_includes/footer.html deleted
=====================================
@@ -1,55 +0,0 @@
-<footer class="site-footer">
- <div class="row">
- <div class="four columns hide-on-mobiles">
- <p><img src="{{ "/images/logos/rb.svg" | prepend: site.baseurl }}" width="100%" style="margin-bottom: 1em" alt="reproducible-builds.org"></p>
- <p>{{ site.description }}</p>
- </div>
- <div class="four columns">
- <p>
- <a href="https://twitter.com/ReproBuilds">
- <span class="icon twitter">
- <svg version="1.1" class="twitter-icon-svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
- <path fill="#C2C2C2" 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></a>
- <a href="https://twitter.com/ReproBuilds">
- <span class="username">@ReproBuilds</span>
- </a>
- </p>
- <p>
- Content licensed under <a href="https://creativecommons.org/licenses/by-sa/4.0/">CC BY-SA 4.0</a>.
- </p>
- <p>
- Logos and trademarks belong to their respective owners.
- </p>
- </div>
- <div class="four columns hide-on-mobiles">
- <p>
- <a href="{{ "/who/" | prepend: site.baseurl }}">Projects</a> working on reproducible builds:
- </p>
- <ul>
- <li>
- {% for project in site.data.projects %}
- <a href="/who#{{ project.name }}">{{ project.name }}</a>{% unless forloop.last %},{% endunless %}{% endfor %}.
- </li>
- <li>
- Please <a href="https://lists.reproducible-builds.org/listinfo/rb-general">tell us</a> about yours!
- </li>
- </ul>
- </div>
- </div>
- <div class="row hide-on-mobiles">
- <div class="twelve columns git-location">
- <p>
- Patches highly welcome <a href="https://salsa.debian.org/reproducible-builds/reproducible-website">through our Git repository</a><br>
- (<a href="{{ "/contribute/salsa/" | prepend: site.baseurl }}">more info</a>) or via <a href="https://lists.reproducible-builds.org/listinfo/rb-general">our mailing list</a>.
- </p>
- </div>
- </div>
-</footer>
=====================================
_includes/head.html deleted
=====================================
@@ -1,16 +0,0 @@
-<head>
- <meta charset="utf-8">
- <title>{% if page.title %}{{ page.title }} — {% endif %}{{ site.title }}</title>
- <meta name="description" content="{{ site.description }}">
- <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
- <link rel="vcs-git" href="https://salsa.debian.org/reproducible-builds/reproducible-website.git" title="Git repository" />
- <link rel="shortcut icon" type="image/png" href="{{ "/images/favicon.png" | prepend: site.baseurl }}?{{ site.time | date: '%s%N' }}" />
-
- <meta name="viewport" content="width=device-width, initial-scale=1">
-
- <!-- Custom CSS -->
- <link rel="stylesheet" href="{{ "/css/normalize.css" | prepend: site.baseurl }}?{{ site.time | date: '%s%N' }}">
- <link rel="stylesheet" href="{{ "/css/skeleton.css" | prepend: site.baseurl }}?{{ site.time | date: '%s%N' }}">
- <link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}?{{ site.time | date: '%s%N' }}">
-
-</head>
=====================================
_includes/header.html deleted
=====================================
@@ -1,28 +0,0 @@
-{% assign sorted_pages = site.pages | sort:"order" %}
-<header class="site-header">
- <div class="container">
- <div class="row">
- <a class="site-title" href="{{ site.baseurl }}/">reproducible<span class="punctuation">-</span>builds<span class="punctuation">.org</span></a>
-
- <nav class="site-nav">
- <a href="#" class="menu-icon">
- <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- viewBox="0 0 18 15" enable-background="new 0 0 18 15" xml:space="preserve">
- <path fill="#5fb0f3" d="M18,1.484c0,0.82-0.665,1.484-1.484,1.484H1.484C0.665,2.969,0,2.304,0,1.484l0,0C0,0.665,0.665,0,1.484,0
- h15.031C17.335,0,18,0.665,18,1.484L18,1.484z"/>
- <path fill="#5fb0f3" d="M18,7.516C18,8.335,17.335,9,16.516,9H1.484C0.665,9,0,8.335,0,7.516l0,0c0-0.82,0.665-1.484,1.484-1.484
- h15.031C17.335,6.031,18,6.696,18,7.516L18,7.516z"/>
- <path fill="#5fb0f3" d="M18,13.516C18,14.335,17.335,15,16.516,15H1.484C0.665,15,0,14.335,0,13.516l0,0
- c0-0.82,0.665-1.484,1.484-1.484h15.031C17.335,12.031,18,12.696,18,13.516L18,13.516z"/>
- </svg>
- </a>
- <div class="trigger">
- {% for page in sorted_pages | sort:"order" %}
- {% if page.title and page.order >= 0 %}<a class="page-link" href="{{ page.url | prepend: site.baseurl }}">{{ page.title }}</a>{% endif %}
- {% endfor %}
- </div>
- </nav>
-
- </div>
- </div>
-</header>
=====================================
_layouts/default.html
=====================================
@@ -1,14 +1,111 @@
<!DOCTYPE html>
<html>
- {% include head.html %}
+ <head>
+ <meta charset="utf-8">
+ <title>{% if page.title %}{{ page.title }} — {% endif %}{{ site.title }}</title>
+ <meta name="description" content="{{ site.description }}">
+ <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
+ <link rel="vcs-git" href="https://salsa.debian.org/reproducible-builds/reproducible-website.git" title="Git repository" />
+ <link rel="shortcut icon" type="image/png" href="{{ "/images/favicon.png" | prepend: site.baseurl }}?{{ site.time | date: '%s%N' }}" />
+
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+
+ <!-- Custom CSS -->
+ <link rel="stylesheet" href="{{ "/css/normalize.css" | prepend: site.baseurl }}?{{ site.time | date: '%s%N' }}">
+ <link rel="stylesheet" href="{{ "/css/skeleton.css" | prepend: site.baseurl }}?{{ site.time | date: '%s%N' }}">
+ <link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}?{{ site.time | date: '%s%N' }}">
+
+ </head>
<body>
- {% include header.html %}
+ {% assign sorted_pages = site.pages | sort:"order" %}
+ <header class="site-header">
+ <div class="container">
+ <div class="row">
+ <a class="site-title" href="{{ site.baseurl }}/">reproducible<span class="punctuation">-</span>builds<span class="punctuation">.org</span></a>
+
+ <nav class="site-nav">
+ <a href="#" class="menu-icon">
+ <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ viewBox="0 0 18 15" enable-background="new 0 0 18 15" xml:space="preserve">
+ <path fill="#5fb0f3" d="M18,1.484c0,0.82-0.665,1.484-1.484,1.484H1.484C0.665,2.969,0,2.304,0,1.484l0,0C0,0.665,0.665,0,1.484,0
+ h15.031C17.335,0,18,0.665,18,1.484L18,1.484z"/>
+ <path fill="#5fb0f3" d="M18,7.516C18,8.335,17.335,9,16.516,9H1.484C0.665,9,0,8.335,0,7.516l0,0c0-0.82,0.665-1.484,1.484-1.484
+ h15.031C17.335,6.031,18,6.696,18,7.516L18,7.516z"/>
+ <path fill="#5fb0f3" d="M18,13.516C18,14.335,17.335,15,16.516,15H1.484C0.665,15,0,14.335,0,13.516l0,0
+ c0-0.82,0.665-1.484,1.484-1.484h15.031C17.335,12.031,18,12.696,18,13.516L18,13.516z"/>
+ </svg>
+ </a>
+ <div class="trigger">
+ {% for page in sorted_pages %}
+ {% if page.title and page.order >= 0 %}<a class="page-link" href="{{ page.url | prepend: site.baseurl }}">{{ page.title }}</a>{% endif %}
+ {% endfor %}
+ </div>
+ </nav>
+
+ </div>
+ </div>
+ </header>
<div class="container">
{{ content }}
- {% include footer.html %}
+ <footer class="site-footer">
+ <div class="row">
+ <div class="four columns hide-on-mobiles">
+ <p><img src="{{ "/images/logos/rb.svg" | prepend: site.baseurl }}" width="100%" style="margin-bottom: 1em" alt="reproducible-builds.org"></p>
+ <p>{{ site.description }}</p>
+ </div>
+ <div class="four columns">
+ <p>
+ <a href="https://twitter.com/ReproBuilds">
+ <span class="icon twitter">
+ <svg version="1.1" class="twitter-icon-svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+ <path fill="#C2C2C2" 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></a>
+ <a href="https://twitter.com/ReproBuilds">
+ <span class="username">@ReproBuilds</span>
+ </a>
+ </p>
+ <p>
+ Content licensed under <a href="https://creativecommons.org/licenses/by-sa/4.0/">CC BY-SA 4.0</a>.
+ </p>
+ <p>
+ Logos and trademarks belong to their respective owners.
+ </p>
+ </div>
+ <div class="four columns hide-on-mobiles">
+ <p>
+ <a href="{{ "/who/" | prepend: site.baseurl }}">Projects</a> working on reproducible builds:
+ </p>
+ <ul>
+ <li>
+ {% for project in site.data.projects %}
+ <a href="/who#{{ project.name }}">{{ project.name }}</a>{% unless forloop.last %},{% endunless %}{% endfor %}.
+ </li>
+ <li>
+ Please <a href="https://lists.reproducible-builds.org/listinfo/rb-general">tell us</a> about yours!
+ </li>
+ </ul>
+ </div>
+ </div>
+ <div class="row hide-on-mobiles">
+ <div class="twelve columns git-location">
+ <p>
+ Patches highly welcome <a href="https://salsa.debian.org/reproducible-builds/reproducible-website">through our Git repository</a><br>
+ (<a href="{{ "/contribute/salsa/" | prepend: site.baseurl }}">more info</a>) or via <a href="https://lists.reproducible-builds.org/listinfo/rb-general">our mailing list</a>.
+ </p>
+ </div>
+ </div>
+ </footer>
+
</div>
</body>
</html>
=====================================
_layouts/page.html deleted
=====================================
@@ -1,17 +0,0 @@
----
-layout: default
----
-<div class="post">
- <header class="post-header">
- <div class="row">
- <div class="four columns"> </div>
- <div class="eight columns">
- <h1>{{ page.title }}</h1>
- </div>
- </div>
- </header>
-
- <article class="post-content">
- {{ content }}
- </article>
-</div>
=====================================
docs.html
=====================================
@@ -1,42 +1,27 @@
---
-layout: page
+layout: new/default
title: Documentation
permalink: /docs/
order: 1
---
-<div class="row">
- <div class="four columns"> </div>
- <div class="eight columns text">
- <p>
- Getting <em>reproducible builds</em> for your software might be easier than
- you think! But it might require small changes to your build system
- and a strategy on how to enable others to recreate an environment in which
- the builds can be reproduced.
- </p>
- </div>
-</div>
+<p>
+ Getting <em>reproducible builds</em> for your software might be easier than
+ you think! But it might require small changes to your build system
+ and a strategy on how to enable others to recreate an environment in which
+ the builds can be reproduced.
+</p>
-<div class="row" style="margin-top: 1rem;">
- <div class="four columns title">
- <h2>Tips & help</h2>
- </div>
- <div class="eight columns text doc-index">
- {% for section in site.data.docs %}
- <h4>{{ section.title }}</h4>
- {% include docs_ul.html items=section.docs %}
- {% endfor %}
- </div>
-</div>
+<h2>Tips & help</h2>
-<div class="row">
- <div class="four columns title">
- <h2>Specifications</h2>
- </div>
- <div class="eight columns text">
- <dl>
- <dt><a href="/specs/source-date-epoch/"><tt>SOURCE_DATE_EPOCH</tt></a></dt>
- <dd>Distribution-agnostic standard to provide a pre-defined timestamp to build systems</dd>
- </dl>
- </div>
-</div>
+{% for section in site.data.docs %}
+<h4>{{ section.title }}</h4>
+{% include docs_ul.html items=section.docs %}
+{% endfor %}
+
+<h2>Specifications</h2>
+
+<dl>
+ <dt><a href="/specs/source-date-epoch/"><tt>SOURCE_DATE_EPOCH</tt></a></dt>
+ <dd>Distribution-agnostic standard to provide a pre-defined timestamp to build systems</dd>
+</dl>
=====================================
funding.md
=====================================
@@ -1,10 +1,12 @@
---
-layout: page
+layout: new/default
title: Help fund the Reproducible Builds effort…
order: -1
permalink: /funding/
---
+# Help fund the Reproducible Builds effort…
+
**The Reproducible Builds effort needs your help to continue its work towards
ensuring the security of computer systems of all shapes and sizes around the
world.**
View it on GitLab: https://salsa.debian.org/reproducible-builds/reproducible-website/compare/acf3c33f5eb4ffc5c4f8aeb409a9aab7aa3fba7a...ae43b807ca0cd84023c9613fc0e0714ce18ffeb0
--
View it on GitLab: https://salsa.debian.org/reproducible-builds/reproducible-website/compare/acf3c33f5eb4ffc5c4f8aeb409a9aab7aa3fba7a...ae43b807ca0cd84023c9613fc0e0714ce18ffeb0
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.reproducible-builds.org/pipermail/rb-commits/attachments/20190624/2fb62570/attachment.html>
More information about the rb-commits
mailing list