Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixos-homepage
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: dd7dd6e3fd97^
Choose a base ref
...
head repository: NixOS/nixos-homepage
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 087b27660afa
Choose a head ref
  • 17 commits
  • 21 files changed
  • 1 contributor

Commits on Sep 9, 2020

  1. js: prevent accidental recursion in event handlers with clickable-whole

    @samueldr
    samueldr committed Sep 9, 2020
    Copy the full SHA
    dd7dd6e View commit details

  2. site-styles: Ensure main section fills the display 

    This is only useful for small pages, but still.
    @samueldr
    samueldr committed Sep 9, 2020
    Copy the full SHA
    792bfe8 View commit details

  3. site-styles: Implement angled title flair

    @samueldr
    samueldr committed Sep 9, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1ed8e5a View commit details

  4. site-styles: Add style for shell prompt

    @samueldr
    samueldr committed Sep 9, 2020
    Copy the full SHA
    9ae3fb8 View commit details

  5. site-styles: add simple banner

    @samueldr
    samueldr committed Sep 9, 2020
    Copy the full SHA
    3b384e8 View commit details

  6. site-styles: Add unsemantic columns (and lead) styles 

    The unsemantic columns allows us to plow faster through the bootstrap
layouts and make them MVPs.
    @samueldr
    samueldr committed Sep 9, 2020
    Copy the full SHA
    ce20a2d View commit details

  7. site-styles: Implement MBP tabs component 

    Not the prettiest, but MVP for now.
    @samueldr
    samueldr committed Sep 9, 2020
    Copy the full SHA
    cb9e6a2 View commit details

  8. site-styles: Add wells

    @samueldr
    samueldr committed Sep 9, 2020
    Copy the full SHA
    e3c9673 View commit details

  9. site-styles: Add styles for donate page

    @samueldr
    samueldr committed Sep 9, 2020
    Copy the full SHA
    00ac148 View commit details

  10. js: Implement tabs behaviour 

    Probably final.
    @samueldr
    samueldr committed Sep 9, 2020
    Copy the full SHA
    8e1f835 View commit details

  11. teams/*: remove unneeded PROCESS directives

    @samueldr
    samueldr committed Sep 9, 2020
    Copy the full SHA
    82f6fe0 View commit details

  12. features.tt: rework for MVP

    @samueldr
    samueldr committed Sep 9, 2020
    Copy the full SHA
    6c61281 View commit details

  13. community.tt: rework for MVP

    @samueldr
    samueldr committed Sep 9, 2020
    Copy the full SHA
    8164464 View commit details

  14. governance.tt: rework for MVP

    @samueldr
    samueldr committed Sep 9, 2020
    Copy the full SHA
    e1603f4 View commit details

  15. commercial-support.tt: rework for MVP

    @samueldr
    samueldr committed Sep 9, 2020
    Copy the full SHA
    a228657 View commit details

  16. donate.tt: rework for MVP 

    The tabs aren't implemented yet
    @samueldr
    samueldr committed Sep 9, 2020
    Copy the full SHA
    54e9ea5 View commit details

  17. guides: rework for MVP

    @samueldr
    samueldr committed Sep 9, 2020
    Copy the full SHA
    087b276 View commit details
12 changes: 8 additions & 4 deletions commercial-support.tt
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
[% WRAPPER layout.tt title="Commercial support" %]
[% WRAPPER layout.tt title="Commercial support" handlesLayout=1 %]

<h1>Commercial support</h1>
<div class="page-title">
<h1>Commercial support</h1>
</div>

<div class="lead">
<section class="generic-layout lead">
A number of consulting companies are available for professional support.
</div>
</section>

<section class="generic-layout">
<p>The list is sorted in alphabetical order.</p>

<ul>
@@ -20,5 +23,6 @@
</ul>

<p>Please <a href="https://github.com/NixOS/nixos-homepage/edit/master/commercial-support.tt">submit a pull request</a> to add your company.</p>
</section>

[% END %]
45 changes: 27 additions & 18 deletions community.tt
View file
Original file line number Diff line number Diff line change
@@ -1,32 +1,40 @@
[% WRAPPER layout.tt title="NixOS Community" %]
[% WRAPPER layout.tt title="NixOS Community" handlesLayout=1 %]

<h1>NixOS Community</h1>
<div class="page-title">
<h1>NixOS Community</h1>
</div>

<section class="generic-layout lead">
<p>Nix and NixOS are developed and used by a diverse and welcoming community from all around the world.</p>
</section>

<p class="lead">Nix and NixOS are developed and used by a diverse and welcoming community from all around the world.</p>
<section class="wide-banner clickable-whole">
<p>
Check out what the community has made recently in the <a href="https://weekly.nixos.org/">NixOS Weekly</a> newsletter.
</p>
</section>

<p><strong>Check out what the community has made recently in the <a href="https://weekly.nixos.org/">NixOS Weekly</a> newsletter.</strong></p>
<div class="generic-layout">

<h2>Communication</h2>

<div class="row-fluid">
<div class="span4">
<div class="columnar-layout -three">
<div>
<h3>Forum</h3>
<p>The official forum is the right place to get help from other users and discuss the development of the projects. There are also Announcements, Job offers and Events.</p>
<div class="text-center">
<a class="btn btn-block btn-success"
href="https://discourse.nixos.org/">Go to Discourse Forum</a>
<div>
<a href="https://discourse.nixos.org/">Go to Discourse Forum</a>
</div>
</div>
<div class="span4">
<div>
<h3>Chat</h3>
<p>Another place to get in contact with other users is the official IRC channel:</p>
<p><a href="irc://irc.freenode.net/#nixos">#nixos</a> on the <a href="https://freenode.net/">freenode network</a> (<a href="https://logs.nix.samueldr.com/nixos/">logs</a> are available)</p>
<div class="text-center">
<a class="btn btn-block btn-success"
href="https://webchat.freenode.net/#nixos">Open Webchat</a>
<div>
<a href="https://webchat.freenode.net/#nixos">Open Webchat</a>
</div>
</div>
<div class="span4">
<div>
<h3>Unofficial Platforms</h3>
<p>The community is also active on other platforms.</p>
<ul>
@@ -41,8 +49,8 @@

<h2>Events</h2>

<div class="row-fluid">
<div class="span4">
<div class="columnar-layout -three">
<div>
<h3>NixCon</h3>
<p>The <a href="[%root%]teams/nixcon.html">NixCon Team</a> organizes a conference once a year.</p>
<p>You can find announcements on <a href="https://twitter.com/nixconf">Twitter</a> or in the <a href="https://discourse.nixos.org/c/events/13">Forum</a>.</p>
@@ -55,7 +63,7 @@
<li><a href="https://conf.nixos.org/">NixCon 2015</a>, Berlin (<a href="https://media.ccc.de/c/nixcon2015">Recorded Talks</a>)</li>
</ul>
</div>
<div class="span4">
<div>
<h3>Meetups</h3>
<h4>Europe</h4>
<ul>
@@ -72,7 +80,7 @@
</ul>

</div>
<div class="span4">
<div>
<h3> </h3> <!-- dirty hack to fix layout -->
<h4>America</h4>
<ul>
@@ -89,4 +97,5 @@
</div>
</div>

</div>
[% END %]
169 changes: 86 additions & 83 deletions donate.tt
View file
Original file line number Diff line number Diff line change
@@ -1,66 +1,77 @@
[% WRAPPER layout.tt title="Donate" %]
[% WRAPPER layout.tt title="Donate" handlesLayout=1 %]

<h1>Donate</h1>
<div class="page-title">
<h1>Donate</h1>
</div>

<p class="lead">
The NixOS infrastructure, development and events
are funded by its users and sponsors.
</p>
<section class="generic-layout lead">
<p>
The NixOS infrastructure, development and events
are funded by its users and sponsors.
</p>
</section>

<div class="row">
<div class="span6">
<p>Maintaining our build farm and binary cache is very expensive.
<section class="generic-layout">
<div class="columnar-layout -two">
<div>
<p>Maintaining our build farm and binary cache is very expensive.
We depend on your support to ensure the continuous operation
and expansion of the NixOS infrastructure.
Please consider donating a small amount every month
to contribute to sustainable funding.
Donations are handled by a nonprofit organization,
the <a href="[%root%]governance.html#foundation">NixOS Foundation</a>.</p>
</div>
<div class="span6">
<div class="well">
<h2>NixOS T-shirts, mugs and more...</h2>
<p>Donate to NixOS foundation by purchasing from NixOS shop.</p>
<p>The community member <a href="https://discourse.nixos.org/u/mogorman/summary">mogorman</a> is running the shop.
</div>
<div>
<div class="well">
<h2>NixOS T-shirts, mugs and more...</h2>
<p>Donate to NixOS foundation by purchasing from NixOS shop.</p>
<p>The community member <a href="https://discourse.nixos.org/u/mogorman/summary">mogorman</a> is running the shop.
The profits <a href="https://discourse.nixos.org/t/nixos-merchandise-report/303">are donated</a> to the <a
href="[%root%]governance.html#foundation">NixOS Foundation</a> twice a year (after each release).</p>
<a class="btn btn-block btn-success" href="https://www.redbubble.com/people/mogorman/shop">Go to the shop</a>
href="[%root%]governance.html#foundation">NixOS Foundation</a> twice a year (after each release).</p>
<a class="btn btn-block btn-success" href="https://www.redbubble.com/people/mogorman/shop">Go to the shop</a>
</div>
</div>
</div>
</div>
</section>

<ul id="donate-with" class="nav nav-tabs">
<li class="active"><a href="#donate-with-opencollective">Donate with Open Collective</a></li>
<li><a href="#donate-with-sepa">Donate with SEPA bank transfer</a></li>
</ul>
<section class="generic-layout">
<div class="tabs-navigation">
<nav>
<ul>
<li><a href="#donate-with-opencollective">Donate with Open Collective</a></li>
<li><a href="#donate-with-sepa">Donate with SEPA bank transfer</a></li>
</ul>
</nav>

<div class="tab-content">
<section class="tab-pane active" id="donate-with-opencollective">
<p>You can donate to the NixOS Foundation by using Open Collective:</p>
<object type="image/svg+xml"
data="https://opencollective.com/nixos/tiers/supporter.svg?avatarHeight=80&amp;width=1000"></object>
</section>
<section class="tab-pane" id="donate-with-sepa">
<p>
The NixOS Foundation also accepts donations via SEPA bank transfer.
Please send payments to:
</p>
<pre class="well">
Stichting NixOS Foundation, De Meern, The Netherlands
<div>
<section id="donate-with-opencollective">
<p>You can donate to the NixOS Foundation by using Open Collective:</p>
<object type="image/svg+xml"
data="https://opencollective.com/nixos/tiers/supporter.svg?avatarHeight=80&amp;width=1000"></object>
</section>
<section id="donate-with-sepa">
<p>
The NixOS Foundation also accepts donations via SEPA bank transfer.
Please send payments to:
</p>
<pre class="well">Stichting NixOS Foundation, De Meern, The Netherlands

IBAN: NL45 KNAB 0732 3586 98
BIC: KNABNL2H
</pre>
<p>Please add your name and purpose (donation) in the description of the transfer.</p>
<i>If you would like to support us with amounts above 2000 euro per year, please contact us at
<a href="mailto:foundation@nixos.org">foundation@nixos.org</a>, as this will have tax implications.
</i>
</section>
</div>
BIC: KNABNL2H</pre>
<p>Please add your name and purpose (donation) in the description of the transfer.</p>
<i>If you would like to support us with amounts above 2000 euro per year, please contact us at
<a href="mailto:foundation@nixos.org">foundation@nixos.org</a>, as this will have tax implications.
</i>
</section>
</div>
</div>
</section>

<h2>Acknowledgments</h2>
<section class="generic-layout acknowledgements-section">
<h2>Acknowledgements</h2>

<p>The Nix package manager was developed by <a href="https://edolstra.github.io/">Eelco Dolstra</a> as
<p>The Nix package manager was developed by <a href="https://edolstra.github.io/">Eelco Dolstra</a> as
part of his PhD research in the <a href="http://www.cs.uu.nl/wiki/Trace/WebHome">TraCE project</a>,
funded by the <a href="http://www.jacquard.nl/">Jacquard programme</a>
of the <a href="http://www.nwo.nl/">Netherlands Organisation for
@@ -70,51 +81,43 @@ BIC: KNABNL2H
system, was developed as part of the LaQuSo Buildfarm project, funded
by <a href="https://www.4tu.nl/nirict/">NIRICT</a> and <a href="http://www.laquso.com/">LaQuSo</a>.</p>

<p>The following companies and institutes have supported
<p>The following companies and institutes have supported
the development of NixOS and hosting for it's infrastructure.
We are very grateful for that!
If you would like to support us as well, please contact
<a href="mailto:rob.vermaas@gmail.com">Rob Vermaas</a>.</p>

<div class="row-fluid" style="height: 100px; line-height: 100px;">
<div class="span4 center" style="display: inline-block !important; vertical-align: middle;">
<a href="http://www.logicblox.com/"><img src="[% root %]logo/lb_logo_small_no_bg.png" alt="LogicBlox logo"
style="height:60px;" /></a>
</div>
<div class="span4 center" style="display: inline-block !important; vertical-align: middle;">
<a href="http://www.tudelft.nl/"><img src="[% root %]logo/tudelft.gif" alt="TU Delft logo"
style="height:60px;" /></a>
</div>
<div class="span4 center" style="display: inline-block !important; vertical-align: middle;">
<a href="http://www.uu.nl/"><img src="[% root %]logo/uu.gif" alt="UU logo" style="height:60px;" /></a>
</div>
</div>
<div class="sponsors">
<div>
<a href="http://www.logicblox.com/"><img src="[% root %]logo/lb_logo_small_no_bg.png" alt="LogicBlox logo" /></a>
</div>
<div>
<a href="http://www.tudelft.nl/"><img src="[% root %]logo/tudelft.gif" alt="TU Delft logo" /></a>
</div>
<div>
<a href="http://www.uu.nl/"><img src="[% root %]logo/uu.gif" alt="UU logo" /></a>
</div>

<div class="row-fluid" style="height: 100px; line-height: 100px;">
<div class="span4 center" style="display: inline-block !important; vertical-align: middle;">
<a href="https://www.3tu.nl/"><img src="[% root %]logo/3tu.jpg" alt="3TU logo" style="height:60px;" /></a>
</div>
<div class="span4 center" style="display: inline-block !important; vertical-align: middle;">
<a href="https://www.packet.com"><img src="[% root %]logo/packet.net.svg"
alt="Premium Bare Metal Servers and Cloud Hosting" style="height:60px;" /></a>
</div>
<div class="span4 center" style="display: inline-block !important; vertical-align: middle;">
<a href="https://snabb.co"><img src="[% root %]logo/snabb.png" alt="Snabb.co logo" style="height:60px;" /></a>
</div>
</div>
<div>
<a href="https://www.3tu.nl/"><img src="[% root %]logo/3tu.jpg" alt="3TU logo" /></a>
</div>
<div>
<a href="https://www.packet.com"><img src="[% root %]logo/packet.net.svg" alt="Premium Bare Metal Servers and Cloud Hosting" /></a>
</div>
<div>
<a href="https://snabb.co"><img src="[% root %]logo/snabb.png" alt="Snabb.co logo" /></a>
</div>

<div class="row-fluid" style="height: 100px; line-height: 100px;">
<div class="span4 center" style="display: inline-block !important; vertical-align: middle;">
<a href="https://www.macstadium.com/"><img src="[% root %]logo/macstadium.png" alt="MacStadium logo"
style="height:60px;" /></a>
</div>
<div class="span4 center" style="display: inline-block !important; vertical-align: middle;">
<a href="https://www.fastly.com/"><img src="[% root %]logo/fastly.png" alt="Fastly" style="height:60px;" /></a>
</div>
<div class="span4 center" style="display: inline-block !important; vertical-align: middle;">
<a href="https://www.hetzner.de/"><img src="[% root %]logo/hetzner-online.svg" alt="Hetzner Online GmbH"
style="height:60px;" /></a>
<div>
<a href="https://www.macstadium.com/"><img src="[% root %]logo/macstadium.png" alt="MacStadium logo" /></a>
</div>
<div>
<a href="https://www.fastly.com/"><img src="[% root %]logo/fastly.png" alt="Fastly" /></a>
</div>
<div>
<a href="https://www.hetzner.de/"><img src="[% root %]logo/hetzner-online.svg" alt="Hetzner Online GmbH" /></a>
</div>
</div>
</div>
</section>

[% END %]
Loading