[presentation] Reworked how font sizes and margins are handled and slides use font-size 30 by default

3 files changed, 18 insertions, 16 deletions

diff --git a/awk-edits/Presentation.awk b/awk-edits/Presentation.awk
index 171ec7e..40468fb 100644
--- a/awk-edits/Presentation.awk
+++ b/awk-edits/Presentation.awk
@@ -114,11 +114,11 @@ BEGIN {
 	ended[15] = 0
 	names[16] = "font20"
 	ended[16] = 0
-	names[17] = "font25"
+	names[17] = "font22"
 	ended[17] = 0
-	names[18] = "font27"
+	names[18] = "font25"
 	ended[18] = 0
-	names[19] = "font30"
+	names[19] = "font27"
 	ended[19] = 0
 	names[20] = "font35"
 	ended[20] = 0
diff --git a/src/presentation.css b/src/presentation.css
index a3d5819..52f5291 100644
--- a/src/presentation.css
+++ b/src/presentation.css
@@ -1,6 +1,6 @@
 /* Stylesheet override */
 
-article { max-width: calc(297mm + 2em); font-size: 22px; }
+article { max-width: calc(297mm + 2em); }
 h2, h3, h4, h5, h6 {
     display: block;
     margin-block-start: 0;
@@ -22,6 +22,7 @@ h2, h3, h4, h5, h6 {
     height: 210mm;
     padding: 1em;
     width: 297mm; /* Size of landscape A4 paper */
+    font-size: 30px;
   }
   .slide img:not(.clicked-image) {
       height: auto;
@@ -29,7 +30,10 @@ h2, h3, h4, h5, h6 {
       max-width: 100%;
       /* width: auto; */
     }
-  .slide > p:first-child, .slide > ul:first-child { margin-top: 0; }
+  .slide > *:first-child, .slide > div:only-child > *:first-child,
+  .slide > ul:first-child > li:first-child > *:first-child {
+      margin-top: 0;
+    }
   .slide .svg { max-height: 1em !important; }
 
   .clide { display: flex; flex-direction: column; }
@@ -41,16 +45,6 @@ h2, h3, h4, h5, h6 {
       }
   .fright { float: right; text-align: right; }
 
-  .font35, .font30, .font27, .font25, .font20, .font18 {
-      line-height: 1.2em;
-    }
-    .font35 { font-size: 35px; }
-    .font30 { font-size: 30px; }
-    .font27 { font-size: 27px; }
-    .font25 { font-size: 25px; }
-    .font20 { font-size: 20px; }
-    .font18 { font-size: 18px; }
-
   .layout-table {
       margin: 0;
       padding: 0;
@@ -68,6 +62,13 @@ h2, h3, h4, h5, h6 {
       }
     .fixed-layout { table-layout: fixed; }
 
+  .font18 { font-size: 18px; }
+  .font20 { font-size: 20px; }
+  .font22 { font-size: 22px; }
+  .font25 { font-size: 25px; }
+  .font27 { font-size: 27px; }
+  .font35 { font-size: 35px; }
+
   .lineb1 { padding: 0.5em; }
   .lineb2 { padding: 1.0em; }
   .lineb3 { padding: 1.5em; }
diff --git a/src/styles.css b/src/styles.css
index db2771d..a24f5ac 100644
--- a/src/styles.css
+++ b/src/styles.css
@@ -95,7 +95,8 @@ body {
     min-height: calc(100vh - 16px);
   }
   body > *     { background-color: var(--bg-color); }
-  body, td, th { font: 18px sans-serif; line-height: 1.3em; }
+  body, td, th { font: 18px sans-serif; }
+  *            { line-height: 1.3em; }
 
 img {
     box-sizing: border-box;