resolve merge

docker-compose.yml

@@ -5,7 +5,7 @@ services:
       image: jvconseil/jekyll-docker:4
       environment:
         - JEKYLL_ENV=development
-      command: jekyll serve --verbose --trace --incremental --verbose --host 0.0.0.0
+      command: jekyll serve --verbose --trace --incremental --verbose --host 0.0.0.0 --config _config.dev.yml
       ports:
           - 4000:4000
       volumes:

src/Civic Tech 101.markdown

@@ -0,0 +1,7 @@
+---
+layout: page
+title: Civic Tech 101
+permalink: /civic-tech-101/
+---
+
+<iframe width="640" height="360" src="https://www.youtube.com/embed/SbClU_S8zNw" title="Civic Tech 101" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" referrerpolicy="strict-origin-when-cross-origin" allowfullscreen></iframe>

src/_config.dev.yml

@@ -0,0 +1,54 @@
+# Welcome to Jekyll!
+#
+# This config file is meant for settings that affect your whole blog, values
+# which you are expected to set up once and rarely edit after that. If you find
+# yourself editing this file very often, consider using Jekyll's data files
+# feature for the data you need to update frequently.
+#
+# For technical reasons, this file is *NOT* reloaded automatically when you use
+# 'bundle exec jekyll serve'. If you change this file, please restart the server process.
+#
+# If you need help with YAML syntax, here are some quick references for you:
+# https://learn-the-web.algonquindesign.ca/topics/markdown-yaml-cheat-sheet/#yaml
+# https://learnxinyminutes.com/docs/yaml/
+#
+# Site settings
+# These are used to personalize your new site. If you look in the HTML files,
+# you will see them accessed via {{ site.title }}, {{ site.email }}, and so on.
+# You can create any custom variable you would like, and they will be accessible
+# in the templates via {{ site.myvariable }}.
+
+title: Civic Tech Atlanta
+email: [email protected]
+description: >- # this means to ignore newlines until "baseurl:"
+  This is only visible on dev. Write an awesome description for your new site here. You can edit this
+  line in _config.yml. It will appear in your document head meta (for
+  Google search results) and in your feed.xml site description.
+baseurl: "" # the subpath of your site, e.g. /blog
+url: "http://civictechatlanta.github.io/" # the base hostname & protocol for your site, e.g. http://example.com
+twitter_username: jekyllrb
+github_username: jekyll
+
+# Build settings
+theme: minima
+plugins:
+  - jekyll-feed
+# Exclude from processing.
+# The following items will not be processed, by default.
+# Any item listed under the `exclude:` key here will be automatically added to
+# the internal "default list".
+#
+# Excluded items can be processed by explicitly listing the directories or
+# their entries' file path in the `include:` list.
+#
+# exclude:
+#   - .sass-cache/
+#   - .jekyll-cache/
+#   - gemfiles/
+#   - Gemfile
+#   - Gemfile.lock
+#   - node_modules/
+#   - vendor/bundle/
+#   - vendor/cache/
+#   - vendor/gems/
+#   - vendor/ruby/

src/project-proposals.markdown

@@ -0,0 +1,7 @@
+---
+layout: page
+title: Project Proposals
+permalink: /project-proposal/
+---
+
+Project Proposals Page here

src/volunteer.markdown

@@ -0,0 +1,8 @@
+---
+layout: default
+permalink: /volunteer
+---
+
+<iframe
+    src="https://docs.google.com/forms/d/e/1FAIpQLSctKFQozOWz17DXD8BEfVNDSqd5GQVbcgnK64lKjD2pgLnxBA/viewform?embedded=true"
+    width="100%" height="1000" frameborder="0" marginheight="0" marginwidth="0">Volunteer Form</iframe>