Merge pull request #39 from mkpjapan/user/lunardog/pendantic-fixes

Pendantic fixes
mkpjapan · Nov 4, 2023 · cb89577 · cb89577
2 parents ab586cd + 68accdb
commit cb89577
Show file tree

Hide file tree

Showing 13 changed files with 66 additions and 55 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,4 @@ themes
 public
 _site
 .jekyll-metadata
-Gemfile.lock
+Gemfile.lock
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -217,15 +217,17 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.3.6)
-    mini_portile2 (2.8.4)
     minima (2.5.1)
       jekyll (>= 3.5, < 5.0)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
     minitest (5.20.0)
     mutex_m (0.1.2)
-    nokogiri (1.15.4)
-      mini_portile2 (~> 2.8.2)
+    nokogiri (1.15.4-x64-mingw-ucrt)
+      racc (~> 1.4)
+    nokogiri (1.15.4-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.15.4-x86_64-linux)
       racc (~> 1.4)
     octokit (4.25.1)
       faraday (>= 1, < 3)
@@ -261,12 +263,14 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8.2)
+    unf_ext (0.0.8.2-x64-mingw-ucrt)
     unicode-display_width (1.8.0)
     webrick (1.8.1)
 
 PLATFORMS
   x64-mingw-ucrt
   x86_64-darwin-20
+  x86_64-linux-musl
 
 DEPENDENCIES
   github-pages

diff --git a/_data/benefits.yml b/_data/benefits.yml
@@ -1,18 +1,18 @@
 - title: Support and Connection
   icon: 🤗
   benefits:
-    - You are <b>heard and respected</b>. Everyone listens to your words. What you say is confidential.
-    - You are <b>valued</b> and <b>respected</b> by a circle of men who help each other in realizing their dreams.
+    - "You are **heard and respected**. Everyone listens to your words. What you say is confidential."
+    - "You are **valued** and **respected** by a circle of men who help each other in realizing their dreams."
 
 - title: Growth and Belonging
   icon: 🤝
   benefits:
-    - <b>Break free</b> from <b>limiting and sabotaging beliefs</b>.
-    - <b>Find brotherhood</b> and <b>insight</b>.
-    - Access your <b>inner leader</b>.
+    - "**Break free** from **limiting and sabotaging beliefs**."
+    - "**Find brotherhood** and **insight**."
+    - "Access your **inner leader**."
 
 - title: Leadership and Accountability
   icon: 🏡
   benefits:
-    - Men <b>remind</b> you of your <b>commitments</b> without judgment.
-    - Men <b>hold you accountable</b> and keep you focused on your goals.
+    - "Men **remind** you of your **commitments** without judgment."
+    - "Men **hold you accountable** and keep you focused on your goals."
diff --git a/_data/faqs.yml b/_data/faqs.yml
@@ -1,41 +1,41 @@
 - q: What is Mankind Project Japan?
-  a: |
+  a: >
      Mankind Project Japan is a **men's support group** based in **Tokyo** that hosts **weekly online gatherings.**
 
 - q: What are the benefits of joining?
-  a: |
+  a: >
      You'll  gain **support, insights, and connections** with like-minded men. It's an opportunity for **personal growth** and **self-discovery**.
 
 - q: Does it cost any money to join?
-  a: |
+  a: >
      **No**. Joining Mankind Project Japan's online gatherings is **completely free**. We believe in making our support accessible to all men.
 
      **Note**\: We  do ask for **voluntary donations** from time to time in order to cover overheads and grow the group. But these donations are **not a condition** for continued participation.
 
 - q: How can I join?
