Added coloms to layout

5 files changed, 63 insertions, 10 deletions

diff --git a/exampleSite/content/elements/image/index.md b/exampleSite/content/elements/image/index.md
index beb0d5f..9e1e7ee 100644
--- a/exampleSite/content/elements/image/index.md
+++ b/exampleSite/content/elements/image/index.md
@@ -15,10 +15,10 @@ weight = 60
 
 #### Left & Right
 
-{{< image-text src="/images/pic05.jpg" class= "left" >}}
+{{< image src="/images/pic05.jpg" class= "left" >}}
+
 Fringilla nisl. Donec accumsan interdum nisi, quis tincidunt felis sagittis eget. tempus euismod. Vestibulum ante ipsum primis in faucibus vestibulum. Blandit adipiscing eu felis iaculis volutpat ac adipiscing accumsan eu faucibus. Integer ac pellentesque praesent tincidunt felis sagittis eget. tempus euismod. Vestibulum ante ipsum primis in faucibus vestibulum. Blandit adipiscing eu felis iaculis volutpat ac adipiscing accumsan eu faucibus. Integer ac pellentesque praesent. Donec accumsan interdum nisi, quis tincidunt felis sagittis eget. tempus euismod. Vestibulum ante ipsum primis in faucibus vestibulum. Blandit adipiscing eu felis iaculis volutpat ac adipiscing accumsan eu faucibus. Integer ac pellentesque praesent tincidunt felis sagittis eget. tempus euismod. Vestibulum ante ipsum primis in faucibus vestibulum. Blandit adipiscing eu felis iaculis volutpat ac adipiscing accumsan eu faucibus. Integer ac pellentesque praesent.
-{{< /image-text >}}
 
-{{< image-text src="/images/pic05.jpg" class= "right" >}}
+{{< image src="/images/pic05.jpg" class= "right" >}}
+
 Fringilla nisl. Donec accumsan interdum nisi, quis tincidunt felis sagittis eget. tempus euismod. Vestibulum ante ipsum primis in faucibus vestibulum. Blandit adipiscing eu felis iaculis volutpat ac adipiscing accumsan eu faucibus. Integer ac pellentesque praesent tincidunt felis sagittis eget. tempus euismod. Vestibulum ante ipsum primis in faucibus vestibulum. Blandit adipiscing eu felis iaculis volutpat ac adipiscing accumsan eu faucibus. Integer ac pellentesque praesent. Donec accumsan interdum nisi, quis tincidunt felis sagittis eget. tempus euismod. Vestibulum ante ipsum primis in faucibus vestibulum. Blandit adipiscing eu felis iaculis volutpat ac adipiscing accumsan eu faucibus. Integer ac pellentesque praesent tincidunt felis sagittis eget. tempus euismod. Vestibulum ante ipsum primis in faucibus vestibulum. Blandit adipiscing eu felis iaculis volutpat ac adipiscing accumsan eu faucibus. Integer ac pellentesque praesent.
-{{< /image-text >}} 
\ No newline at end of file
diff --git a/exampleSite/content/elements/lists.md b/exampleSite/content/elements/lists.md
index a08aca8..cf3f5ca 100644
--- a/exampleSite/content/elements/lists.md
+++ b/exampleSite/content/elements/lists.md
@@ -5,6 +5,8 @@ weight = 20
 
 ### {{< param title >}}
 
+{{< columns >}}
+{{< col-two markdown="true" >}}
 #### Unordered 
 
 - Dolor pulvinar etiam.
@@ -12,6 +14,16 @@ weight = 20
 - Felis feugiat dolore viverra.
 - Dolor pulvinar etiam.
 
+#### Alternate 
+
+- Dolor pulvinar etiam.
+- Sagittis lorem eleifend.
+- Felis feugiat dolore viverra.
+- Dolor pulvinar etiam.
+{.alt}
+
+{{< /col-two >}}
+{{< col-two markdown="true">}}
 #### Ordered
 1. Dolor pulvinar etiam.
 2. Etiam vel felis at viverra.
