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: 42c8e8948985
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: 50d458f46483
Choose a head ref
  • 9 commits
  • 9 files changed
  • 2 contributors

Commits on May 4, 2019

  1. .gitignore: Ignores uncompressed json files

    @samueldr
    samueldr committed May 4, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    erictapen Kerstin
    GPG key ID: 5F24E3BD56617EB2
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4b938b1 View commit details

  2. css: Fixes indents

    @samueldr
    samueldr committed May 4, 2019
    Copy the full SHA
    198bfbe View commit details

  3. index: Moves contents to nixos/index.tt

    @samueldr
    samueldr committed May 4, 2019
    Copy the full SHA
    b7e4508 View commit details

Commits on May 8, 2019

  1. layout: Adds organization menu 

    This menu is used on the "organization" website, which means the
non-project-specific sites. The menu options refers to the main
components of the NixOS organization, as a quick access menu on the
front page.

 + note about donation.tt
    @samueldr
    samueldr committed May 8, 2019
    Copy the full SHA
    e080447 View commit details

  2. css: Fixes caret position on Firefox

    @samueldr
    samueldr committed May 8, 2019
    Copy the full SHA
    b6fbd2c View commit details

  3. css: ensures brand doesn't stretch navbar 

    This is slight, but the brand will stretch the header by
1.5~2px, which is slight, but noticeable when you know it.
    @samueldr
    samueldr committed May 8, 2019
    Copy the full SHA
    7c26b22 View commit details

  4. Updates landing page to be more project agnostic 

    From the nixos.org main page, there is was no way to quickly glance at
the moving parts of the NixOS project, that is Nix and Nixpkgs. Only
NixOS was represented.

This is a step into fixing an issue that @garbas brought forward at the
last NixCon, where the landing page of NixOS.org and the nix landing
page lacks in "actionability".

From the new nixos.org main page, it is easier to go straight to the Nix
specific section of the site. In a follow up work, the main Nix web page
can be re-worked to "show off" more what Nix is about.
    @samueldr
    samueldr committed May 8, 2019
    Copy the full SHA
    9f2f846 View commit details

Commits on Jun 17, 2019

  1. Merge branch 'feature/new-landing' of https://github.com/samueldr/nix… 

    …os-homepage
    @edolstra
    edolstra committed Jun 17, 2019
    Copy the full SHA
    f06833b View commit details

  2. Typo

    @edolstra
    edolstra committed Jun 17, 2019
    Copy the full SHA
    50d458f View commit details
Showing with 241 additions and 49 deletions.
  1. +3 −0 .gitignore
  2. +2 −1 Makefile
  3. +83 −3 css/nixos-site.css
  4. +1 −0 donation.tt
  5. +90 −42 index.tt
  6. +7 −1 layout.tt
  7. +1 −1 news.tt
  8. +0 −1 nixos/index.html
  9. +54 −0 nixos/index.tt
3 changes: 3 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -13,12 +13,15 @@
/nixos/nix-pills/
/nixos/nix-pills-raw
/nixos/options.json.gz
/nixos/options.json
/nixos/screenshots/nixos-*-small.png

/nixpkgs/manual/
/nixpkgs/manual-raw
/nixpkgs/packages-unstable.json.gz
/nixpkgs/packages.json.gz
/nixpkgs/packages-unstable.json
/nixpkgs/packages.json

/blogs.json
/blogs.xml
3 changes: 2 additions & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
@@ -10,7 +10,8 @@ default: all
HTML = index.html news.html \
nix/index.html nix/about.html nix/download.html \
nixpkgs/index.html nixpkgs/download.html \
nixos/about.html nixos/download.html nixos/support.html nixos/community.html nixos/packages.html nixos/options.html \
nixos/index.html nixos/about.html nixos/download.html nixos/support.html \
nixos/community.html nixos/packages.html nixos/options.html \
nixos/security.html nixos/foundation.html \
nixos/wiki.html \
patchelf.html hydra/index.html \
86 changes: 83 additions & 3 deletions css/nixos-site.css
View file
Original file line number Diff line number Diff line change
@@ -36,6 +36,15 @@ p {
text-decoration: none;
}

.navbar .brand {
padding-bottom: 0;
}

.dropdown .caret {
vertical-align: middle;
margin-top: -3px;
}

