edit content

diff --git a/README.md b/README.md
index 290617b1202f824057dffa4dda089c8314c83d1e..acbbba0e582bfa7634099fff0b31ceb7be822671 100644 (file)
--- a/README.md
+++ b/README.md
@@ -96,7 +96,7 @@ Example Markdown file (about.md) with meta information:
 - **robots** → Controls search engine indexing (index, follow / noindex, nofollow). Defaults to index, follow.
 
 ## Shortcodes
-flatMark supports simple shortcodes for structured content. You can see all shortcodes in action on the Demo Website: [Shortcode-Examples](https://flatmark.elektrischerwalfisch.de/en/shortcode-examples). Here are just two examples:
+flatMark supports simple shortcodes for structured content. You can see all shortcodes in action on the [Examples-Page](https://flatmark.elektrischerwalfisch.de/en/examples) of theDemo Website. Here are just two examples:
 
     {columns 50-50}
     Left column
@@ -110,7 +110,7 @@ flatMark supports simple shortcodes for structured content. You can see all shor
   
 These shortcodes are part of the theme and are all located in the file `/theme/functions.php`.
 You can edit this file to change existing shortcodes or add even more.
-An example-page with all shortcodes is provided with the installation: `/pages-en/shortcode-examples.md`
+An example-page with all shortcodes is provided with the installation: `/pages-en/examples.md`
 
 
 ## Customization

diff --git a/pages-en/01-header.md b/pages-en/01-header.md
index 7f370f19c46b2f066dd5455ae6555883e0295408..88ef809075c2e4c3701e2b528381b3785af7d972 100644 (file)
--- a/pages-en/01-header.md
+++ b/pages-en/01-header.md
@@ -9,5 +9,5 @@
 A lightweight, flat-file Markdown-based website generator
 
 - [Home](/en/home)
-- [Shortcode-Examples](/en/shortcode-examples)
+- [Examples](/en/examples)
 - [Download](https://github.com/elektrischerwalfisch/flatmark)
\ No newline at end of file

diff --git a/pages-en/examples.md b/pages-en/examples.md
new file mode 100644 (file)
index 0000000..b433732
--- /dev/null
+++ b/pages-en/examples.md
@@ -0,0 +1,109 @@
+# Examples
+
+## Shortcodes
+These shortcodes are available by default in the flatMark-theme:
+
+{code}
+{columns}
+    Content of first column
+{columns-seperator}
+    Content of second column
+{/columns}
+
+{background}
+    Content with backgrond-color
+{/background}
+
+{img-rounded}
+    Picture with rounded border
+{/img-rounded}
+
+{extras}
+    Extra content in 01-header.md (e. g. language-switch, phone, e-mail etc.)
+{/extras}
+
+{year}
+    Output of the current year (Can be used for copyright in 02-footer.md)
+
+{code}
+    Used only in this documentation to display unrendered shortcodes in code-block
+
+{readme}
+    Outputs the readme.md from the root-folder. 
+    Used on the default-page /pages-en/home.md
+
+
+{/code}
+
+### Additional values
+The shortcodes for columns and background accept additional values which are rendered as classes so that the output can be styled directly by css. In the default flatMark-theme these additional values are already styled:
+{code}
+{columns 50-50}
+{columns 33-66}
+{columns 66-33}
+{columns 33-33-33}
+
+{background color-01}
+{background color-02}
+{/code}  
+<br>  
+
+### Shortcode-Examples: Columns
+
+{columns 50-50}
+**columns 50-50** Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
+{columns-seperator}
+Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
+{/columns}  
+ <br>
+
+{columns 33-66}
+**columns 33-66** Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. 
+{columns-seperator}
+![Pic](/files/example-pic-03.jpg)
+{/columns}
+ <br>
+
+{columns 66-33}
+**columns 66-33** Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.
+
+Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. 
+{columns-seperator}
+![Pic](/files/example-pic-02.jpg)
+{/columns}
+ <br>
+
+{columns 33-33-33}
+**columns 33-33-33** Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr. 
+{columns-seperator}
+![Pic](/files/example-pic-01.jpg)
+{columns-seperator}
+![Pic](/files/example-pic-01.jpg)
+{/columns}
+ <br>
+
+### Shortcode-Examples: Backgrounds
+{background color-01}
+**background color-01** Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren.
+{/background}
+ <br>
+
+{background color-02}
+**background color-02** Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren.
+{/background}
+
+### Shortcode-Examples: Miscellaneous  
+{columns 33-66}
+{img-rounded}
+![Pic](/files/example-pic-01.jpg)
+{/img-rounded}
+{columns-seperator}
+**img-rounded** inside **columns 33-66** 
+Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.  
+{/columns}
+<br>
+
+
+
+
+

diff --git a/pages-en/shortcode-examples.md b/pages-en/shortcode-examples.md
deleted file mode 100644 (file)
index 39419a8..0000000
--- a/pages-en/shortcode-examples.md
+++ /dev/null
@@ -1,108 +0,0 @@
-# Shortcode-Examples
-
-These shortcodes are available by default in the flatMark-theme:
-
-{code}
-{columns}
-    Content of first column
-{columns-seperator}
-    Content of second column
-{/columns}
-
-{background}
-    Content with backgrond-color
-{/background}
-
-{img-rounded}
-    Picture with rounded border
-{/img-rounded}
-
-{extras}
-    Extra content in 01-header.md (e. g. language-switch, phone, e-mail etc.)
-{/extras}
-
-{year}
-    Output of the current year (Can be used for copyright in 02-footer.md)
-
-{code}
-    Used only in this documentation to display unrendered shortcodes in code-block
-
-{readme}
-    Outputs the readme.md from the root-folder. 
-    Used on the default-page /pages-en/home.md
-
-
-{/code}
-
-### Additional values
-The shortcodes for columns and background accept additional values which are rendered as classes so that the output can be styled directly by css. In the default flatMark-theme these additional values are already styled:
-{code}
-{columns 50-50}
-{columns 33-66}
-{columns 66-33}
-{columns 33-33-33}
-
-{background color-01}
-{background color-02}
-{/code}  
-<br>  
-
-### Shortcode-Examples
-
-{columns 50-50}
-**columns 50-50** Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
-{columns-seperator}
-Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
-{/columns}  
- <br>
-
-{columns 33-66}
-**columns 33-66** Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. 
-{columns-seperator}
-![Pic](/files/example-pic-03.jpg)
-{/columns}
- <br>
-
-{columns 66-33}
-**columns 66-33** Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.
-
-Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. 
-{columns-seperator}
-![Pic](/files/example-pic-02.jpg)
-{/columns}
- <br>
-
-{columns 33-33-33}
-**columns 33-33-33** Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr. 
-{columns-seperator}
-![Pic](/files/example-pic-01.jpg)
-{columns-seperator}
-![Pic](/files/example-pic-01.jpg)
-{/columns}
- <br>
-
-{columns 33-66}
-{img-rounded}
-![Pic](/files/example-pic-01.jpg)
-{/img-rounded}
-{columns-seperator}
-**img-rounded** inside **columns 33-66** 
-Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.  
-{/columns}
-<br>
-
-{background color-01}
-**background color-01** Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren.
-{/background}
- <br>
-
-{background color-02}
-**background color-02** Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren.
-{/background}
-
-
-
-
-
-
-