faq - separate page

techexcellenceio · Jan 19, 2024 · c92b1b7 · c92b1b7
1 parent 7475b7d
commit c92b1b7
Show file tree

Hide file tree

Showing 12 changed files with 97 additions and 75 deletions.
diff --git a/_includes/incl-faq.html b/_includes/incl-faq.html
@@ -0,0 +1,7 @@
+<h2>FAQ</h2>
+
+<div class="s-container">
+    <a class="g-btn" href="{{ site.url }}/faq">
+        Frequently asked questions
+    </a>
+</div>
diff --git a/_includes/speakers2024.html → _includes/speakers-current.html b/_includes/speakers2024.html → _includes/speakers-current.html
@@ -1,5 +1,5 @@
 
-<h2>Meetup Calendar for 2024</h2>
+<h2>Meetups - 2024</h2>
 
 <!-- JC TODO add social media for speakers -->
 

diff --git a/_includes/speakers-past.html b/_includes/speakers-past.html
@@ -0,0 +1,16 @@
+
+<h2>Past Meetups</h2>
+
+<!-- JC TODO add social media for speakers -->
+
+<div class="s-container">
+    <a class="s-btn" href="{{ site.url }}/talks-2023">
+        See our 2023 TE talks
+    </a>
+</div>
+
+<div class="s-container">
+    <a class="s-btn" href="{{ site.url }}/talks-2022">
+        See our 2022 TE talks
+    </a>
+</div>
diff --git a/_includes/speakers2022.html b/_includes/speakers2022.html
diff --git a/_includes/speakers2023.html b/_includes/speakers2023.html
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -8,58 +8,8 @@
         <div id="masthead">
             {% include masthead.html %}
         </div>
-
-        <div id="vision">
-            {% include vision.html %}
-        </div>
-
-        <div id="speakers">
-            {% include speakers2024.html %}
-        </div>
 
-        <div id="speakers">
-            {% include speakers2023.html %}
-        </div>
-
-        <div id="speakers">
-            {% include speakers2022.html %}
-        </div>
-
-        <div id="speakers">
-            {% include speaker-signup.html %}
-        </div>
-
-        <div id="team">
-            {% include team.html %}
-        </div>
-
-        <div id="community">
-            {% include community.html %}
-        </div>
-
-        <div id="about">
-            {% include about.html %}
-        </div>
-
-        <div id="sponsors">
-            {% include sponsors.html %}
-        </div>
-
-        <div id="partners">
-            {% include partners.html %}
-        </div>
-
-        <div class="network">
-            {% include network.html %}
-        </div>
-
-        <div id="faq">
-            {% include faq.html %}
-        </div>
-
-        <div id="ideas">
-            {% include ideas.html %}
-        </div>
+        {{ content }}
 
         <div id="footer">
             {% include footer.html %}     

diff --git a/_layouts/s2022.html → _layouts/past-meetups.html b/_layouts/s2022.html → _layouts/past-meetups.html
diff --git a/_scss/_global.scss b/_scss/_global.scss
@@ -139,3 +139,16 @@ a {
         color: #0999c5; // #0366d6
     }
 }
+
+
+a.g-btn {
+    background-color: rgb(225, 235, 236);
+    padding: .5rem 2rem;
+    border-radius: 50pt;
+    &:hover {
+        // background-color: rgb(219, 230, 230);
+        background-color: rgb(228, 240, 241);
+    }
+    display: inline-block;
+    margin-bottom: .5rem;
+}
diff --git a/_includes/faq.html → faq.html b/_includes/faq.html → faq.html
@@ -1,6 +1,11 @@
+---
+layout: default
+title: 
+---
+
 <h2>FAQ</h2>
 
-<div class="s-container">
+<div class="s-container d-block">
     <h3>Where can I join?</h3>
 
     <ul>

diff --git a/index.html b/index.html
@@ -2,4 +2,52 @@
 layout: default
 ---
 
-<!-- RUN: bundle exec jekyll serve --livereload -->
+<!-- RUN: bundle exec jekyll serve --livereload -->
+
+<div id="vision">
+    {% include vision.html %}
+</div>
+
+<div id="speakers">
+    {% include speakers-current.html %}
+</div>
+
+<div id="speakers">
+    {% include speakers-past.html %}
+</div>
+
+<div id="speakers">
+    {% include speaker-signup.html %}
+</div>
+
+<div id="team">
+    {% include team.html %}
+</div>
+
+<div id="community">
+    {% include community.html %}
+</div>
+
+<div id="about">
+    {% include about.html %}
+</div>
+
+<div id="sponsors">
+    {% include sponsors.html %}
+</div>
+
+<div id="partners">
+    {% include partners.html %}
+</div>
+
+<div class="network">
+    {% include network.html %}
+</div>
+
+<div id="faq">
+    {% include incl-faq.html %}
+</div>
+
+<div id="ideas">
+    {% include ideas.html %}
+</div>
diff --git a/speakers-2022.html → talks-2022.html b/speakers-2022.html → talks-2022.html
@@ -1,9 +1,9 @@
 ---
-layout: s2022
+layout: past-meetups
 title: 
 ---
 
-<h2>Meetup Calendar for 2022</h2>
+<h2>Meetups - 2022</h2>
 
 {% assign talks = site.data.speakers2022 %}
 

diff --git a/speakers-2023.html → talks-2023.html b/speakers-2023.html → talks-2023.html
@@ -1,9 +1,9 @@
 ---
-layout: s2022
+layout: past-meetups
 title: 
 ---
 
-<h2>Meetup Calendar for 2023</h2>
+<h2>Meetups - 2023</h2>
 
 {% assign talks = site.data.speakers2023 %}