-  a: |
+  a: >
         [Sign up here.](https://forms.gle/L64N8goVx42bHz7F7) It's free and open to all men.
 
 - q: How often are the gatherings?
-  a: |
+  a: >
      We host **weekly** online gatherings. First Tuesdays of the month for **new members**. These ensure regular **support and connection** for our participants.
 
 - q: What topics are discussed?
-  a: |
+  a: >
      We cover a wide range of topics that includes **personal growth**, **relationships**, and **emotional well-being**.  Each gathering is facilitated by experienced leaders.
 
 - q: Can I share my story?
-  a: |
+  a: >
         **Absolutely**. Our gatherings provide a space for men to share their stories, experiences,  and challenges. We encourage open and honest communication.
 
 - q: Are the gatherings confidential?
-  a: |
+  a: >
      Yes, we **prioritize confidentiality** and create a safe and supportive environment for all participants. What is shared in the gatherings **stays within the group**.
 
 - q: How can I contact you?
-  a: |
+  a: >
      For further questions or assistance, please feel free to contact us [here](mailto:[email protected]).
 
 - q: Can I attend anonymously?
-  a: |
-       **Absolutely!** We respect everyone's privacy and understand that some participants may prefer to attend anonymously. You can choose to use a **pseudonym** during the gatherings.
+  a: >
+       **Absolutely!** We respect everyone's privacy and understand that some participants may prefer to attend anonymously. You can choose to use a **pseudonym** during the gatherings.
diff --git a/_data/strings.yml b/_data/strings.yml
@@ -41,4 +41,5 @@ testimonials:
 faqs:
   id: faqs
   title: FAQs
-  join_url: https://forms.gle/L64N8goVx42bHz7F7
+  subtitle: Find answers to frequently asked questions
+  join_url: https://forms.gle/L64N8goVx42bHz7F7
diff --git a/_data/template.yml b/_data/template.yml
@@ -2,9 +2,9 @@
 color:
   primary: fed136
   secondary: fec503
-  secondary-dark: 333
+  secondaryDark: 333
   muted: 777
-  mkpyellow: fed136
+  mkpYellow: fed136
   mkpblue: 1f396d
 
 # Font Families

diff --git a/_includes/benefits.html b/_includes/benefits.html
@@ -14,7 +14,7 @@ <h3>
                     </h3>
                     <ul>
                         {% for statement in b.benefits %}
-                        <li>{{ statement }}</li>
+                        <li>{{ statement | markdownify }}</li>
                         {% endfor %}
                     </ul>
                 </div>

diff --git a/_includes/faqs.html b/_includes/faqs.html
@@ -2,6 +2,7 @@
 <section id="{{ s.id }}">
     <div class="container">
         <h2 class="section-heading text-center">{{s.title}}</h2>
+        <h3 class="section-subheading text-muted text-center">{{ s.subtitle }}</h3>
         <div class="row">
             {% for faq in site.data.faqs %}
                 <div class="card">

diff --git a/_includes/footer.html b/_includes/footer.html
@@ -1,25 +1,9 @@
   <footer>
         <div class="container">
             <div class="row">
-                <div>
+                <div class="col-md-6">
                     <span class="copyright">Copyright &copy; {{ site.title }} {{ 'now' | date: "%Y" }}</span>
                 </div>
-                <!--<div class="col-md-4">
-                    <ul class="list-inline social-buttons">
-                        {% for network in site.social %}
-                        <li><a href="{{ network.url }}"><i class="fa fa-{{ network.title }}"></i></a>
-                        </li>
-                        {% endfor %}
-                    </ul>
-                </div>
-                <div class="col-md-4">
-                    <ul class="list-inline quicklinks">
-                        <li><a href="#">Privacy Policy</a>
-                        </li>
-                        <li><a href="#">Terms of Use</a>
-                        </li>
-                    </ul>
-                </div>-->
             </div>
         </div>
     </footer>
diff --git a/_includes/join.html b/_includes/join.html
@@ -1,11 +1,10 @@
 {% assign s = site.data.strings['join'] %}
-
-<section id="{{ s.id }}">
+<div id="{{ s.id }}">
     <div class="row">
-        <section class="join-container has-background-dark">
+        <section class="content join-container has-background-dark">
             <h2 class="section-heading">{{ s.title }}</h2>
             <h3 class="section-subheading">{{ s.subtitle }}</h3>
             <a href="{{ s.join_url }}" class="btn btn-xl mx-auto" style="margin:5px">{{ s.button }}</a>
         </section>
     </div>
-</section>
+</div>
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -0,0 +1,9 @@
+services:
+  jekyll:
+    image: jekyll/jekyll
+    volumes:
+      - .:/srv/jekyll
+      - ./vendor/bundle/:/usr/local/bundle
+    ports:
+      - "4000:4000"
+    command: jekyll serve --force_polling --drafts
diff --git a/static/css/agency.css b/static/css/agency.css
@@ -12,7 +12,7 @@
 body {
     overflow-x: hidden;
     font-family: "Roboto Slab","Helvetica Neue",Helvetica,Arial,sans-serif;
-    color: #{{ site.data.template.color.secondary-dark }};
+    color: #{{ site.data.template.color.secondaryDark }};
 }
 
 .text-muted {
@@ -131,7 +131,7 @@ fieldset[disabled] .btn-primary.active {
     font-size: 18px;
     font-weight: 800;
     background-color: #{{ site.data.template.color.secondary }};
-    color: #{{ site.data.template.color.secondary-dark }}
+    color: #{{ site.data.template.color.secondaryDark }}
 }
 
 .btn-xl:hover,
@@ -749,7 +749,6 @@ section#contact .text-danger {
 
 footer {
     padding: 25px 0;
-    text-align: center;
 }
 
 footer span.copyright {

diff --git a/static/css/mkp.scss b/static/css/mkp.scss
@@ -1,21 +1,36 @@
 ---
 ---
+
+footer {
+	.row {
+		padding: 24px 0;
+		border-top: 2px solid  #{{site.data.template.color.muted}};
+	}
+}
+
 .join-text {
     width:100%;
 }
 
 header .intro-text {
 	padding-top: 200px;
 	.intro-heading {
-		text-shadow: 1px 1px 2px #333;
+		text-shadow: 1px 1px 2px  #{{site.data.template.color.secondaryDark}};
 		text-transform: none;
 	}
     .intro-subtext {
         font-family: {{ site.data.template.font.secondary }};
     }
-
 }
 
+.btn-xl {
+	background-color: #{{ site.data.template.color.mkpYellow }};
+	color: #fff;
+	font-weight: bold;
+	font-size: 150%;
+	// text-shadow: 0 0 2px #440, 0 0 20px #440;
+	padding: 9px 24px;
+}
 
 section {
     h2.section-heading {
@@ -88,7 +103,6 @@ section {
     background-position: center center;
     background-repeat: none;
     width: 100%;
-    // min-height: 400px;
     -webkit-background-size: cover;
     -moz-background-size: cover;
     background-size: cover;
@@ -123,7 +137,7 @@ img.hover-shadow {
         h4 {
             font-family: {{ site.data.template.font.secondary }};
             font-weight: bold;
-            border-top: 2px solid #888;
+            border-top: 2px solid #{{site.data.template.color.muted}};
             padding: 1em 0;
         }
         p {
@@ -256,4 +270,4 @@ img.hover-shadow {
             }
         }
     }
-}
+}