@@ -19,9 +31,22 @@ weight = 20
 4. Etiam vel felis nullam.
 5. Felis enim et tempus.
 
+#### Icons
+<ul class="icons">
+    <li><a href="#" class="icon brands fa-twitter"><span class="label">Twitter</span></a></li>
+    <li><a href="#" class="icon brands fa-facebook-f"><span class="label">Facebook</span></a></li>
+    <li><a href="#" class="icon brands fa-instagram"><span class="label">Instagram</span></a></li>
+    <li><a href="#" class="icon brands fa-github"><span class="label">Github</span></a></li>
+    <li><a href="#" class="icon brands fa-dribbble"><span class="label">Dribbble</span></a></li>
+    <li><a href="#" class="icon brands fa-tumblr"><span class="label">Tumblr</span></a></li>
+</ul>
+{{< /col-two >}}
+{{< /columns >}}
+
 
 #### Actions
 
+
 {{< button-group class="" >}}
     {{< button title="Primary" link= "#actions" class="primary" >}}
     {{< button title="Default" link= "#actions" class="" >}}
@@ -34,18 +59,29 @@ weight = 20
     {{< button title="Small" link= "#actions" class="small alt" >}}
 {{< /button-group >}}
 
+{{< columns >}}
+{{< col-two >}}
 {{< button-group class="stacked" >}}
     {{< button title="Primary" link= "#actions" class="primary" >}}
     {{< button title="Default" link= "#actions" class="" >}}
     {{< button title="Alt" link= "#actions" class="alt" >}}
 {{< /button-group >}}
+{{< /col-two >}}
 
-{{< button-group class="fit" >}}
-    {{< button title="Primary" link= "#actions" class="primary" >}}
-    {{< button title="Small" link= "#actions" class="primary small" >}}
+{{< col-four >}}
+{{< button-group class="stacked fit" >}}
+    {{< button title="Primary" link= "#actions" class="primary fit" >}}
+    {{< button title="Default" link= "#actions" class="fit" >}}
+    {{< button title="Default" link= "#actions" class="alt fit" >}}
 {{< /button-group >}}
+{{< /col-four >}}
 
-{{< button-group class="fit" >}}
-    {{< button title="Default" link= "#actions" class="" >}}
+{{< col-four >}}
+{{< button-group class="stacked fit" >}}
+    {{< button title="Small" link= "#actions" class="primary small" >}}
     {{< button title="Small" link= "#actions" class="small" >}}
-{{< /button-group >}}
\ No newline at end of file
+    {{< button title="Small" link= "#actions" class="small alt" >}}
+{{< /button-group >}}
+{{< /col-four >}}
+
+{{< /columns >}}
\ No newline at end of file
diff --git a/layouts/shortcodes/col-four.html b/layouts/shortcodes/col-four.html
new file mode 100644
index 0000000..c85cecf
--- /dev/null
+++ b/layouts/shortcodes/col-four.html
@@ -0,0 +1,7 @@
+<div class="col-3 col-6-narrower col-12-mobilep">
+  {{ if .Get "markdown" }}
+    {{ .Inner | markdownify }}
+  {{ else }}
+    {{ .Inner }}
+  {{ end }}
+</div>
\ No newline at end of file
diff --git a/layouts/shortcodes/col-two.html b/layouts/shortcodes/col-two.html
new file mode 100644
index 0000000..ef4ce25
--- /dev/null
+++ b/layouts/shortcodes/col-two.html
@@ -0,0 +1,7 @@
+<div class="col-6 col-12-mobilep">
+  {{ if .Get "markdown" }}
+    {{ .Inner | markdownify }}
+  {{ else }}
+    {{ .Inner }}
+  {{ end }}
+</div>
\ No newline at end of file
diff --git a/layouts/shortcodes/columns.html b/layouts/shortcodes/columns.html
new file mode 100644
index 0000000..5322bb1
--- /dev/null
+++ b/layouts/shortcodes/columns.html
@@ -0,0 +1,3 @@
+<div class="row">
+  {{ .Inner }}
+</div>
\ No newline at end of file