CSS reorg cleanup.

1 files changed, 19 insertions, 18 deletions

diff --git a/publish-mlnp.org b/publish-mlnp.org
index 7b81406..32d82e3 100644
--- a/publish-mlnp.org
+++ b/publish-mlnp.org
@@ -6,7 +6,7 @@
 #+DATE: <2022-01-26 Wed>
 #+OPTIONS: toc:nil
 
-#+HTML_HEAD: <link rel="stylesheet" type="text/css" href="resources/mlnp.css"/>
+#+HTML_HEAD: <link rel="stylesheet" type="text/css" href="resources/global.css"/>
 #+HTML_HEAD: <link rel="icon" type="image/png" href="resources/favicon.png"/>
 #+INCLUDE: resources/topnav.html export html
 
@@ -21,7 +21,7 @@ logic, making it possible to efficiently revisit and upgrade this
 website at a later date.
 #+end_abstract
 
-#+TOC: headlines 3
+#+TOC: headlines 2
 
 
 * Introduction
@@ -74,7 +74,7 @@ uncorrelated content.
 │   ├── favicon.png
 │   ├── favicon.xcf
 │   ├── fonts/
-│   ├── mlnp.css
+│   ├── global.css
 │   └── topnav.html
 ├── sitemap.org
 └── wiki/
@@ -293,7 +293,7 @@ on locally published pages.
    :publishing-function org-publish-attachment)
   ("mlnp-resources"
    :base-directory "resources/"
-   :base-extension "css\\|js\\|png"
+   :base-extension "css\\|js\\|png\\|jpg"
    :publishing-directory ,(concat org-publish-location-local "mlnp.fr/resources/")
    :publishing-function org-publish-attachment)
   ("resources-pages"
@@ -368,7 +368,7 @@ dashes when exported to the sitemap titles.
    :base-extension "org"
    :publishing-directory ,(concat org-publish-location-local "wiki.mlnp.fr/")
    :recursive t ; Encompass all wiki pages.
-   :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/mlnp.css'/>
+   :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/global.css'/>
          <link rel='icon' type='image/png' href='https://wiki.mlnp.fr/resources/favicon.png'/>"
    :auto-sitemap t
    :sitemap-title "Full sitemap for [[https://wiki.mlnp.fr][wiki.mlnp.fr]]"
@@ -385,7 +385,7 @@ dashes when exported to the sitemap titles.
    :base-extension "org"
    :publishing-directory ,(concat org-publish-location-local "wiki.mlnp.fr/")
    :recursive nil ; Only top-level wiki pages.
-   :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/mlnp.css'/>
+   :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/global.css'/>
         <link rel='icon' type='image/png' href='https://wiki.mlnp.fr/resources/favicon.png'/>"
    :auto-sitemap nil
    :publishing-function org-html-publish-to-html)
@@ -401,7 +401,7 @@ dashes when exported to the sitemap titles.
    :base-extension "org"
    :publishing-directory ,(concat org-publish-location-local "wiki.mlnp.fr/engineering")
    :recursive t
-   :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/mlnp.css'/>
+   :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/global.css'/>
         <link rel='icon' type='image/png' href='https://wiki.mlnp.fr/resources/favicon.png'/>"
    :auto-sitemap t
    :sitemap-filename "index.org"
@@ -420,7 +420,7 @@ dashes when exported to the sitemap titles.
    :base-extension "org"
    :publishing-directory ,(concat org-publish-location-local "wiki.mlnp.fr/emacs")
    :recursive t
-   :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/mlnp.css'/>
+   :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/global.css'/>
         <link rel='icon' type='image/png' href='https://wiki.mlnp.fr/resources/favicon.png'/>"
    :auto-sitemap t
    :sitemap-filename "index.org"
@@ -439,7 +439,7 @@ dashes when exported to the sitemap titles.
    :base-extension "org"
    :publishing-directory ,(concat org-publish-location-local "wiki.mlnp.fr/languages")
    :recursive t
-   :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/mlnp.css'/>
+   :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/global.css'/>
         <link rel='icon' type='image/png' href='https://wiki.mlnp.fr/resources/favicon.png'/>"
    :auto-sitemap t
    :sitemap-filename "index.org"
