CSS reorg cleanup.

Commit
50b21661612b403b58b24eba7cbb904936416f81
Author
Marius Peter <marius.peter@tutanota.com>
Author date
Committer
Marius Peter <marius.peter@tutanota.com>
Committer date
Changed files
README.org
index 8f649622..86ba8ca7 100644..100644
@@ -6,7 +6,7 @@
6 6 #+DATE: <2022-01-23 Sun>
7 7 #+OPTIONS: num:nil toc:nil title:nil
8 8
9 Removed: #+HTML_HEAD: <link rel="stylesheet" type="text/css" href="resources/mlnp.css"/>
9 Added: #+HTML_HEAD: <link rel="stylesheet" type="text/css" href="resources/global.css"/>
10 10 #+HTML_HEAD: <link rel="icon" type="image/png" href="resources/favicon.png"/>
11 11 #+INCLUDE: resources/topnav.html export html
12 12 # +TOC: headlines 1
@@ -61,7 +61,7 @@
61 61 │   ├── favicon.png
62 62 │   ├── favicon.xcf
63 63 │   ├── fonts
64 Removed: │   ├── mlnp.css
64 Added: │   ├── global.css
65 65 │   └── topnav.html
66 66 ├── sitemap.org
67 67 └── wiki
@@ -96,7 +96,7 @@
96 96
97 97 This file contains the entire website's styling information. During
98 98 publication, this file's sections are tangled to a single stylesheet
99 Removed: =resources/mlnp.css=. This reduces website load times, as only a
99 Added: =resources/global.css=. This reduces website load times, as only a
100 100 single HTTP request is required to obtain styling rules for the entire
101 101 website. Albeit negligible, this optimization is [[https://stackoverflow.com/questions/2336302/single-huge-css-file-vs-multiple-smaller-specific-css-files][recommended]] across
102 102 the web.
about.org
index e73b3c73..e2d1fadc 100644..100644
@@ -4,7 +4,7 @@
4 4 #+DATE: <2022-01-28 Fri>
5 5 #+OPTIONS: num:nil toc:nil
6 6
7 Removed: #+HTML_HEAD: <link rel="stylesheet" type="text/css" href="resources/mlnp.css"/>
7 Added: #+HTML_HEAD: <link rel="stylesheet" type="text/css" href="resources/global.css"/>
8 8 #+HTML_HEAD: <link rel="icon" type="image/png" href="resources/favicon.png"/>
9 9 #+INCLUDE: resources/topnav.html export html
10 10
apps/index.org
index 9eb98791..9d156836 100644..100644
@@ -1,4 +1,5 @@
1 Removed: #+TITLE: Welcome to my web apps!
1 Added: #+TITLE: Apps
2 Added: #+SUBTITLE: Welcome to my web apps!
2 3 #+AUTHOR: Marius Peter
3 4 #+DATE: <2022-07-03 Sun>
4 5 #+EMAIL: mlnp@tuta.io
@@ -9,6 +10,6 @@
9 10 This part is under heavy development. Check again soon for new web
10 11 apps!
11 12
12 Removed: - =mdl= downloader \rarr [[https://apps.mlnp.fr/mdl/index.html]]
13 Removed: - =fapg= ERP
14 Removed: - Online Org editor?
13 Added: - =mdl= downloader :: [[https://apps.mlnp.fr/mdl]]
14 Added: - =fapg= ERP :: [[https://apps.mlnp.fr/fapg]]
15 Added: - Online Org editor? :: TODO
index.org
index 655fb698..27162a68 100644..100644
@@ -11,23 +11,20 @@
11 11 #+DESCRIPTION: and other subjects. Created with Emacs Org mode.
12 12 #+KEYWORDS: mlnp, personal, website, blog, wiki, linux, emacs, engineering, aerospace, typography
13 13
14 Removed: #+HTML_HEAD: <link rel="stylesheet" type="text/css" href="resources/mlnp.css"/>
14 Added: #+HTML_HEAD: <link rel="stylesheet" type="text/css" href="resources/global.css"/>
15 15 #+HTML_HEAD: <link rel="icon" type="image/png" href="resources/favicon.png"/>
16 16 #+INCLUDE: resources/topnav.html export html
17 17
18 18
19 19 # Not using #+ATTR_LATEX because text-align would be overridden.
20 20 #+HTML: <style>
21 Removed: #+HTML: .abstract p { font-size: 40px; line-height: 1.5; font-family: Jost; text-align: start }
21 Added: #+HTML: .abstract p { font-size: 40px; line-height: 1.5; font-family: Jost; text-align: start; font-style: normal; }
22 22 #+HTML: </style>
23 23
24 24
25 25 #+begin_abstract
26 26 I am passionate about aerospace, open source software, and typography.
27 27 #+end_abstract
28 Removed:
29 Removed: #+ATTR_HTML: :alt Grumman F-14D 'Tomcat'
30 Removed: [[https://live.staticflickr.com/5801/21787648405_2f4c74d268_b.jpg]]
31 28
32 29
33 30 * Main content
publish-mlnp.org
index 7b814069..32d82e3f 100644..100644
@@ -6,7 +6,7 @@
6 6 #+DATE: <2022-01-26 Wed>
7 7 #+OPTIONS: toc:nil
8 8
9 Removed: #+HTML_HEAD: <link rel="stylesheet" type="text/css" href="resources/mlnp.css"/>
9 Added: #+HTML_HEAD: <link rel="stylesheet" type="text/css" href="resources/global.css"/>
10 10 #+HTML_HEAD: <link rel="icon" type="image/png" href="resources/favicon.png"/>
11 11 #+INCLUDE: resources/topnav.html export html
12 12
@@ -21,7 +21,7 @@
21 21 website at a later date.
22 22 #+end_abstract
23 23
24 Removed: #+TOC: headlines 3
24 Added: #+TOC: headlines 2
25 25
26 26
27 27 * Introduction
@@ -74,7 +74,7 @@
74 74 │   ├── favicon.png
75 75 │   ├── favicon.xcf
76 76 │   ├── fonts/
77 Removed: │   ├── mlnp.css
77 Added: │   ├── global.css
78 78 │   └── topnav.html
79 79 ├── sitemap.org
80 80 └── wiki/
@@ -293,7 +293,7 @@
293 293 :publishing-function org-publish-attachment)
294 294 ("mlnp-resources"
295 295 :base-directory "resources/"
296 Removed: :base-extension "css\\|js\\|png"
296 Added: :base-extension "css\\|js\\|png\\|jpg"
297 297 :publishing-directory ,(concat org-publish-location-local "mlnp.fr/resources/")
298 298 :publishing-function org-publish-attachment)
299 299 ("resources-pages"
@@ -368,7 +368,7 @@
368 368 :base-extension "org"
369 369 :publishing-directory ,(concat org-publish-location-local "wiki.mlnp.fr/")
370 370 :recursive t ; Encompass all wiki pages.
371 Removed: :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/mlnp.css'/>
371 Added: :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/global.css'/>
372 372 <link rel='icon' type='image/png' href='https://wiki.mlnp.fr/resources/favicon.png'/>"
373 373 :auto-sitemap t
374 374 :sitemap-title "Full sitemap for [[https://wiki.mlnp.fr][wiki.mlnp.fr]]"
@@ -385,7 +385,7 @@
385 385 :base-extension "org"
386 386 :publishing-directory ,(concat org-publish-location-local "wiki.mlnp.fr/")
387 387 :recursive nil ; Only top-level wiki pages.
388 Removed: :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/mlnp.css'/>
388 Added: :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/global.css'/>
389 389 <link rel='icon' type='image/png' href='https://wiki.mlnp.fr/resources/favicon.png'/>"
390 390 :auto-sitemap nil
391 391 :publishing-function org-html-publish-to-html)
@@ -401,7 +401,7 @@
401 401 :base-extension "org"
402 402 :publishing-directory ,(concat org-publish-location-local "wiki.mlnp.fr/engineering")
403 403 :recursive t
404 Removed: :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/mlnp.css'/>
404 Added: :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/global.css'/>
405 405 <link rel='icon' type='image/png' href='https://wiki.mlnp.fr/resources/favicon.png'/>"
406 406 :auto-sitemap t
407 407 :sitemap-filename "index.org"
@@ -420,7 +420,7 @@
420 420 :base-extension "org"
421 421 :publishing-directory ,(concat org-publish-location-local "wiki.mlnp.fr/emacs")
422 422 :recursive t
423 Removed: :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/mlnp.css'/>
423 Added: :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/global.css'/>
424 424 <link rel='icon' type='image/png' href='https://wiki.mlnp.fr/resources/favicon.png'/>"
425 425 :auto-sitemap t
426 426 :sitemap-filename "index.org"
@@ -439,7 +439,7 @@
439 439 :base-extension "org"
440 440 :publishing-directory ,(concat org-publish-location-local "wiki.mlnp.fr/languages")
441 441 :recursive t
442 Removed: :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/mlnp.css'/>
442 Added: :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/global.css'/>
443 443 <link rel='icon' type='image/png' href='https://wiki.mlnp.fr/resources/favicon.png'/>"
444 444 :auto-sitemap t
445 445 :sitemap-filename "index.org"
@@ -458,7 +458,7 @@
458 458 :base-extension "org"
459 459 :publishing-directory ,(concat org-publish-location-local "wiki.mlnp.fr/linux")
460 460 :recursive t
461 Removed: :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/mlnp.css'/>
461 Added: :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/global.css'/>
462 462 <link rel='icon' type='image/png' href='https://wiki.mlnp.fr/resources/favicon.png'/>"
463 463 :auto-sitemap t
464 464 :sitemap-filename "index.org"
@@ -477,7 +477,7 @@
477 477 :base-extension "org"
478 478 :publishing-directory ,(concat org-publish-location-local "wiki.mlnp.fr/programming")
479 479 :recursive t
480 Removed: :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/mlnp.css'/>
480 Added: :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/global.css'/>
481 481 <link rel='icon' type='image/png' href='https://wiki.mlnp.fr/resources/favicon.png'/>"
482 482 :auto-sitemap t
483 483 :sitemap-filename "index.org"
@@ -496,7 +496,7 @@
496 496 :base-extension "org"
497 497 :publishing-directory ,(concat org-publish-location-local "wiki.mlnp.fr/fitness")
498 498 :recursive t
499 Removed: :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/mlnp.css'/>
499 Added: :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/global.css'/>
500 500 <link rel='icon' type='image/png' href='https://wiki.mlnp.fr/resources/favicon.png'/>"
501 501 :auto-sitemap t
502 502 :sitemap-filename "index.org"
@@ -515,7 +515,7 @@
515 515 :base-extension "org"
516 516 :publishing-directory ,(concat org-publish-location-local "wiki.mlnp.fr/typography")
517 517 :recursive t
518 Removed: :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/mlnp.css'/>
518 Added: :html-head "<link rel='stylesheet' type='text/css' href='https://wiki.mlnp.fr/resources/global.css'/>
519 519 <link rel='icon' type='image/png' href='https://wiki.mlnp.fr/resources/favicon.png'/>"
520 520 :auto-sitemap t
521 521 :sitemap-filename "index.org"
@@ -538,7 +538,7 @@
538 538 :base-extension "org"
539 539 :publishing-directory ,(concat org-publish-location-local "blog.mlnp.fr/")
540 540 :recursive t
541 Removed: :html-head "<link rel='stylesheet' type='text/css' href='https://blog.mlnp.fr/resources/mlnp.css'/>
541 Added: :html-head "<link rel='stylesheet' type='text/css' href='https://blog.mlnp.fr/resources/global.css'/>
542 542 <link rel='icon' type='image/png' href='https://blog.mlnp.fr/resources/favicon.png'/>"
543 543 :auto-sitemap t
544 544 :sitemap-filename "index.org"
@@ -571,7 +571,7 @@
571 571 :base-extension "org"
572 572 :publishing-directory ,(concat org-publish-location-local "apps.mlnp.fr/")
573 573 :recursive t
574 Removed: :html-head "<link rel='stylesheet' type='text/css' href='https://apps.mlnp.fr/resources/mlnp.css'/>
574 Added: :html-head "<link rel='stylesheet' type='text/css' href='https://apps.mlnp.fr/resources/global.css'/>
575 575 <link rel='icon' type='image/png' href='https://apps.mlnp.fr/resources/favicon.png'/>"
576 576 :auto-sitemap t
577 577 :sitemap-filename "sitemap.org"
@@ -609,7 +609,8 @@
609 609 ;; (org-publish-remove-all-timestamps)
610 610
611 611 ;; Prepare resources:
612 Removed: (org-babel-tangle-file "resources/css.org")
612 Added: (org-babel-tangle-file "resources/css-global.org")
613 Added: (org-babel-tangle-file "resources/css-cv.org")
613 614 (save-window-excursion
614 615 (find-file "cv.org")
615 616 (org-ascii-export-to-ascii))
@@ -619,7 +620,7 @@
619 620 (let* ((local org-publish-location-local)
620 621 (local-websites (concat local "*mlnp.fr"))
621 622 (remote org-publish-location-remote)
622 Removed: (sync-command (format "rsync -azvP %s %s" local-websites remote)))
623 Added: (sync-command (format "rsync -azvP %s %s --chown=mpeter:www-data" local-websites remote)))
623 624 (if (not (yes-or-no-p "Push local changes to remote target? "))
624 625 (message "Didn't publish remotely to %s." remote)
625 626 (message
@@ -628,7 +629,7 @@
628 629 #+END_SRC
629 630
630 631 #+RESULTS: main
631 Removed: : #<window 257 on *Async Shell Command*>
632 Added: : #<window 69 on *Async Shell Command*>
632 633
633 634 The following links to the locally built homepages are useful after
634 635 building the website locally, to check that everything proceeded smoothly.
wiki/engineering/index.org
index fc4237db..92198bf9 100644..100644
@@ -7,9 +7,10 @@
7 7 - [[file:v-model.org][V-model]]
8 8 - aerospace
9 9 - [[file:aerospace/designing-aircraft.org][Designing aircraft]]
10 Removed: - protocols
11 Removed: - [[file:aerospace/protocols/ARINC-429.org][ARINC 429]]
12 Removed: - [[file:aerospace/protocols/CAN-bus.org][CAN bus]]
13 Removed: - standards
14 Removed: - [[file:aerospace/standards/ARP4754.org][ARP4754]]
15 Removed: - [[file:aerospace/standards/DO-160.org][DO-160]]
10 Added: - protocols
11 Added: - [[file:protocols/ARINC-429.org][ARINC 429]]
12 Added: - [[file:protocols/CAN-bus.org][CAN bus]]
13 Added: - [[file:protocols/SIP.org][Foundations of SIP]]
14 Added: - standards
15 Added: - [[file:standards/ARP4754.org][ARP4754]]
16 Added: - [[file:standards/DO-160.org][DO-160]]
wiki/index.org
index 53b0bc96..3c1d9d86 100644..100644
@@ -29,9 +29,6 @@
29 29
30 30
31 31 ** Engineering
32 Removed: :PROPERTIES:
33 Removed: :CUSTOM_ID: table-of-contents
34 Removed: :END:
35 32
36 33 Engineering has been my career's focus so far.
37 34