vault backup: 2022-11-01 12:31:15

Affected files:
45-Rom/QA.md
_config.yml
assets/css/style.scss

45-Rom/QA.md

@@ -1,7 +1,7 @@
 # 羅馬書問答筆記
 
-## Rom.1
+## Rom 1
 
-### Rom.1.
+### Rom 1.1
 Q>
 A>

_config.yml

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 title: 聖經神學筆記 (BT-Notes)
 
 description: Biblical Theology Notes
@@ -7,3 +8,11 @@ show_downloads: true
 theme: jekyll-theme-leap-day
 
 markdown: GFM
+=======
+title: 全民希臘文 (BG4E)
+description: Biblical Greek for Everyone
+show_downloads: true
+
+theme: jekyll-theme-leap-day
+markdown: GFM
+>>>>>>> ea8084dd9e3e4b4b782f038867bda4fd109b228e

assets/css/style.scss

@@ -1,4 +1,4 @@
---
+---
 ---
 
 @import "{{ site.theme }}";
@@ -27,3 +27,32 @@ ruby {
   h2 {
     text-align: center;
   }
+<<<<<<< HEAD
+=======
+  ruby strong {
+    color: red;
+  }
+  ruby em {
+    color: blue;
+  }
+
+  p, html, body {
+    font-family: 'EB Garamond','Noto Sans', 'Noto Sans TC',  sans-serif;
+  }
+
+  section {
+    width: 85%;
+  }
+
+  section.footnotes {
+    /*width: 85%;*/
+    margin-top: 30px;
+  }
+  
+
+  /* text decoration for marking syntax functions */
+.S {text-decoration: underline double; text-underline-offset: 4px; }
+.P {text-decoration: underline wavy; text-underline-offset: 4px; }
+.C {text-decoration: underline solid; text-underline-offset: 4px; }
+.A {text-decoration: underline dotted; text-underline-offset: 4px; }
+>>>>>>> ea8084dd9e3e4b4b782f038867bda4fd109b228e