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: d2bc46b77206
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: 29ec9dd6383e
Choose a head ref
  • 1 commit
  • 9 files changed
  • 1 contributor

Commits on Jan 20, 2021

  1. Copy the full SHA
    29ec9dd View commit details
Showing with 22 additions and 28 deletions.
  1. +1 −1 donate.tt
  2. +3 −4 learn.tt
  3. +2 −2 news.xml
  4. +3 −4 scripts/check-links.sh
  5. +1 −1 scripts/run.py
  6. +4 −4 site-styles/assets/rfc-process.svg
  7. +1 −1 site-styles/pages/donate.less
  8. +4 −0 site-styles/pages/download.less
  9. +3 −11 site-styles/pages/learn.less
2 changes: 1 addition & 1 deletion donate.tt
Original file line number Diff line number Diff line change
@@ -145,7 +145,7 @@ BIC: KNABNL2H</pre>
</ul>
</div>
<div>
<h2>Acknowledgements</h2>
<h1>Acknowledgements</h1>
<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>
7 changes: 3 additions & 4 deletions learn.tt
Original file line number Diff line number Diff line change
@@ -5,7 +5,6 @@
</div>

<section class="learn-getstarted">
<h2>Get started</h2>
<ul>
<li>
<div class="clickable-whole">
@@ -36,7 +35,7 @@

<section class="learn-search">
<div>
<h2>Search</h2>
<h1>Search</h1>
<ul>
<li>
<h3>Nix packages</h3>
@@ -59,7 +58,7 @@
</section>

<section id="learn-guides" class="learn-guides">
<h2>Guides</h2>
<h1>Guides</h1>
<ul>
[% INSERT "learn_guides.html.in" %]
</ul>
@@ -210,7 +209,7 @@

<section class="learn-otherresources">
<div>
<h2>Other learning resources</h2>
<h1>Other learning resources</h1>
<ul>
<li class="clickable-whole">
<h3>Nix Pills</h3>
4 changes: 2 additions & 2 deletions news.xml
Original file line number Diff line number Diff line change
@@ -1587,7 +1587,7 @@ $ nix-store -qR /run/current-system | grep openssl
Functional System
Configuration Management</em></a> at the <a href="https://www.usenix.org/events/hotos07/">11th Workshop on
Hot Topics in Operating Systems (HotOS XI)</a>. It gives an
overview of the ideas behind <a href="nixos/">NixOS</a>. The
overview of the ideas behind <a href="/">NixOS</a>. The
<a href="http://people.cs.uu.nl/eelco/talks/hotos-may-2007.pdf">slides</a>
are also available.
</p>
@@ -1666,7 +1666,7 @@ $ nix-store -qR /run/current-system | grep openssl
NixOS for x86_64
</title>
<description>
NixOS now works on x86_64 machines. A 64-bit ISO is <a href="nixos/#download">available</a>.
NixOS now works on x86_64 machines. A 64-bit ISO is <a href="download.html">available</a>.
</description>
</item>

7 changes: 3 additions & 4 deletions scripts/check-links.sh
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
#! /usr/bin/env bash

LINKCHECK_PORT=8137
export PORT=8137

caddy -port $LINKCHECK_PORT &
serve &
server_pid=$!
linkchecker http://localhost:$LINKCHECK_PORT \
--ignore-url /nixpkgs/
linkchecker http://localhost:$PORT --ignore-url /nixpkgs/
status=$?
kill $server_pid
exit $status
2 changes: 1 addition & 1 deletion scripts/run.py
Original file line number Diff line number Diff line change
@@ -41,7 +41,7 @@ def main(common_styles):

os.system("make")

server.serve(root="./", port=8000)
server.serve(root="./", port=os.getenv("PORT", 8000))

if __name__ == "__main__":
main()
8 changes: 4 additions & 4 deletions site-styles/assets/rfc-process.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion site-styles/pages/donate.less
Original file line number Diff line number Diff line change
@@ -151,7 +151,7 @@
}

& > div:last-child {
h2, a {
h1, a {
color: #theme.color[white];
}
}
4 changes: 4 additions & 0 deletions site-styles/pages/download.less
Original file line number Diff line number Diff line change
@@ -8,6 +8,10 @@
color: #theme.color[white];
}

h1 {
top: 0.25*@gutter;
}

h2 {
font-size: 150%;
}
14 changes: 3 additions & 11 deletions site-styles/pages/learn.less
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
.learn-getstarted {
#container();

& > h2 {
margin-bottom: 2*@gutter;
}

& > ul {
#columns(3, @sm: 1);

@@ -15,7 +11,7 @@
padding: 2*@gutter;
position: relative;
}

// Button
& > li > div > a {
#columns(1);
@@ -96,7 +92,7 @@
padding-left: 1*@gutter;
});

h2, h3 {
h1, h3 {
color: #theme.color[white];
}

@@ -130,10 +126,6 @@
.learn-guides {
#container();

& > h2 {
margin-bottom: 2*@gutter;
}

& > ul {
list-style: none;
margin: 0;
@@ -256,7 +248,7 @@
margin-bottom: -2*@gutter;
color: #theme.color[white];

h2, h3, a {
h1, h3, a {
color: #theme.color[white];
}