.logo {
margin-top: -5px;
padding-right: 5px;
@@ -49,6 +58,77 @@ p {
margin: 1em 3em 1em 0em;
}

/* Holds semantic titles on the main page. */
.nixos-org-index > h1,
.nixos-org-index > h2 {
height: 0;
margin: 0;
padding: 0;
text-indent: -999em;
}
.nixos-org-index > hr {
margin-bottom: 0;
}

.nixos-org-index .more-about .learn-more {
display: block;
/*text-align: right;*/
}

.nixos-org-index .and-more ul {
list-style-type: none;
margin: 0;
}
.nixos-org-index .and-more ul li {
margin: 0;
}

@media (max-width: 767px) {
.jumbotron-two > div > div::after {
content: "";
display: block;
clear: both;
}
.jumbotron-two .learn-more {
float: right;
}
}
@media (min-width: 768px) {
/* Punny name, as it is both the second jumobtron implementation
and a two elements side-by-side thing. */
.jumbotron-two {
display: table;
/* 14px/20px equivalent */
line-height: 1.429;
}
.jumbotron-two p {
font-size: 1.2em;
}
.jumbotron-two > div {
display: table-row;
}
.jumbotron-two > div > div {
width: 50%;
position: relative;
display: table-cell;
padding-bottom: 35px;
}
.jumbotron-two > div > div:not(:first-child) {
padding-left: 15px;
}
.jumbotron-two > div > div:not(:last-child) {
padding-right: 15px;
}
.jumbotron-two .learn-more {
position: absolute;
bottom: 0;
right: 0;
}
.jumbotron-two div:not(:last-child) > .learn-more {
right: 15px;
}
}

h2, div.docbook h1 {
font-weight: normal;
font-size: 200%;
@@ -283,12 +363,12 @@ div.search-details td.nix {
}

#search-results .description.docbook p > .docbook-important {
margin-top: 0.5rem;
margin-top: 0.5rem;
}

#search-results .description.docbook .docbook-important {
border-left: #F89406 solid 0.3rem;
padding-left: 0.5rem;
border-left: #F89406 solid 0.3rem;
padding-left: 0.5rem;
}

