summary refs log tree commit diff
path: root/doc
diff options
context:
space:
mode:
authorGraham Christensen <graham@grahamc.com>2018-04-05 07:54:01 -0400
committerGraham Christensen <graham@grahamc.com>2018-04-05 07:54:01 -0400
commit8f33464ca7a603301cf9a5a213be23ca701d6cce (patch)
treeb524e95295d498a5241d04b977ec12b03769bf96 /doc
parentced3a201e39397f5c7a311d40525088494ea7808 (diff)
downloadnixpkgs-8f33464ca7a603301cf9a5a213be23ca701d6cce.tar
nixpkgs-8f33464ca7a603301cf9a5a213be23ca701d6cce.tar.gz
nixpkgs-8f33464ca7a603301cf9a5a213be23ca701d6cce.tar.bz2
nixpkgs-8f33464ca7a603301cf9a5a213be23ca701d6cce.tar.lz
nixpkgs-8f33464ca7a603301cf9a5a213be23ca701d6cce.tar.xz
nixpkgs-8f33464ca7a603301cf9a5a213be23ca701d6cce.tar.zst
nixpkgs-8f33464ca7a603301cf9a5a213be23ca701d6cce.zip
nixos docs: syntax highlight
 - Rectifies diverging CSS by combining
   nixos/nixpkgs docs CSS
 - Moves our custom Highlight.js loader in to
   the hljs package
 - Switches the nixos docs to use SVG
   callouts too
Diffstat (limited to 'doc')
-rw-r--r--doc/Makefile8
-rw-r--r--doc/style.css17
2 files changed, 18 insertions, 7 deletions
diff --git a/doc/Makefile b/doc/Makefile
index c16e70e9c6a..0ddae8631f3 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -25,13 +25,6 @@ out/html/index.html: manual-full.xml style.css highlightjs
 		./manual-full.xml
 
 	mkdir -p out/html/highlightjs/
-	echo "document.onreadystatechange = function () { \
-	  var listings = document.querySelectorAll('.programlisting, .screen'); \
-	  for (i = 0; i < listings.length; ++i) { \
-	     hljs.highlightBlock(listings[i]); \
-	  } \
-	} " > out/html/highlightjs/loader.js
-
 	cp -r highlightjs out/html/
 
 	cp ./overrides.css out/html/
@@ -63,6 +56,7 @@ highlightjs:
 	cp -r "$$HIGHLIGHTJS/highlight.pack.js" highlightjs/
 	cp -r "$$HIGHLIGHTJS/LICENSE" highlightjs/
 	cp -r "$$HIGHLIGHTJS/mono-blue.css" highlightjs/
+	cp -r "$$HIGHLIGHTJS/loader.js" highlightjs/
 
 
 manual-full.xml: ${MD_TARGETS} .version *.xml
diff --git a/doc/style.css b/doc/style.css
index 83dae0dd2cd..0db907815b6 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -248,6 +248,23 @@ table
     box-shadow: 0.4em 0.4em 0.5em #e0e0e0;
 }
 
+table.simplelist
+{
+    text-align: left;
+    color: #005aa0;
+    border: 0;
+    padding: 5px;
+    background: #fffff5;
+    font-weight: normal;
+    font-style: italic;
+    box-shadow: none;
+    margin-bottom: 1em;
+}
+
+div.navheader table, div.navfooter table {
+    box-shadow: none;
+}
+
 div.affiliation
 {
     font-style: italic;