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/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 83624b970cf8
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 63406fa1cf98
Choose a head ref
  • 3 commits
  • 4 files changed
  • 1 contributor

Commits on Mar 26, 2018

  1. nixpkgs docs: Use SVGs for callouts

    @grahamc
    grahamc committed Mar 26, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a80856c View commit details

  2. Move the overridden CSS to overrides.css which can be applied on nixo… 

    …s.org
    @grahamc
    grahamc committed Mar 26, 2018
    Copy the full SHA
    da17974 View commit details

  3. Merge pull request #37881 from grahamc/doc/svg-callouts 

    nixpkgs docs: Use SVGs for callouts
    @grahamc
    grahamc authored Mar 26, 2018
    Copy the full SHA
    63406fa View commit details
Showing with 24 additions and 13 deletions.
  1. +8 −4 doc/Makefile
  2. +3 −3 doc/default.nix
  3. +8 −0 doc/overrides.css
  4. +5 −6 doc/style.css
12 changes: 8 additions & 4 deletions doc/Makefile
View file
Original file line number Diff line number Diff line change
@@ -17,26 +17,30 @@ validate: manual-full.xml

out/html/index.html: manual-full.xml style.css
mkdir -p out/html
xsltproc $$xsltFlags \
xsltproc ${xsltFlags} \
--nonet --xinclude \
--output $@ \
"$$XSL/docbook/xhtml/docbook.xsl" \
./manual-full.xml

cp ./overrides.css out/html/
cp ./style.css out/html/style.css

mkdir -p out/html/images/callouts
cp "$$XSL/docbook/images/callouts/"*.gif out/html/images/callouts/
cp "$$XSL/docbook/images/callouts/"*.svg out/html/images/callouts/
chmod u+w -R out/html/images/

out/epub/manual.epub: manual-full.xml
mkdir -p out/epub/scratch
xsltproc $$xsltFlags --nonet \
xsltproc ${xsltFlags} --nonet \
--output out/epub/scratch/ \
"$$XSL/docbook/epub/docbook.xsl" \
./manual-full.xml

cp "$$XSL/docbook/images/callouts/"*.gif out/epub/scratch/OEBPS
cp ./overrides.css out/epub/scratch/OEBPS
cp ./style.css out/epub/scratch/OEBPS
mkdir -p out/epub/scratch/OEBPS/images/callouts/
cp "$$XSL/docbook/images/callouts/"*.svg out/epub/scratch/OEBPS/images/callouts/
echo "application/epub+zip" > mimetype
zip -0Xq "out/epub/manual.epub" mimetype
rm mimetype
6 changes: 3 additions & 3 deletions doc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -16,11 +16,11 @@ pkgs.stdenv.mkDerivation {
xsltFlags = lib.concatStringsSep " " [
"--param section.autolabel 1"
"--param section.label.includes.component.label 1"
"--param html.stylesheet 'style.css'"
"--stringparam html.stylesheet 'style.css overrides.css'"
"--param xref.with.number.and.title 1"
"--param toc.section.depth 3"
"--param admon.style ''"
"--param callout.graphics.extension '.gif'"
"--stringparam admon.style ''"
"--stringparam callout.graphics.extension .svg"
];

postPatch = ''
8 changes: 8 additions & 0 deletions doc/overrides.css
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@

.programlisting img {
width: 1em;
}

.calloutlist img {
width: 1.5em;
}
11 changes: 5 additions & 6 deletions doc/style.css
View file
Original file line number Diff line number Diff line change
@@ -29,8 +29,8 @@ h2 /* chapters, appendices, subtitle */
}

/* Extra space between chapters, appendices. */
div.chapter > div.titlepage h2, div.appendix > div.titlepage h2
{
div.chapter > div.titlepage h2, div.appendix > div.titlepage h2
{
margin-top: 1.5em;
}

@@ -118,7 +118,6 @@ div.example pre.programlisting
margin: 0 0 0 0;
}


/***************************************************************************
Notes, warnings etc:
***************************************************************************/
@@ -172,7 +171,7 @@ div.navfooter *


/***************************************************************************
Links colors and highlighting:
Links colors and highlighting:
***************************************************************************/

a { text-decoration: none; }
@@ -209,7 +208,7 @@ tt, code
.term
{
font-weight: bold;

}

div.variablelist dd p, div.glosslist dd p
@@ -252,4 +251,4 @@ table
div.affiliation
{
font-style: italic;
}
}