[presentation] Changed fow to frow and fol to fcol, since it could collide with &&folder

4 files changed, 19 insertions, 19 deletions

diff --git a/generate-hooks/README.md b/generate-hooks/README.md
index 5949be4..3371de2 100644
--- a/generate-hooks/README.md
+++ b/generate-hooks/README.md
@@ -10,6 +10,6 @@ On the "backend", they just get replaced with specific HTML. List of scripts tha
 |---|---|
 |`make-file-lists.awk`|`&&folder`, `&&file`, `&&/files`, `&&ft-TYPE` *(TYPE is one of `photo`, `text`, `zip`, `movie`, `markdown`)*|
 |`make-flags.awk`|`&&gb`|
-|`make-presentation.awk`|`&&presentation`, `&&slide`, `&&/slide`, `&&flexer`, `&&centered`, `&&/centered`, `&&fow`, `&&/fow`, `&&fol`, `&&/fol`, `&&fontSIZE` *(SIZE is one of `18`, `20`, `27`, `30`, `37`)*, `&&/font`|
+|`make-presentation.awk`|`&&presentation`, `&&slide`, `&&/slide`, `&&flexer`, `&&centered`, `&&/centered`, `&&fow`, `&&/fow`, `&&fcol`, `&&/fcol`, `&&fontSIZE` *(SIZE is one of `18`, `20`, `27`, `30`, `37`)*, `&&/font`|
 
 Information regarding their usage can be found at the top of their respective script file.
diff --git a/generate-hooks/create-presentation.awk b/generate-hooks/create-presentation.awk
index 7f2cd73..264aa22 100644
--- a/generate-hooks/create-presentation.awk
+++ b/generate-hooks/create-presentation.awk
@@ -20,22 +20,22 @@
 #                   presented in the order it appears in.
 # &&/slide          Ends (the last started) slide.
 #
-# &&fow             A row of paragraphs, where each item is evenly sized and is
+# &&frow            A row of paragraphs, where each item is evenly sized and is
 #                   spaced out horizontally. In the HTML, it is a simple flexbox.
 #                   This is one of the two main ways to configure how content is
 #                   laid out on a slide.
-# &&/fow            Every HTML element/paragraph between &&fow and &&/fow is an
+# &&/frow           Every HTML element/paragraph between &&frow and &&/frow is an
 #                   item that will be laid out.
 #
-# &&fol             A column of paragraphs, where each item is evenly sized and is
+# &&fcol            A column of paragraphs, where each item is evenly sized and is
 #                   spaced out vertically. In the HTML, it is a simple flexbox.
 #                   This is one of the two main ways to configure how content is
 #                   laid out on a slide.
-# &&/fol            Every HTML element/paragraph between &&fol and &&/fol is an
+# &&/fcol           Every HTML element/paragraph between &&fcol and &&/fcol is an
 #                   item that will be laid out.
 # 
 # &&flexer          An empty container, which can be used as a blank space item
-#                   inside &&fow or &&fol. In the styling, it just has `flex: 1`.
+#                   inside &&frow or &&fcol. In the styling, it just has `flex: 1`.
 #
 # &&centered        Aligns text to the center, literally.
 # &&/centered       Text between &&centered and &&/centered is aligned.
@@ -81,9 +81,9 @@ BEGIN {
 	ended[ 4] = 1
 	names[ 5] = "flexer"
 	ended[ 5] = 2
-	names[ 6] = "fow"
+	names[ 6] = "frow"
 	ended[ 6] = 1
-	names[ 7] = "fol"
+	names[ 7] = "fcol"
 	ended[ 7] = 1
 	names[ 8] = "font18"
 	ended[ 8] = 0
diff --git a/src/presentation.css b/src/presentation.css
index 81e2def..bba2a64 100644
--- a/src/presentation.css
+++ b/src/presentation.css
@@ -22,32 +22,32 @@ h2, h3, h4, h5, h6 {
 
 /* Slides styles */
 
-.fow {
+.frow {
   flex-direction: row;
 }
 
-.fow > *:not(:last-child) {
+.frow > *:not(:last-child) {
   margin-right: 0.5em;
 }
 
-.fol {
+.fcol {
   flex-direction: column;
 }
 
-.fol > *:not(:last-child) {
+.fcol > *:not(:last-child) {
   margin-bottom: 0.5em;
 }
 
-.fow, .fol {
+.frow, .fcol {
   display: flex;
   flex-wrap: nowrap;
 }
 
-.fow > *, .fol > * {
+.frow > *, .fcol > * {
   flex: 1;
 }
 
-.fow, .fol, .fow > *, .fol > *, .slide > * {
+.frow, .fcol, .frow > *, .fcol > *, .slide > * {
   min-width: 0;
   min-height: 0;
 }
diff --git a/src/talks/demo.md b/src/talks/demo.md
index 3863c23..7640979 100644
--- a/src/talks/demo.md
+++ b/src/talks/demo.md
@@ -71,11 +71,11 @@ And they can work together in every possible combination. Here is an example whi
 
 &&flexer
 
-&&fow
+&&frow
 
 &&font18 Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc sed lectus porttitor nibh pellentesque ultrices ut in lorem. Pellentesque commodo dignissim placerat. &&/font
 
-&&fol &&font27
+&&fcol &&font27
 
 These
 
@@ -85,7 +85,7 @@ words
 
 ftag column.
 
-&&/font &&/fol
+&&/font &&/fcol
 &&flexer
 
 &&fright
@@ -94,7 +94,7 @@ Vestibulum sodales pharetra justo, placerat egestas arcu hendrerit vitae. Intege
 
 ![](/tutorials/fix-no-frame-buffer-plan9/img/rio-default-login.png)
 
-&&/fow
+&&/frow
 
 &&flexer