From da17974541af182f86bd98e992f1c25987adac55 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Mon, 26 Mar 2018 14:45:00 -0400
Subject: [PATCH] Move the overridden CSS to overrides.css which can be applied
 on nixos.org

---
 doc/Makefile      | 2 ++
 doc/default.nix   | 2 +-
 doc/overrides.css | 8 ++++++++
 doc/style.css     | 9 ---------
 4 files changed, 11 insertions(+), 10 deletions(-)
 create mode 100644 doc/overrides.css

diff --git a/doc/Makefile b/doc/Makefile
index 714a2a3e273..b76ea9ed59e 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -23,6 +23,7 @@ out/html/index.html: manual-full.xml style.css
 		"$$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
@@ -36,6 +37,7 @@ out/epub/manual.epub: manual-full.xml
 		"$$XSL/docbook/epub/docbook.xsl" \
 		./manual-full.xml
 
+	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/
diff --git a/doc/default.nix b/doc/default.nix
index a8f0e935bae..6f9804417ad 100644
--- a/doc/default.nix
+++ b/doc/default.nix
@@ -16,7 +16,7 @@ pkgs.stdenv.mkDerivation {
   xsltFlags = lib.concatStringsSep " " [
     "--param section.autolabel 1"
     "--param section.label.includes.component.label 1"
-    "--stringparam html.stylesheet 'style.css'"
+    "--stringparam html.stylesheet 'style.css overrides.css'"
     "--param xref.with.number.and.title 1"
     "--param toc.section.depth 3"
     "--stringparam admon.style ''"
diff --git a/doc/overrides.css b/doc/overrides.css
new file mode 100644
index 00000000000..dd11eab82a8
--- /dev/null
+++ b/doc/overrides.css
@@ -0,0 +1,8 @@
+
+.programlisting img {
+    width: 1em;
+}
+
+.calloutlist img {
+    width: 1.5em;
+}
diff --git a/doc/style.css b/doc/style.css
index fe38986c118..23cbdff3891 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -118,15 +118,6 @@ div.example pre.programlisting
     margin: 0 0 0 0;
 }
 
-.programlisting img {
-    width: 1em;
-}
-
-
-.calloutlist img {
-    width: 1.5em;
-}
-
 /***************************************************************************
                                Notes, warnings etc:
  ***************************************************************************/