[Git][reproducible-builds/reproducible-website][master] 12 commits: home: replace ghost buttons with sticky navbar
Chris Lamb (@lamby)
gitlab at salsa.debian.org
Thu Dec 5 12:24:53 UTC 2024
Chris Lamb pushed to branch master at Reproducible Builds / reproducible-website
Commits:
1cd28b2e by hulkoba at 2024-12-03T09:45:49+01:00
home: replace ghost buttons with sticky navbar
- - - - -
7b7f171c by hulkoba at 2024-12-03T09:45:52+01:00
chore: remove unused home layout
- - - - -
0278825e by hulkoba at 2024-12-03T09:45:52+01:00
chore: remove unused navbar_side
- - - - -
eb1e683d by hulkoba at 2024-12-03T09:45:53+01:00
make no_sidbar layout default
- - - - -
867f51dd by hulkoba at 2024-12-03T09:45:53+01:00
docs: hide sidenav on small screens
- - - - -
6cb760ce by hulkoba at 2024-12-03T09:45:53+01:00
who: add space on large screens
to move the footer to the bottom
- - - - -
c34d2a27 by hulkoba at 2024-12-03T09:46:20+01:00
footer: add sponsors
- - - - -
2d83cdd7 by hulkoba at 2024-12-03T09:47:09+01:00
sidebar: remove unused css styles
- - - - -
f5858eb3 by hulkoba at 2024-12-03T11:05:23+01:00
chore: remove translate-ion icon from navbar
again
- - - - -
8a9ebfee by hulkoba at 2024-12-03T11:05:59+01:00
retain hero section
- - - - -
de89a0ee by hulkoba at 2024-12-03T11:06:11+01:00
merge success stories
- - - - -
a456281f by Chris Lamb at 2024-12-05T12:23:41+00:00
Merge branch 'reproducible-website-add_navbar'
* reproducible-website-add_navbar:
merge success stories
retain hero section
chore: remove translate-ion icon from navbar
sidebar: remove unused css styles
footer: add sponsors
who: add space on large screens
docs: hide sidenav on small screens
make no_sidbar layout default
chore: remove unused navbar_side
chore: remove unused home layout
home: replace ghost buttons with sticky navbar
- - - - -
18 changed files:
- _includes/footer.html
- − _includes/nav_buttons.html
- _includes/navbar.html
- − _includes/navbar_side.html
- − _includes/sidebar.html
- _layouts/default.html
- _layouts/docs.html
- − _layouts/home.html
- _layouts/no_sidebar.html
- − assets/images/icons/translate-white-24dp.svg
- assets/styles/custom.scss
- assets/styles/layout.scss
- assets/styles/main.scss
- − assets/styles/state.scss
- index.md
- po/_pages.de.po
- po/_pages.pot
- who_/index.md
Changes:
=====================================
_includes/footer.html
=====================================
@@ -1,29 +1,48 @@
-<div class="row footer">
- <div class="col-12 p-0">
- <p class="mt-5 mb-5">
- <span class="text-muted small d-none d-sm-block">
- Follow us on Twitter <a href="https://twitter.com/ReproBuilds">@ReproBuilds</a>, Mastodon <a href="https://fosstodon.org/@reproducible_builds">@reproducible_builds at fosstodon.org</a> &
- <a href="https://reddit.com/r/reproduciblebuilds">Reddit</a> and
- please consider <a href="{{ "/sponsor/" | relative_url }}">making a donation</a>.
- •
- 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 for this website welcome <a href="https://salsa.debian.org/reproducible-builds/reproducible-website">via our Git repository</a>
- (<a href="{{ "/contribute/salsa/" | relative_url }}">instructions</a>) or via <a href="https://lists.reproducible-builds.org/listinfo/rb-general">our mailing list</a>.
- •
- <a href="{{ "/who/" | relative_url }}">Full contact info</a>
- </span>
- </p>
+<div class="row footer mb-5 mx-4">
- <p class="d-none d-md-block float-left">
- <a href="https://sfconservancy.org"><img src="{{ "/assets/images/footer/conservancy.png" | relative_url }}" height="66" width="auto" alt="Conservancy Logo"/></a>
+ {% assign sponsors = site.data.sponsors.platinum | sort: 'name' %}
+ {% if sponsors.size != 0 %}
+ <div class="col-lg-3 px-lg-5 col-md-12 d-none d-sm-block">
+ <p class="text-muted small">
+ We are proud to be <a href="{{ "/sponsors/" | relative_url }}">sponsored by</a>
</p>
- <p class="text-center float-md-right">
- <a href="{{ "/" | relative_url }}"><img src="{{ "/images/logos/rb.svg" | relative_url }}" height="45" width="auto" alt="Reproducible Builds Logo"/></a>
- </p>
+ <div class="d-flex justify-content-between align-items-center flex-row flex-lg-column flex-xl-row">
+ {% for x in sponsors %}
+ <a href="{{ x.url }}" name="{{ x.name }}">
+ <img class="pt-lg-2" src="{{ x.logo | prepend: "/assets/images/sponsors/" | relative_url }}" height="auto" width="100" alt="{{ x.name }}"/>
+ </a>
+ {% endfor %}
+ </div>
+ </div>
+ {% else %}
+ {% endif %}
+
+ <div class="col-lg-6 col-md-12 py-3 py-lg-0">
+ <span class="text-muted small d-none d-sm-inline align-bottom">
+ Follow us on Twitter <a href="https://twitter.com/ReproBuilds">@ReproBuilds</a>, Mastodon <a href="https://fosstodon.org/@reproducible_builds">@reproducible_builds at fosstodon.org</a> &
+ <a href="https://reddit.com/r/reproduciblebuilds">Reddit</a> and
+ please consider <a href="{{ "/sponsor/" | relative_url }}">making a donation</a>.
+ •
+ 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 for this website welcome <a href="https://salsa.debian.org/reproducible-builds/reproducible-website">via our Git repository</a>
+ (<a href="{{ "/contribute/salsa/" | relative_url }}">instructions</a>) or via <a href="https://lists.reproducible-builds.org/listinfo/rb-general">our mailing list</a>.
+ •
+ <a href="{{ "/who/" | relative_url }}">Full contact info</a>
+ </span>
</div>
+
+ <div class="col-lg-3 px-lg-5 col-md-12 d-flex justify-content-between align-items-center flex-row flex-lg-column flex-xl-row">
+ <a href="https://sfconservancy.org">
+ <img src="{{ "/assets/images/footer/conservancy.png" | relative_url }}" height="45" width="auto" alt="software freedom conservancy"/>
+ </a>
+ <a href="{{ "/" | relative_url }}">
+ <img src="{{ "/images/logos/rb.svg" | relative_url }}" height="45" width="auto" alt="Reproducible Builds"/>
+ </a>
+ </div>
+
</div>
=====================================
_includes/nav_buttons.html deleted
=====================================
@@ -1,4 +0,0 @@
-{% assign sorted_pages = site.pages | sort:"order" %}
-<p class="text-center nav-btn">
-{% for page in sorted_pages %}{% if page.title and page.order > 0 and page.url != "/" %}<a class="btn btn-outline-primary m-2" href="{{ page.url | relative_url }}">{{ page.title }}</a>{% endif %}{% endfor %}
-</p>
=====================================
_includes/navbar.html
=====================================
@@ -1,22 +1,22 @@
<nav class="navbar navbar-expand-lg navbar-light sticky-top rb-navbar__top">
- <a class="navbar-brand" href="{{ "/" | relative_url }}">
+ <a class="navbar-brand mr-5" href="{{ "/" | relative_url }}">
<img src="{{ "/assets/images/logo-text-white.png" | relative_url }}" height="30" width="auto" alt=""></img>
</a>
<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">
+ <div class="collapse navbar-collapse" id="navbarSupportedContent">
+ <ul class="navbar-nav mr-auto">
{% assign sorted_pages = site.pages | sort:"order" %}
{% for page in sorted_pages %}
- {% if page.title and page.order >= 0 %}
+ {% if page.title and page.order >= 0 and page.url != "/" %}
<li class="nav-item">
<a class="nav-link" href="{{ page.url | relative_url }}">{{ page.title }}</a>
</li>
{% endif %}
{% endfor %}
-
</ul>
+
</div>
</nav>
=====================================
_includes/navbar_side.html deleted
=====================================
@@ -1,41 +0,0 @@
-<div class="sidebar {{ include.sidebarClassName }}" id="sidebar1">
-
- <div class="row">
- <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="{{ page.url | relative_url }}" class="sidebar__link__darkGray {% if page.url == "/" %}never-active{% endif %}">{{ page.title }}</a>
- </li>
- {% endif %}
- {% endfor %}
- </ul>
- </div>
-{% assign levels = "platinum,gold" | split: ',' %}
-{% assign sponsors = ""|split: "" %}
-{% for level in levels %}
-{% assign sponsors = sponsors | concat: site.data.sponsors[level] %}
-{% endfor %}
-{% if sponsors.size != 0 %}
-<div class="row sponsors d-none d-md-block">
-<div class="fixed-bottom">
- {% for x in sponsors %}
- <div class="col-md-2 col-sm-3 mb-2 p-2">
- <div class="card text-center">
- <a href="{{ x.url }}" name="{{ x.name }}">
- <img class="px-1 py-2" src="{{ x.logo | prepend: "/assets/images/sponsors/" | relative_url }}" alt="{{ x.name }}">
- </a>
- </div>
- </div>
- {% endfor %}
-
- <div class="row">
- <div class="col-md-2 text-center p-2">
- <small><a href="{{ "/who/sponsors/" | relative_url }}">All sponsors</a></small>
- </div>
- </div>
-</div>
-</div>
-{% endif %}
-</div>
=====================================
_includes/sidebar.html deleted
=====================================
@@ -1,11 +0,0 @@
-<div class="sidebar border-left-right {{ include.sidebarClassName }}" id="sidebar">
- <ul class="list-group padding-top-35">
- {% for sidebar_hash in page.sidebar %}
- {% for link in sidebar_hash %}
- <li class="list-group-item rb-sidebar">
- <a href="#{{ link[0] }}" class="sidebar__link__darkGray">{{ link[1] }}</a>
- </li>
- {% endfor %}
- {% endfor %}
- </ul>
-</div>
=====================================
_layouts/default.html
=====================================
@@ -4,18 +4,12 @@
<body>
{% include navbar.html %}
- <div class="row h-100">
- <div class="col-md-2 col-sm-3 d-none d-sm-block p-0 position-fixed">
- {% include navbar_side.html sidebarClassName="rb-sidebar__1" %}
- </div>
- <div class="col-md-10 col-xs-12 col-sm-9 p-0 dyn-left main-parent">
- <main role="main" class="content-scroll p-5" data-spy="scroll" data-target="#components-nav" data-offset="0">
- {{ content }}
-
- {% include footer.html %}
- </main>
- </div>
+ <div class="container">
+ <main role="main" class="content-scroll p-3">
+ {{ content }}
+ </main>
</div>
+ {% include footer.html %}
{% include scripts.html %}
</body>
=====================================
_layouts/docs.html
=====================================
@@ -1,5 +1,5 @@
---
-layout: default
+layout: no_sidebar
---
{% assign index_url = "/docs/" | relative_url %}
@@ -8,9 +8,9 @@ layout: default
<p class="d-lg-none">← <a href="{{ index_url }}">Documentation index</a></p>
{% endif %}
-<div class="row">
- <div class="col-lg-9">
- <h1 class="mb-4">{{ page.title }}</h1>
+<div class="row justify-content-end">
+ <div class="col-md-12 col-lg-6">
+ <h1>{{ page.title }}</h1>
{{ content }}
@@ -21,9 +21,9 @@ layout: default
{% endif %}
</div>
- <div class="col-lg-3">
+ <div class="col-xl-2 col-lg-3 offset-lg-1 d-none d-lg-block">
{% if page.url != index_url %}
- <p class="mt-5 d-lg-block"><a href="{{ index_url }}">Documentation home</a></p>
+ <p class="mt-5"><a href="{{ index_url }}">Documentation home</a></p>
{% endif %}
{% for section in site.data.docs %}
=====================================
_layouts/home.html deleted
=====================================
@@ -1,59 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="ltr">
-{% include head.html %}
-
-<body>
- {% include navbar.html %}
- <div class="row h-100">
- <div class="col-md-2 col-sm-3 d-none d-sm-block p-0">
- {% include navbar_side.html sidebarClassName="rb-sidebar__1" %}
- </div>
- <div class="col-md-10 col-xs-12 col-sm-9 p-0">
- <main role="main" class="content-scroll p-5" data-spy="scroll" data-target="#components-nav" data-offset="0">
- <!--h1 class="mt-5">Tor Styleguide | The Tor Project</h1-->
-
- <div class="row">
- <div class="col-12 p-0">
- <div class="page-header mb-4">
- <h3>About</h3>
- <p class="text-muted">Reproducible builds are a set of software development practices that create an independently-verifiable path from source code to the binary code used by computers.</p>
- </div>
- <p>This guide aims to provide standards, principles and components to design consistent views related to the Reproducible Builds project. These pages are a living document and we welcome contributions, feedback and suggestions.</p>
- </p>
- <br>
- <h5>Contact</h5>
- <div class="row mt-5">
- <div class="col-md-6">
- <div class="border p-5 mb-3">
- <h6>Reproducible Builds</h6>
- <a class="btn btn-lg btn-link p-0" title="Reproducible Builds Repo" href="https://lists.reproducible-builds.org/listinfo/rb-general" target="_blank">Mailing List</a></div>
- </div>
- </div>
- </div>
- <div class="col-12 p-0">
- <div class="page-header mb-4 mt-5">
- <h5>Identihub</h5>
- <p class="text-muted">The Reproducible Builds Project brand assets are included in this Identihub project page.</p>
- </div>
- <div class="row mt-5">
- <div class="col-md-6">
- <div class="border p-5 mb-3 text-left">
- <h6>Styleguide Mirror on Identihub</h6>
- <p class="m-0"></p>
- <a class="btn btn-lg btn-link p-0" href="https://demo.identihub.co/project/reproducible-builds" target="_blank">Project Page</a>
- </div>
- </div>
- </div>
- </div>
- </div>
-
- {% include scrollspy.html %}
-
- </main>
- </div>
- </div>
- {% include scripts.html %}
-
-</body>
-
-</html>
=====================================
_layouts/no_sidebar.html
=====================================
@@ -4,16 +4,10 @@
<body>
{% include navbar.html %}
- <div class="container">
- <div class="row h-100">
- <main role="main" class="content-scroll p-3 p-md-5">
- {{ content }}
-
- {% include footer.html %}
- </main>
- </div>
- </div>
- </div>
+ <main role="main" class="content-scroll p-3">
+ {{ content }}
+ </main>
+ {% include footer.html %}
{% include scripts.html %}
</body>
=====================================
assets/images/icons/translate-white-24dp.svg deleted
=====================================
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="white" width="24px" height="24px"><path d="M0 0h24v24H0z" fill="none"/><path d="M12.87 15.07l-2.54-2.51.03-.03c1.74-1.94 2.98-4.17 3.71-6.53H17V4h-7V2H8v2H1v1.99h11.17C11.5 7.92 10.44 9.75 9 11.35 8.07 10.32 7.3 9.19 6.69 8h-2c.73 1.63 1.73 3.17 2.98 4.56l-5.09 5.02L4 19l5-5 3.11 3.11.76-2.04zM18.5 10h-2L12 22h2l1.12-3h4.75L21 22h2l-4.5-12zm-2.62 7l1.62-4.33L19.12 17h-3.24z"/></svg>
=====================================
assets/styles/custom.scss
=====================================
@@ -130,15 +130,6 @@ main {
}
}
-.sidebar {
- .sponsors {
- img {
- max-height: 48px;
- max-width: 100%;
- }
- }
-}
-
.hero {
background-color: #1e5b96;
left: 50%;
@@ -163,10 +154,4 @@ main {
color: inherit;
}
}
-
-}
-
-.nav-btn {
- margin-left: -3.3rem;
- margin-right: -3.3rem;
-}
+}
\ No newline at end of file
=====================================
assets/styles/layout.scss
=====================================
@@ -5,33 +5,6 @@
border-right: 1px solid $oc-gray-3 !important;
}
-.sidebar {
- min-height: 100vh;
- height: 100%;
- width: 100%;
-
- & .list-group-item {
- background-color: transparent;
- border: 0;
- border-radius: 0 !important;
- // border-color: $oc-gray-4;
- }
-}
-
-.sidebar-wrapper {
- background-color: $oc-gray-2;
-}
-
-.sidebar__link__darkGray {
- color: $oc-gray-8 !important;
-
- &:hover {
- color: $primary !important
- // color: $oc-gray-8 !important;
- }
-}
-
-
.row {
margin: auto !important;
}
@@ -52,13 +25,6 @@
border-top: 9px solid black;
}
-.rb-sidebar__1 {
- background-color: $oc-gray-1;
-}
-
-.rb-sidebar__2 {
- background-color: $oc-gray-0;
-}
.rb-contain {
width: 100%;
=====================================
assets/styles/main.scss
=====================================
@@ -7,7 +7,6 @@
@import "visuals";
@import "components";
- at import "state";
@import "syntax";
body {
=====================================
assets/styles/state.scss deleted
=====================================
@@ -1,15 +0,0 @@
- at media (min-width: 992px) {
- .display-xs {
- display: none !important;
- }
- }
-
- @media (max-width: 992px) {
- .display-md {
- display: none !important;
- }
- }
-
-.display-md {
- display: unset;
-}
=====================================
index.md
=====================================
@@ -1,5 +1,5 @@
---
-layout: no_sidebar
+layout: default
title: Home
title_head: Reproducible Builds — a set of software development practices that create an independently-verifiable path from source to binary code
order: 10
@@ -17,15 +17,13 @@ permalink: /
practices that create an independently-verifiable path from source
to binary code.
<small class="d-none d-sm-inline">
- (<a href="{{ "/docs/definition/" | relative_url }}">more</a>)
+ (<a href="{{ "/docs/definition/" | relative_url }}">Find out more</a>)
</small>
</p>
</div>
</div>
</div>
-{% include nav_buttons.html %}
-
<div class="row justify-content-center">
<h2 class="text-center mb-4">Why Reproducible Builds Matter</h2>
<p class="mb-4"><strong>In short: </strong>Reproducible Builds provide certainty that software is genuine and has not been tampered with.</p>
@@ -145,7 +143,3 @@ We are proud to be [sponsored by]({{ "/sponsors/" | relative_url }}):
</div>
{% else %}
{% endif %}
-
-<br>
-
-{% include nav_buttons.html %}
=====================================
po/_pages.de.po
=====================================
@@ -241,11 +241,6 @@ msgid ""
"</div>\n"
msgstr ""
-#. type: Plain text
-#: index.md
-msgid "{% include nav_buttons.html %}"
-msgstr ""
-
#. type: Title ##
#: index.md
#, no-wrap
=====================================
po/_pages.pot
=====================================
@@ -244,12 +244,6 @@ msgid ""
"</div>\n"
msgstr ""
-#. type: Plain text
-#: index.md
-#, markdown-text
-msgid "{% include nav_buttons.html %}"
-msgstr ""
-
#. type: Title ##
#: index.md
#, markdown-text, no-wrap
=====================================
who_/index.md
=====================================
@@ -13,7 +13,7 @@ Various entities are working on providing reproducible builds to their users and
<br>
-<div class="row">
+<div class="row my-lg-5 py-lg-5">
<div class="col-md-4 text-center" markdown="1">
<a href="{{ "/who/people/" | relative_url }}"><img src="{{ "/images/who/people.svg" | relative_url }}" height="200" alt="people"></a>
View it on GitLab: https://salsa.debian.org/reproducible-builds/reproducible-website/-/compare/5d179a7acf63ec39f9e722dde25266fae7df2c46...a456281f3dc36e957cb3a24c68c56f3250929976
--
View it on GitLab: https://salsa.debian.org/reproducible-builds/reproducible-website/-/compare/5d179a7acf63ec39f9e722dde25266fae7df2c46...a456281f3dc36e957cb3a24c68c56f3250929976
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/20241205/0ec91343/attachment.htm>
More information about the rb-commits
mailing list