[Git][reproducible-builds/reproducible-website][master] 11 commits: Rename blog.html -> blog.md

Chris Lamb gitlab at salsa.debian.org
Thu Dec 20 14:47:47 CET 2018


Chris Lamb pushed to branch master at Reproducible Builds / reproducible-website


Commits:
b01b2170 by Chris Lamb at 2018-12-20T13:28:14Z
Rename blog.html -> blog.md

- - - - -
6d765dfc by Chris Lamb at 2018-12-20T13:28:14Z
Add missing scripts import.

- - - - -
bea55fe1 by Chris Lamb at 2018-12-20T13:28:14Z
Fix and tidy the new style's <head> section.

- - - - -
bcf67b34 by Chris Lamb at 2018-12-20T13:28:14Z
Tidy scripts include.

- - - - -
d3cc63ad by Chris Lamb at 2018-12-20T13:28:14Z
Wire up the new style includes.

- - - - -
11911479 by Chris Lamb at 2018-12-20T13:28:14Z
Make the markdown.html page default to a single-level navigation hierarchy.

- - - - -
1e3f5a27 by Chris Lamb at 2018-12-20T13:28:14Z
Move the blog index page to the new navigation style.

Obviously this is a bit weird to have a single page but it at least
"kicks the tires"... it's not a very common page to visit anyway. :)

- - - - -
29c40a3c by Chris Lamb at 2018-12-20T13:28:14Z
Set a more helpful site title.

- - - - -
5638819e by Chris Lamb at 2018-12-20T13:28:14Z
Add a simple footer for now to the new style.

- - - - -
bb0745bd by Chris Lamb at 2018-12-20T13:28:33Z
Rename who.html -> who.md

- - - - -
02e19476 by Chris Lamb at 2018-12-20T13:47:34Z
Migrate the "who" page. Needs some work...

- - - - -


9 changed files:

- _includes/head.html
- _includes/new/head.html
- _includes/new/navbar.html
- _includes/new/navbar_side.html
- _includes/new/scripts.html
- _layouts/new/markdown.html
- blog.html → blog.md
- − who.html
- + who.md


Changes:

=====================================
_includes/head.html
=====================================
@@ -1,6 +1,6 @@
 <head>
     <meta charset="utf-8">
