From 69f0735c0905932de02da1b42fc44c936c04209a Mon Sep 17 00:00:00 2001 From: Lunardog Date: Fri, 3 Nov 2023 22:30:36 +0900 Subject: [PATCH 1/3] pendantic css fixes --- Gemfile.lock | 10 +++++++--- _data/faqs.yml | 22 +++++++++++----------- _data/strings.yml | 3 ++- _data/template.yml | 1 + _includes/faqs.html | 1 + _includes/footer.html | 18 +----------------- _includes/join.html | 9 ++++----- docker-compose.yml | 9 +++++++++ static/css/agency.css | 1 - static/css/mkp.scss | 20 +++++++++++++++++--- 10 files changed, 53 insertions(+), 41 deletions(-) create mode 100644 docker-compose.yml diff --git a/Gemfile.lock b/Gemfile.lock index b67450f..236730b 100644 --- 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/faqs.yml b/_data/faqs.yml index 09f0a9d..c01cca5 100644 --- 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:info@mkpjapan.org). - 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. \ No newline at end of file + 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 index a66b2bc..f806e09 100644 --- a/_data/strings.yml +++ b/_data/strings.yml @@ -41,4 +41,5 @@ testimonials: faqs: id: faqs title: FAQs - join_url: https://forms.gle/L64N8goVx42bHz7F7 \ No newline at end of file + subtitle: Find answers to frequently asked questions + join_url: https://forms.gle/L64N8goVx42bHz7F7 diff --git a/_data/template.yml b/_data/template.yml index 679fe4d..4bb297e 100644 --- a/_data/template.yml +++ b/_data/template.yml @@ -6,6 +6,7 @@ color: muted: 777 mkpyellow: fed136 mkpblue: 1f396d + buttonyellow: eebe1c # Font Families font: diff --git a/_includes/faqs.html b/_includes/faqs.html index e398841..86b33b3 100644 --- a/_includes/faqs.html +++ b/_includes/faqs.html @@ -2,6 +2,7 @@

{{s.title}}

+

{{ s.subtitle }}

{% for faq in site.data.faqs %}
diff --git a/_includes/footer.html b/_includes/footer.html index 616a0db..ceb18c2 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -1,25 +1,9 @@
-
+
Copyright © {{ site.title }} {{ 'now' | date: "%Y" }}
-
diff --git a/_includes/join.html b/_includes/join.html index 739e0b6..12a6d8b 100644 --- a/_includes/join.html +++ b/_includes/join.html @@ -1,11 +1,10 @@ {% assign s = site.data.strings['join'] %} - -
+
-
+

{{ s.title }}

{{ s.subtitle }}

{{ s.button }} -
+
-
+
diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..d8eb074 --- /dev/null +++ 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 index 9e3efc7..d1bf058 100644 --- a/static/css/agency.css +++ b/static/css/agency.css @@ -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 index 311baf8..6f53228 100644 --- a/static/css/mkp.scss +++ b/static/css/mkp.scss @@ -1,5 +1,13 @@ --- --- + +footer { + .row { + padding: 24px 0; + border-top: 2px solid #888; + } +} + .join-text { width:100%; } @@ -13,9 +21,16 @@ header .intro-text { .intro-subtext { font-family: {{ site.data.template.font.secondary }}; } - } +.btn-xl { + background-color: #{{ site.data.template.color.buttonyellow }}; + 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; @@ -256,4 +270,4 @@ img.hover-shadow { } } } -} \ No newline at end of file +} From 305d28e25ddcd7cced1f7bad2ac1c5f4d306af34 Mon Sep 17 00:00:00 2001 From: Lunardog Date: Fri, 3 Nov 2023 22:44:11 +0900 Subject: [PATCH 2/3] benefits, faqs yaml --- _data/benefits.yml | 14 +++++++------- _includes/benefits.html | 2 +- _includes/join.html | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/_data/benefits.yml b/_data/benefits.yml index af98099..e32bb0b 100644 --- a/_data/benefits.yml +++ b/_data/benefits.yml @@ -1,18 +1,18 @@ - title: Support and Connection icon: 🤗 benefits: - - 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. + - "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: - - Break free from limiting and sabotaging beliefs. - - Find brotherhood and insight. - - Access your inner leader. + - "**Break free** from **limiting and sabotaging beliefs**." + - "**Find brotherhood** and **insight**." + - "Access your **inner leader**." - title: Leadership and Accountability icon: 🏡 benefits: - - Men remind you of your commitments without judgment. - - Men hold you accountable and keep you focused on your goals. \ No newline at end of file + - "Men **remind** you of your **commitments** without judgment." + - "Men **hold you accountable** and keep you focused on your goals." diff --git a/_includes/benefits.html b/_includes/benefits.html index 081271a..29a3c1a 100644 --- a/_includes/benefits.html +++ b/_includes/benefits.html @@ -14,7 +14,7 @@

    {% for statement in b.benefits %} -
  • {{ statement }}
    • +
  • {{ statement | markdownify }}
    • {% endfor %}
diff --git a/_includes/join.html b/_includes/join.html index 12a6d8b..d95f0ef 100644 --- a/_includes/join.html +++ b/_includes/join.html @@ -1,10 +1,10 @@ {% assign s = site.data.strings['join'] %}
-
+

{{ s.title }}

{{ s.subtitle }}

{{ s.button }} -
+
From 68accdbdfd9498144064a910a89c7733698668ea Mon Sep 17 00:00:00 2001 From: Lunardog Date: Sat, 4 Nov 2023 10:42:52 +0900 Subject: [PATCH 3/3] button match figma --- .gitignore | 2 +- _data/template.yml | 5 ++--- static/css/agency.css | 4 ++-- static/css/mkp.scss | 10 +++++----- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 1c73920..78a0625 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,4 @@ themes public _site .jekyll-metadata -Gemfile.lock \ No newline at end of file +Gemfile.lock diff --git a/_data/template.yml b/_data/template.yml index 4bb297e..4ab5f5c 100644 --- a/_data/template.yml +++ b/_data/template.yml @@ -2,11 +2,10 @@ color: primary: fed136 secondary: fec503 - secondary-dark: 333 + secondaryDark: 333 muted: 777 - mkpyellow: fed136 + mkpYellow: fed136 mkpblue: 1f396d - buttonyellow: eebe1c # Font Families font: diff --git a/static/css/agency.css b/static/css/agency.css index d1bf058..0203165 100644 --- 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, diff --git a/static/css/mkp.scss b/static/css/mkp.scss index 6f53228..7325e5e 100644 --- a/static/css/mkp.scss +++ b/static/css/mkp.scss @@ -4,7 +4,7 @@ footer { .row { padding: 24px 0; - border-top: 2px solid #888; + border-top: 2px solid #{{site.data.template.color.muted}}; } } @@ -15,7 +15,7 @@ footer { 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 { @@ -24,11 +24,11 @@ header .intro-text { } .btn-xl { - background-color: #{{ site.data.template.color.buttonyellow }}; + 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; + // text-shadow: 0 0 2px #440, 0 0 20px #440; padding: 9px 24px; } @@ -137,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 {