/* Manual. */
1 change: 1 addition & 0 deletions donation.tt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[%# Fragment imported in other pages. %]
<p>You can donate to the NixOS foundation by using the PayPal button below:</p>

<p>
132 changes: 90 additions & 42 deletions index.tt
View file
Original file line number Diff line number Diff line change
@@ -1,53 +1,101 @@
[% WRAPPER layout.tt title="NixOS Linux" hideTitle=1 menu='nixos' %]
[% WRAPPER layout.tt title="NixOS Linux" hideTitle=1 menu='organization' %]
[% USE JSON.Escape %]
[% USE IO.All %]
[% USE HTML %]
[% USE String %]

<link rel="alternate" type="application/rss+xml" title="RSS" href="/news-rss.xml" />

<div class="jumbotron">
<img class="right-logo" src="[%root%]logo/nixos-logo-only-hires.png" alt="NixOS Logo"/>
<div class="nixos-org-index">
[%# Title for the site, used to keep the document tree rooted at h1. %]
<h1>NixOS</h1>
<h2>The Purely Functional Linux Distribution</h2>

<p class="lead">NixOS is a Linux distribution with a unique approach
to package and configuration management. Built on top of the <a
href="[%root%]nix">Nix package manager</a>, it is completely
declarative, makes upgrading systems reliable, and has <a
href="[%root%]nixos/about.html">many other advantages</a>.</p>

<div class="get-nixos get-button">
<a class="btn btn-large btn-success"
href="[%root%]nixos/download.html"><i class="fa
fa-cloud-download"></i> Get NixOS</a>
</div>
</div>

<hr />

<div class="row-fluid">
<div class="span4">
<h2>Declarative</h2>
<p>NixOS has a completely <strong>declarative</strong> approach to
configuration management: you write a specification of the desired
configuration of your system in NixOS’s modular language, and
NixOS takes care of making it happen.</p>
</div>
<div class="span4">
<h2>Reliable</h2>
<p>NixOS has <strong>atomic upgrades and rollbacks</strong>. It’s
always safe to try an upgrade or configuration change: if things
go wrong, you can always roll back to the previous
configuration.</p>
</div>
<div class="span4">
<h2>DevOps-friendly</h2>
<p>Declarative specs and safe upgrades make NixOS a great system
for DevOps use. <a
href="[%root%]nixops"><strong>NixOps</strong></a>, the NixOS cloud
deployment tool, allows you to provision and manage networks of
NixOS machines in environments like Amazon EC2 and VirtualBox.</p>

<div class="jumbotron-two"><div>
<div class="intro-nix">
<h2>What is Nix?</h2>

<p>
Nix is a powerful package manager for Linux and other Unix systems
that makes package management reliable and reproducible. It
provides atomic upgrades and rollbacks, side-by-side installation
of multiple versions of a package, multi-user package management
and easy setup of build environments.
</p>

<div class="learn-more">
<a class="btn btn-success" href="[%root%]nix/">
<i class="fa fa-chevron-right"></i> Learn more about Nix
</a>
</div>
</div>
<div class="intro-nixos">
<h2>What is NixOS?</h2>

<p>NixOS is a Linux distribution with a unique approach
to package and configuration management. Built on top of the <a
href="[%root%]nix">Nix package manager</a>, it is completely
declarative, makes upgrading systems reliable, and has <a
href="[%root%]nixos/about.html">many other advantages</a>.</p>

<div class="learn-more">
<a class="btn btn-success" href="[%root%]nixos/">
<i class="fa fa-chevron-right"></i> Learn more about NixOS
</a>
</div>
</div>
</div></div>

<hr />

<h2>More about NixOS</h2>

<div class="row-fluid more-about">
<div class="span4">
<h3>Nixpkgs</h3>
<p>
The Nix Packages collection (Nixpkgs) is the ever growing
packages collection for the Nix package manager, released
under a permissive MIT/X11 license.
</p>
<a class="learn-more" href="[%root%]/nixpkgs">
More about Nixpkgs
<i class="fa fa-angle-right"></i>
</a>
</div>
<div class="span4">
<h3>NixOps</h3>
<p>
NixOps is a tool for deploying sets of NixOS Linux machines,
bare-metal or to the cloud. It extends NixOS’s declarative
approach to system configuration management to networks and
provisioning.
</p>
<a class="learn-more" href="[%root%]/nixops">
More about NixOps
<i class="fa fa-angle-right"></i>
</a>
</div>
<div class="span4 and-more">
<h3>About the community</h3>
<p>
Sometimes, it helps to talk with someone. Our community
is there whether you want to help or get support.
</p>
<ul>
<li>
<a href="[%root%]/nixos/community.html">
Get in touch
<i class="fa fa-angle-right"></i>
</a>
</li>
<li>
<a href="[%root%]/nixos/support.html">
Getting support
<i class="fa fa-angle-right"></i>
</a>
</li>
</ul>
</div>
</div>
</div>

8 changes: 7 additions & 1 deletion layout.tt
View file
Original file line number Diff line number Diff line change
@@ -59,7 +59,9 @@
<b class="caret"></b>
</a>
<ul class="dropdown-menu">
<li><a href="[%root%]">NixOS</a></li>
[%# Using %root% for / will not work as expected. %]
<li><a href="/">Site Home</a></li>
<li><a href="[%root%]nixos">NixOS</a></li>
<li><a href="[%root%]nix">Nix</a></li>
<li><a href="[%root%]nixops">NixOps</a></li>
<li><a href="[%root%]nixpkgs">Nixpkgs</a></li>
@@ -126,6 +128,10 @@
[% ELSIF menu == 'patchelf' %]
<ul class="nav pull-right">
<li><a href="https://github.com/NixOS/patchelf"><i class="fa fa-github"></i></a></li>
[% ELSIF menu == 'organization' %]
<ul class="nav pull-right">
<li><a href="https://github.com/NixOS/nixpkgs"><i class="fa fa-github"></i></a></li>
<li><a href="https://twitter.com/nixos_org"><i class="fa fa-twitter"></i></a></li>
[% ELSE %]
<ul class="nav pull-right">
[% END %]
2 changes: 1 addition & 1 deletion news.tt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[% WRAPPER layout.tt title="News" menu='nixos' %]
[% WRAPPER layout.tt title="News" menu='organization' %]

[% INSERT "all-news.xhtml" %]

1 change: 0 additions & 1 deletion nixos/index.html
View file

This file was deleted.

54 changes: 54 additions & 0 deletions nixos/index.tt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
[% WRAPPER layout.tt title="NixOS Linux" hideTitle=1 menu='nixos' %]
[% USE JSON.Escape %]
[% USE IO.All %]
[% USE HTML %]
[% USE String %]

<link rel="alternate" type="application/rss+xml" title="RSS" href="/news-rss.xml" />

<div class="jumbotron">
<img class="right-logo" src="[%root%]logo/nixos-logo-only-hires.png" alt="NixOS Logo"/>
<h1>NixOS</h1>
<h2>The Purely Functional Linux Distribution</h2>

<p class="lead">NixOS is a Linux distribution with a unique approach
to package and configuration management. Built on top of the <a
href="[%root%]nix">Nix package manager</a>, it is completely
declarative, makes upgrading systems reliable, and has <a
href="[%root%]nixos/about.html">many other advantages</a>.</p>

<div class="get-nixos get-button">
<a class="btn btn-large btn-success"
href="[%root%]nixos/download.html"><i class="fa
fa-cloud-download"></i> Get NixOS</a>
</div>
</div>

<hr />

<div class="row-fluid">
<div class="span4">
<h2>Declarative</h2>
<p>NixOS has a completely <strong>declarative</strong> approach to
configuration management: you write a specification of the desired
configuration of your system in NixOS’s modular language, and
NixOS takes care of making it happen.</p>
</div>
<div class="span4">
<h2>Reliable</h2>
<p>NixOS has <strong>atomic upgrades and rollbacks</strong>. It’s
always safe to try an upgrade or configuration change: if things
go wrong, you can always roll back to the previous
configuration.</p>
</div>
<div class="span4">
<h2>DevOps-friendly</h2>
<p>Declarative specs and safe upgrades make NixOS a great system
for DevOps use. <a
href="[%root%]nixops"><strong>NixOps</strong></a>, the NixOS cloud
deployment tool, allows you to provision and manage networks of
NixOS machines in environments like Amazon EC2 and VirtualBox.</p>
</div>
</div>

[% END %]