-    <title>{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</title>
+    <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" />


=====================================
_includes/new/head.html
=====================================
@@ -1,11 +1,14 @@
 <head>
   <meta charset="utf-8">
-  <title>{{site.title}}</title>
-  <link rel="stylesheet" href="{{'/assets/styles/main.css' | prepend: site.baseurl}}">
-  <link rel="shortcut icon" type="image/png" href="{{'/assets/images/favicon.png' | prepend: site.baseurl}}"/>
-  <link href="{{'/assets/fonts/overpass.css' | prepend: site.baseurl}}" rel="stylesheet">
-  <link href="{{'/assets/fonts/overpass-mono.css' | prepend: site.baseurl}}" rel="stylesheet">
-  <link rel="stylesheet" href="{{'/assets/static/open-iconic-bootstrap.css' | prepend: site.baseurl}}" />
-  <link rel="stylesheet" href="{{'/assets/static/bootstrap.min.css' | prepend: site.baseurl}}">
+  <title>{% if page.title %}{{ page.title }} — {% endif %}{{ site.title }}</title>
+
+  <link rel="stylesheet" href="{{ "/assets/styles/main.css" | prepend: site.baseurl }}">
+  <link rel="shortcut icon" type="image/png" href="{{ "/assets/images/favicon.png" | prepend: site.baseurl }}"/>
+
+  <link href="{{ "/assets/fonts/overpass.css" | prepend: site.baseurl }}" rel="stylesheet">
+  <link href="{{ "/assets/fonts/overpass-mono.css" | prepend: site.baseurl }}" rel="stylesheet">
+  <link rel="stylesheet" href="{{ "/assets/static/open-iconic-bootstrap.css" | prepend: site.baseurl }}" />
+  <link rel="stylesheet" href="{{ "/assets/static/bootstrap.min.css" | prepend: site.baseurl }}">
+
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 </head>


=====================================
_includes/new/navbar.html
=====================================
@@ -5,20 +5,17 @@
   <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
     <span class="navbar-toggler-icon"></span>
   </button>
-    <div class="collapse navbar-collapse " id="navbarSupportedContent">
-      <ul class="navbar-nav mr-auto display-xs">
-        <li class="nav-item">
-          <a class="nav-link" href="{{site.baseurl}}/">About</a>
-        </li>
-        <li class="nav-item">
-          <a class="nav-link" href="{{site.baseurl}}/getting-started">Getting Started</a>
-        </li>
-        <li class="nav-item">
-          <a class="nav-link" href="{{site.baseurl}}/visuals/">Visuals</a>
-        </li>
-        <li class="nav-item">
-          <a class="nav-link" href="{{site.baseurl}}/components/">Components</a>
-        </li>
-      </ul>
-    </div>
+
+  <div class="collapse navbar-collapse " id="navbarSupportedContent">
+    <ul class="navbar-nav mr-auto display-xs">
+      {% assign sorted_pages = site.pages | sort:"order" %}
+      {% for page in sorted_pages %}
+      {% if page.title and page.order >= 0 %}
+      <li class="nav-item">
+        <a class="nav-link" href="{{ page.url | prepend: site.baseurl }}">{{ page.title }}</a>
+      </li>
+      {% endif %}
+      {% endfor %}
+    </ul>
+  </div>
 </nav>


=====================================
_includes/new/navbar_side.html
=====================================
@@ -1,19 +1,12 @@
-<div class="sidebar {{include.sidebarClassName}}" id="sidebar1">
-  <ul class="list-group">
-    <li class="list-group-item rb-main-sidebar pt-5">
-      <a href="{{site.baseurl}}/" class="sidebar__link__darkGray">About</a>
-    </li>
-
-    <li class="list-group-item rb-main-sidebar">
-      <a href="{{site.baseurl}}/getting-started/" class="sidebar__link__darkGray">Getting Started</a>
-    </li>
-
-    <li class="list-group-item rb-main-sidebar">
-      <a href="{{site.baseurl}}/visuals/" class="sidebar__link__darkGray">Visuals</a>
-    </li>
-
+<div class="sidebar {{ include.sidebarClassName }}" id="sidebar1">
+  <ul class="list-group pt-5">
+    {% assign sorted_pages = site.pages | sort:"order" %}
+    {% for page in sorted_pages %}
+    {% if page.title and page.order >= 0 %}
     <li class="list-group-item rb-main-sidebar">
-      <a href="{{site.baseurl}}/components/" class="sidebar__link__darkGray">Components</a>
+      <a href="{{ page.url | prepend: site.baseurl }}" class="sidebar__link__darkGray">{{ page.title }}</a>
     </li>
+    {% endif %}
+    {% endfor %}
   </ul>
 </div>


=====================================
_includes/new/scripts.html
=====================================
@@ -1,6 +1,6 @@
-<script src="{{'/assets/javascript/modernizr.min.js' | prepend: site.baseurl}}"></script>
-<script src="{{'/assets/javascript/jquery-3.3.1.slim.min.js' | prepend: site.baseurl}}"></script>
-<script src="{{'/assets/javascript/popper.min.js' | prepend: site.baseurl}}"></script>
-<script src="{{'/assets/javascript/bootstrap.min.js' | prepend: site.baseurl}}"></script>
-<!-- <script src="{{'/assets/javascript/run_prettify.js' | prepend: site.baseurl}}"></script> /* -->
-<script type="text/javascript" src="{{'/assets/javascript/index.js' | prepend: site.baseurl}}"></script>
+<script src="{{ "/assets/javascript/modernizr.min.js" | prepend: site.baseurl }}"></script>
+<script src="{{ "/assets/javascript/jquery-3.3.1.slim.min.js" | prepend: site.baseurl }}"></script>
+<script src="{{ "/assets/javascript/popper.min.js" | prepend: site.baseurl }}"></script>
+<script src="{{ "/assets/javascript/bootstrap.min.js" | prepend: site.baseurl }}"></script>
+<!-- <script src="{{"/assets/javascript/run_prettify.js" | prepend: site.baseurl }}"></script> /* -->
+<script type="text/javascript" src="{{ "/assets/javascript/index.js" | prepend: site.baseurl }}"></script>


=====================================
_layouts/new/markdown.html
=====================================
@@ -3,20 +3,40 @@
   {% include new/head.html %}
   <body>
     {% include new/navbar.html %}
-    <div class="row">
-      <div class="col-md-3 col-sm-5 d-none d-md-block p-0">
-        <div class="row" style="height: 100%">
-          <div class="col-md-6 col-sm-6 col-xs-6 p-0">
-            {% include new/navbar_side.html sidebarClassName="rb-sidebar__1" %}
-          </div>
-          <div class="col-md-6 col-sm-6 col-xs-6 p-0">
-            {% include new/sidebar.html sidebarClassName="rb-sidebar__2" %}
-          </div>
-        </div>
+
+    <div class="row" style="height: 100%">
+      <div class="col-md-2 col-sm-3 d-none d-sm-block p-0">
+        {% include new/navbar_side.html sidebarClassName="rb-sidebar__1" %}
       </div>
-        <div class="col-md-9 col-xl-9 col-sm-12 col-xs-12 p-5">
+      <div class="col-md-10 col-xs-12 col-sm-9 p-0">
+        <main role="main" class="content-scroll p-5 mt-2" data-spy="scroll" data-target="#components-nav" data-offset="0">
           {{ content }}
+
+          <div class="row">
+            <div class="col-12 p-0">
+              <p class="mt-5 mb-5">
+                <span class="text-muted small">
+                  <a href="https://twitter.com/ReproBuilds">@ReproBuilds</a>.
+
+                  <a href="{{ "/who/" | prepend: site.baseurl }}">Projects</a> working on reproducible builds:
+                  {% for project in site.data.projects %}
+                    <a href="{{ "/who" | prepend: site.baseurl }}#{{ project.name }}">{{ project.name }}</a>{% unless forloop.last %},{% endunless %}{% endfor %}.
+
+                  Content licensed under <a href="https://creativecommons.org/licenses/by-sa/4.0/" class="rb-link" target="_blank">CC BY-SA 4.0</a>,
+                  style licensed under <a href="https://opensource.org/licenses/MIT" class="rb-link" title="MIT" target="_blank">MIT</a>.
+                  Templates and styles based on the <a href="https://styleguide.torproject.org/" target="_blank">Tor Styleguide</a>.
+                  Logos and trademarks belong to their respective owners.
+
+                  Patches welcome <a href="https://salsa.debian.org/reproducible-builds/reproducible-website">via our Git repository</a>
+                  (<a href="{{ "/contribute/salsa/" | prepend: site.baseurl }}">instructions</a>) or via <a href="https://lists.reproducible-builds.org/listinfo/rb-general">our mailing list</a>.
+                </span>
+              </p>
+            </div>
+          </div>
+        </main>
       </div>
     </div>
+
+    {% include new/scripts.html %}
   </body>
 </html>


=====================================
blog.html → blog.md
=====================================
@@ -1,22 +1,18 @@
 ---
-layout: page
+layout: new/markdown
 title: Blog
 permalink: /blog/
 order: 5
 ---
 
-<p>
-  Every week we publish a weekly report on what we have been up to. (<a href="/blog/index.rss">RSS/Atom feed</a>)
-</p>
+# Blog
+
+Every week we publish a weekly report on what we have been up to. ([RSS/Atom feed]({{ "/blog/index.rss" | prepend: site.baseurl }}))
 
 {% assign by_week = site.blog | sort: 'week' | reverse %}
 
-<ul>
 {% for page in by_week %}
 {% if page.published %}
-  <li>
-    <a href="/blog/posts/{{ page.week }}/">Week {{ page.week }}</a>
-  </li>
+* [Week {{ page.week }}]({{ "/blog/posts/" | append: page.week | append: "/" | prepend: site.baseurl }})
 {% endif %}
 {% endfor %}
-</ul>


=====================================
who.html deleted
=====================================
@@ -1,63 +0,0 @@
----
-layout: page
-title:  Who is involved?
-permalink: /who/
-order: 6
----
-
-<div class="row">
-  <div class="four columns title"> </div>
-  <div class="eight columns text">
-    <p>
-      Various free software projects are working on providing reproducible builds
-      to their users:
-    </p>
-  </div>
-</div>
-
-{% for project in site.data.projects %}
-<div class="row">
-  <div class="four columns title">
-    <a name="{{ project.name }}"></a>
-    <a href="{{ project.url }}"><img src="{{ project.logo | prepend: "/images/logos/" | prepend: site.baseurl }}" /></a>
-  </div>
-  <div class="eight columns text">
-    <h3><a href="{{ project.url }}">{{ project.name }}</a></h3>
-    <ul>
-      {% for resource in project.resources %}
-      <li><a href="{{ resource.url }}">{{ resource.name }}</a></li>
-      {% endfor %}
-    </ul>
-  </div>
-</div>
-{% endfor %}
-
-<div class="row">
-  <div class="four columns title">
-   <h2>reproducible-builds.org</h2>
-  </div>
-  <div class="eight columns">
-    <p>
-      Contributors:
-      Chris Lamb,
-      Lunar,
-      h01ger,
-      Vagrant Cascadian,
-      Ximin Luo.
-    </p>
-    <p>
-       <a href="mailto:contact at reproducible-builds.org">Contact us!</a>
-    </p>
-  </div>
-</div>
-
-<div class="row">
-  <div class="four columns title">
-   <h2>Sponsors</h2>
-  </div>
-  <div class="eight columns">
-    <div style="margin-bottom: 1rem;">
-      <a href="https://www.profitbricks.co.uk/"><img style="vertical-align: top;" src="{{ "/images/logos/profitbricks.png" | prepend: site.baseurl }}" alt="ProfitBricks" /></a>
-    </div>
-  </div>
-</div>


=====================================
who.md
=====================================
@@ -0,0 +1,39 @@
+---
+layout: new/markdown
+title:  Who is involved?
+permalink: /who/
+order: 6
+---
+
+# Who is involved?
+
+Various free software projects are working on providing reproducible builds to
+their users.
+
+* Chris Lamb
+* Lunar
+* h01ger
+* Vagrant Cascadian
+* Ximin Luo
+
+[Contact us!](mailto:contact at reproducible-builds.org)
+
+## Sponsors
+
+[![ProfitBricks]({{ "/images/logos/profitbricks.png" | prepend: site.baseurl }})](https://www.profitbricks.co.uk/)
+
+## Projects
+
+{% for project in site.data.projects %}
+<a name="{{ project.name }}"></a>
+
+### [{{ project.name }}]({{ project.url }})
+
+![]({{ project.logo | prepend: "/images/logos/" | prepend: site.baseurl }}#right)
+
+{% for resource in project.resources %}
+* [{{ resource.name }}]({{ resource.url }})
+{% endfor %}
+
+<br>
+{% endfor %}



View it on GitLab: https://salsa.debian.org/reproducible-builds/reproducible-website/compare/46f90b918b480924c044d9c5b88b95ea85fd00a1...02e19476910c5475136c0d8a00d5578087292acd

-- 
View it on GitLab: https://salsa.debian.org/reproducible-builds/reproducible-website/compare/46f90b918b480924c044d9c5b88b95ea85fd00a1...02e19476910c5475136c0d8a00d5578087292acd
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/20181220/66aefb47/attachment.html>


More information about the rb-commits mailing list