@@ -458,7 +458,7 @@ dashes when exported to the sitemap titles.
    :base-extension "org"
    :publishing-directory ,(concat org-publish-location-local "wiki.mlnp.fr/linux")
    :recursive t
-   :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/mlnp.css'/>
+   :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/global.css'/>
         <link rel='icon' type='image/png' href='https://wiki.mlnp.fr/resources/favicon.png'/>"
    :auto-sitemap t
    :sitemap-filename "index.org"
@@ -477,7 +477,7 @@ dashes when exported to the sitemap titles.
    :base-extension "org"
    :publishing-directory ,(concat org-publish-location-local "wiki.mlnp.fr/programming")
    :recursive t
-   :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/mlnp.css'/>
+   :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/global.css'/>
         <link rel='icon' type='image/png' href='https://wiki.mlnp.fr/resources/favicon.png'/>"
    :auto-sitemap t
    :sitemap-filename "index.org"
@@ -496,7 +496,7 @@ dashes when exported to the sitemap titles.
    :base-extension "org"
    :publishing-directory ,(concat org-publish-location-local "wiki.mlnp.fr/fitness")
    :recursive t
-   :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/mlnp.css'/>
+   :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/global.css'/>
         <link rel='icon' type='image/png' href='https://wiki.mlnp.fr/resources/favicon.png'/>"
    :auto-sitemap t
    :sitemap-filename "index.org"
@@ -515,7 +515,7 @@ dashes when exported to the sitemap titles.
    :base-extension "org"
    :publishing-directory ,(concat org-publish-location-local "wiki.mlnp.fr/typography")
    :recursive t
-   :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/mlnp.css'/>
+   :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/global.css'/>
         <link rel='icon' type='image/png' href='https://wiki.mlnp.fr/resources/favicon.png'/>"
    :auto-sitemap t
    :sitemap-filename "index.org"
@@ -538,7 +538,7 @@ dashes when exported to the sitemap titles.
     :base-extension "org"
     :publishing-directory ,(concat org-publish-location-local "blog.mlnp.fr/")
     :recursive t
-    :html-head "<link rel='stylesheet' type='text/css' href='https://blog.mlnp.fr/resources/mlnp.css'/>
+    :html-head "<link rel='stylesheet' type='text/css' href='https://blog.mlnp.fr/resources/global.css'/>
    <link rel='icon' type='image/png' href='https://blog.mlnp.fr/resources/favicon.png'/>"
     :auto-sitemap t
     :sitemap-filename "index.org"
@@ -571,7 +571,7 @@ dashes when exported to the sitemap titles.
     :base-extension "org"
     :publishing-directory ,(concat org-publish-location-local "apps.mlnp.fr/")
     :recursive t
-    :html-head "<link rel='stylesheet' type='text/css' href='https://apps.mlnp.fr/resources/mlnp.css'/>
+    :html-head "<link rel='stylesheet' type='text/css' href='https://apps.mlnp.fr/resources/global.css'/>
    <link rel='icon' type='image/png' href='https://apps.mlnp.fr/resources/favicon.png'/>"
     :auto-sitemap t
     :sitemap-filename "sitemap.org"
@@ -609,7 +609,8 @@ to build the entire website.
   ;; (org-publish-remove-all-timestamps)
 
   ;; Prepare resources:
-  (org-babel-tangle-file "resources/css.org")
+  (org-babel-tangle-file "resources/css-global.org")
+  (org-babel-tangle-file "resources/css-cv.org")
   (save-window-excursion
     (find-file "cv.org")
     (org-ascii-export-to-ascii))
@@ -619,7 +620,7 @@ to build the entire website.
   (let* ((local org-publish-location-local)
          (local-websites (concat local "*mlnp.fr"))
          (remote org-publish-location-remote)
-         (sync-command (format "rsync -azvP %s %s" local-websites remote)))
+         (sync-command (format "rsync -azvP %s %s --chown=mpeter:www-data" local-websites remote)))
     (if (not (yes-or-no-p "Push local changes to remote target? "))
         (message "Didn't publish remotely to %s." remote)
       (message
@@ -628,7 +629,7 @@ to build the entire website.
 #+END_SRC
 
 #+RESULTS: main
-: #<window 257 on *Async Shell Command*>
+: #<window 69 on *Async Shell Command*>
 
 The following links to the locally built homepages are useful after
 building the website locally, to check that everything proceeded smoothly.