Author: eelco Date: Fri May 11 21:42:00 2012 New Revision: 34062 URL: https://nixos.org/websvn/nix/?rev=34062&sc=1
Log: * Sync CSS with the Nix manual. Modified: nixpkgs/trunk/doc/introduction.xml nixpkgs/trunk/doc/language-support.xml nixpkgs/trunk/doc/manual.xml nixpkgs/trunk/doc/package-notes.xml nixpkgs/trunk/doc/style.css Modified: nixpkgs/trunk/doc/introduction.xml ============================================================================== --- nixpkgs/trunk/doc/introduction.xml Fri May 11 13:41:24 2012 (r34061) +++ nixpkgs/trunk/doc/introduction.xml Fri May 11 21:42:00 2012 (r34062) @@ -7,13 +7,13 @@ <para>This manual tells you how to write packages for the Nix Packages collection (Nixpkgs). Thus it’s for packagers and developers who want to add packages to Nixpkgs. End users are kindly referred to the -<link xlink:href="http://nixos.org/releases/nix/unstable/manual/";>Nix +<link xlink:href="http://hydra.nixos.org/job/nix/trunk/tarball/latest/download-by-type/doc/manual";>Nix manual</link>.</para> <para>This manual does not describe the syntax and semantics of the Nix expression language, which are given in the Nix manual in the <link -xlink:href="http://nixos.org/releases/nix/unstable/manual/#chap-writing-nix-expressions";>chapter +xlink:href="http://hydra.nixos.org/job/nix/trunk/tarball/latest/download-by-type/doc/manual/#chap-writing-nix-expressions";>chapter on writing Nix expressions</link>. It only describes the facilities provided by Nixpkgs to make writing packages easier, such as the standard build environment (<literal>stdenv</literal>).</para> Modified: nixpkgs/trunk/doc/language-support.xml ============================================================================== --- nixpkgs/trunk/doc/language-support.xml Fri May 11 13:41:24 2012 (r34061) +++ nixpkgs/trunk/doc/language-support.xml Fri May 11 21:42:00 2012 (r34062) @@ -196,6 +196,7 @@ </section> +<!-- <section><title>Haskell</title> <para>TODO</para> @@ -215,6 +216,7 @@ <para>* Special support for building TeX documents</para> </section> +--> </chapter> Modified: nixpkgs/trunk/doc/manual.xml ============================================================================== --- nixpkgs/trunk/doc/manual.xml Fri May 11 13:41:24 2012 (r34061) +++ nixpkgs/trunk/doc/manual.xml Fri May 11 21:42:00 2012 (r34062) @@ -14,14 +14,12 @@ <surname>Dolstra</surname> </personname> <affiliation> - <orgname>Delft University of Technology</orgname> - <orgdiv>Department of Software Technology</orgdiv> + <orgname>LogicBlox</orgname> </affiliation> </author> <copyright> - <year>2008</year> - <year>2009</year> + <year>2008-2012</year> <holder>Eelco Dolstra</holder> </copyright> Modified: nixpkgs/trunk/doc/package-notes.xml ============================================================================== --- nixpkgs/trunk/doc/package-notes.xml Fri May 11 13:41:24 2012 (r34061) +++ nixpkgs/trunk/doc/package-notes.xml Fri May 11 21:42:00 2012 (r34062) @@ -224,19 +224,23 @@ <!--============================================================--> +<!-- <section> <title>Gnome</title> <para>* Expression is auto-generated</para> <para>* How to update</para> </section> +--> <!--============================================================--> +<!-- <section> <title>GCC</title> <para>…</para> </section> +--> </chapter> Modified: nixpkgs/trunk/doc/style.css ============================================================================== --- nixpkgs/trunk/doc/style.css Fri May 11 13:41:24 2012 (r34061) +++ nixpkgs/trunk/doc/style.css Fri May 11 21:42:00 2012 (r34062) @@ -8,15 +8,14 @@ body { - font-family: sans-serif; + font-family: "Nimbus Sans L", sans-serif; background: white; margin: 2em 1em 2em 1em; } -h1,h2,h3 +h1, h2, h3, h4 { color: #005aa0; - text-align: left; } h1 /* title */ @@ -46,6 +45,11 @@ font-size: 125%; } +div.simplesect h2 +{ + font-size: 110%; +} + div.appendix h3 { font-size: 150%; @@ -70,11 +74,13 @@ div.example { - border: 1px solid #6185a0; + border: 1px solid #b0b0b0; padding: 6px 6px; margin-left: 1.5em; margin-right: 1.5em; background: #f4f4f8; + border-radius: 0.4em; + box-shadow: 0.4em 0.4em 0.5em #e0e0e0; } div.example p.title @@ -82,6 +88,11 @@ margin-top: 0em; } +div.example pre +{ + box-shadow: none; +} + /*************************************************************************** Screen dumps: @@ -89,14 +100,15 @@ pre.screen, pre.programlisting { - border: 1px solid #6185a0; + border: 1px solid #b0b0b0; padding: 3px 3px; margin-left: 1.5em; margin-right: 1.5em; color: #600000; background: #f4f4f8; font-family: monospace; - /* font-size: 90%; */ + border-radius: 0.4em; + box-shadow: 0.4em 0.4em 0.5em #e0e0e0; } div.example pre.programlisting @@ -113,13 +125,15 @@ .note, .warning { - border: 1px solid #6185a0; + border: 1px solid #b0b0b0; padding: 3px 3px; margin-left: 1.5em; margin-right: 1.5em; margin-bottom: 1em; padding: 0.3em 0.3em 0.3em 0.3em; background: #fffff5; + border-radius: 0.4em; + box-shadow: 0.4em 0.4em 0.5em #e0e0e0; } div.note, div.warning @@ -131,7 +145,6 @@ { color: red; font-size: 100%; -// margin: 0 0 0 0; padding-right: 0.5em; display: inline; } @@ -162,20 +175,26 @@ Links colors and highlighting: ***************************************************************************/ +a { text-decoration: none; } +a:hover { text-decoration: underline; } a:link { color: #0048b3; } a:visited { color: #002a6a; } -a:hover { background: #ffffcd; } /*************************************************************************** Table of contents: ***************************************************************************/ -.toc +div.toc { font-size: 90%; } +div.toc dl +{ + margin-top: 0em; + margin-bottom: 0em; +} /*************************************************************************** @@ -208,76 +227,29 @@ font-style: italic; } -.default -{ - font-style: italic; -} - -.availability -{ - font-style: italic; -} - .varname { color: #400000; } - -div.informaltable table +span.command strong { - border: 1px solid #6185a0; - width: 100%; -} - -div.informaltable td -{ - border: 0; - padding: 5px; -} - -div.informaltable td.default -{ - text-align: right; + font-weight: normal; + color: #400000; } -div.informaltable th +div.calloutlist table { - text-align: left; - color: #005aa0; - border: 0; - padding: 5px; - background: #fffff5; - font-weight: normal; - font-style: italic; + box-shadow: none; } -td.varname, td.tagname, td.paramname +table { - font-weight: bold; - vertical-align: top; + border-collapse: collapse; + box-shadow: 0.4em 0.4em 0.5em #e0e0e0; } -div.epigraph +div.affiliation { font-style: italic; - text-align: right; -} - -table.productionset table.productionset -{ - font-family: monospace; -} - -strong.command -{ -// font-family: monospace; -// font-style: italic; -// font-weight: normal; - color: #400000; -} - -div.calloutlist td -{ - padding-bottom: 1em; -} +} \ No newline at end of file _______________________________________________ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits
