Theme fixes for CSS-width issues

diff --git a/pdns/docs/Makefile b/pdns/docs/Makefile
index 2b27d86ffebf5de214c998a2afdf82f1f9354bd5..fcfb8657c16064ba303bd37fbef360b796dbde6b 100644 (file)
--- a/pdns/docs/Makefile
+++ b/pdns/docs/Makefile
@@ -2,51 +2,39 @@
 
 all: pdns.txt pdns.pdf html/index.html html.tar.bz2 pdns-expanded.html manpages
 
-pdns-expanded.xml: pdns.xml
-       ./expand < $< > $@
-
 clean:
        rm -rf *.dvi *.pdf *.tex *.toc *.aux *.ps *.bak *.tmp *~ *.log pdns.txt html.tar.bz2 html pdns pdns-expanded.html pdns-expanded.xml pdns_recursor.1 rec_control.1
 
 manpages: dnsdist.1 pdns_recursor.1 rec_control.1 dnstcpbench.1
 
-html-new/index.html: markdown/** mkdocs.yml
+html-new: html-new/index.html
+
+html-new/process: markdown/** markdown/*/** mkdocs.yml
        rm -rf html-new
        mkdir html-new
        rm -rf doc-build
        mkdir doc-build
        rsync -a --delete markdown/. doc-build/.
        ./process-md.sh
-       mkdocs build
 
-html/index.html: pdns-expanded.xml
-       rm -rf html
-       xmlto xhtml -m config.xsl -o html $<
-       cp docbook.css html
+html-new/index.html: html-new/process
+       mkdocs build
 
 pdns-expanded.html: pdns-expanded.xml
        xmlto xhtml-nochunks -m config.xsl $<
-       
+
 html.tar.bz2: html/index.html
        tar cjf html.tar.bz2 html/
 
-%.txt: %-expanded.xml
-       xmlto txt -m config.xsl  $<
-       mv pdns-expanded.txt pdns.txt
-
-%.pdf: %-expanded.xml
-       xmlto --with-dblatex pdf $<
-       mv pdns-expanded.pdf pdns.pdf
-
 %1.xml: %1.txt
        asciidoc -b docbook -d manpage  $<
-        
+
 %.1: %.1.xml
        xmlto man $<
-                
+
 %.html: %1.txt
        asciidoc -b xhtml11 -d manpage  $<
-                        
+
 publish:
        rsync --exclude "*.png" --copy-links --delete -avrz ./html pdns.txt pdns.pdf html.tar.bz2 \
                xs.powerdns.com:/var/www/doc.powerdns.com/

diff --git a/pdns/docs/markdown/theme/base.html b/pdns/docs/markdown/theme/base.html
index b73b1ac046151b4aeb1924b317cb4f7f2ce0f9a0..be7736460217637da2468629fcbe812e14c0d8d0 100644 (file)
--- a/pdns/docs/markdown/theme/base.html
+++ b/pdns/docs/markdown/theme/base.html
@@ -23,7 +23,7 @@
             <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
         <![endif]-->
 
-        {% if config.theme_center_lead %}
+        {% if theme_center_lead %}
         <style>
             div.col-md-9 h1:first-of-type {
                 text-align: center;

diff --git a/pdns/docs/markdown/theme/css/base.css b/pdns/docs/markdown/theme/css/base.css
index 1792720e3592e8cd4484ccbec249c4191fa23207..7c2df9dd4443a3f65f963cdc79e6b0a06ce4bb21 100644 (file)
--- a/pdns/docs/markdown/theme/css/base.css
+++ b/pdns/docs/markdown/theme/css/base.css
@@ -92,6 +92,10 @@ div.source-links {
     font-size: 90%;
 }
 
+.navbar-nav > li > a {
+  padding: 15px 7px;
+}
+
 /* Show and affix the side nav when space allows it */
 @media (min-width: 1200px) {
     .bs-sidebar .nav > .active > ul {

diff --git a/pdns/docs/markdown/theme/nav.html b/pdns/docs/markdown/theme/nav.html
index 1cb451f896230d0bd1f4f448344b5c8a53425214..378d6585d015324509c40de6a1fcf93ccd3a32b2 100644 (file)
--- a/pdns/docs/markdown/theme/nav.html
+++ b/pdns/docs/markdown/theme/nav.html
@@ -46,7 +46,7 @@
                     <a href="#searchModal" data-toggle="modal"><i class="fa fa-search"></i> Search</a>
                 </li>
                 {% endif %}
-                <li {% if not previous_page %}class="disabled"{% endif %}>
+<!--                <li {% if not previous_page %}class="disabled"{% endif %}>
                     <a rel="next" {% if previous_page %}href="{{ previous_page.url }}"{% endif %}>
                         <i class="fa fa-arrow-left"></i> Previous
                     </a>
@@ -55,7 +55,7 @@
                     <a rel="prev" {% if next_page %}href="{{ next_page.url }}"{% endif %}>
                         Next <i class="fa fa-arrow-right"></i>
                     </a>
-                </li>
+                </li> -->
                 {% if repo_url %}
                 <li>
                     <a href="{{ repo_url }}">

diff --git a/pdns/docs/mkdocs.yml b/pdns/docs/mkdocs.yml
index fa516c1b15138f6c9c8c8c5285a74831f216fc4d..64e06e08bf35881785c994e7496544414998d4c9 100644 (file)
--- a/pdns/docs/mkdocs.yml
+++ b/pdns/docs/mkdocs.yml
@@ -1,5 +1,5 @@
 site_name: PowerDNS
-repo_url: https://github.com/PowerDNS/pdns
+#repo_url: https://github.com/PowerDNS/pdns
 docs_dir: doc-build
 site_dir: html-new
 theme_dir: markdown/theme