From e8d133a9c2770616d1d3ceefe483d3504eb6db26 Mon Sep 17 00:00:00 2001 From: borntojesus Date: Sat, 25 Nov 2023 03:06:46 +0200 Subject: [PATCH] faq page --- content/faq/index.md | 2 + sass/common/search.scss | 23 ++ sass/main.scss | 2 + sass/pages/faq-page.scss | 6 + sass/pages/volunteering.scss | 52 +-- sass/variables/color-theme.scss | 1 + templates/base.html | 2 +- templates/faq.html | 520 +++++++++++++++++++++++------ templates/new-donate.html | 41 +-- templates/section/donate.html | 40 +++ templates/shortcodes/acordeon.html | 14 + templates/support.html | 41 +-- templates/ui/search.html | 3 + templates/volunteering.html | 54 +-- 14 files changed, 553 insertions(+), 248 deletions(-) create mode 100644 sass/common/search.scss create mode 100644 sass/pages/faq-page.scss create mode 100644 templates/section/donate.html create mode 100644 templates/shortcodes/acordeon.html create mode 100644 templates/ui/search.html diff --git a/content/faq/index.md b/content/faq/index.md index 729a1add..7ce10e3d 100644 --- a/content/faq/index.md +++ b/content/faq/index.md @@ -5,6 +5,8 @@ template: faq.html weight: 10 extra: hero_title: Faq + hero_image: faq/hero_image.png + menu_title_pre: Home faq_question_title_1: About Organic Maps faq_question_title_2: App faq_question_title_3: Operating The Map diff --git a/sass/common/search.scss b/sass/common/search.scss new file mode 100644 index 00000000..8933a5b3 --- /dev/null +++ b/sass/common/search.scss @@ -0,0 +1,23 @@ +.search { + padding: 20rem 0 20rem; + &__container { + position: relative; + } + + &__input { + width: 100%; + outline: none; + padding: 15rem 15rem 15rem 40rem; + border-radius: 90rem; + border: 1px solid var(--common-grey-v5); + } + &__label { + position: relative; + } + &__icon { + position: absolute; + top: 3rem; + left: 15rem; + color: var(--common-grey-v5); + } +} \ No newline at end of file diff --git a/sass/main.scss b/sass/main.scss index 797a3fd8..661ddf39 100644 --- a/sass/main.scss +++ b/sass/main.scss @@ -14,6 +14,7 @@ @import "./common/footer"; @import "./common/bred-crum"; @import "./common/support-block"; +@import "./common/search"; // Component Style @import "./component/lang-switcher"; @@ -29,5 +30,6 @@ @import "./pages/support"; @import "./pages/volunteering"; @import "./pages/new-support"; +@import "./pages/faq-page"; diff --git a/sass/pages/faq-page.scss b/sass/pages/faq-page.scss new file mode 100644 index 00000000..272108f7 --- /dev/null +++ b/sass/pages/faq-page.scss @@ -0,0 +1,6 @@ +@import "../variables/media"; + +.faq-page { +padding-top: 0; +} + diff --git a/sass/pages/volunteering.scss b/sass/pages/volunteering.scss index a2ae6b25..f2fab7a0 100644 --- a/sass/pages/volunteering.scss +++ b/sass/pages/volunteering.scss @@ -2,12 +2,14 @@ .section-volunteering { padding: var(--container-mob-section) 0; -&__title { - @media (max-width: $media-sm) { - display: flex; - align-items: center; + + &__title { + @media (max-width: $media-sm) { + display: flex; + align-items: center; } -} + } + &__select { display: flex; justify-content: space-between; @@ -17,37 +19,49 @@ margin-bottom: 20rem; cursor: pointer; border: 1rem solid transparent; -@media (max-width: $media-sm) { + @media (max-width: $media-sm) { padding: 16rem 15rem; } + &:last-child { margin-bottom: 0; } } - &__block { - padding: 20rem; - display: flex; - flex-direction: column; - gap: 16rem; - border-bottom: 1rem solid var(--common-acord-button); - @media (max-width: $media-sm) { - padding: 16rem 15rem; + + &__block { + padding: 20rem; + display: flex; + flex-direction: column; + gap: 16rem; + border-bottom: 1rem solid var(--common-acord-button); + overflow: scroll; + max-height: 500rem; + img { + display: inline; + width: fit-content; } - } + @media (max-width: $media-sm) { + padding: 16rem 15rem; + + } + } + &__main { padding: 30rem; } &__content { overflow: hidden; - max-height: 0; + background-color: var(--acordion-green-bg); transition: max-height 0.5s ease-in-out; margin-bottom: 20rem; margin-top: -24rem; border-radius: 0 0 10rem 10rem; -@media (max-width: $media-sm) { - margin-top: -27rem; + max-height: 0; + + @media (max-width: $media-sm) { + margin-top: -27rem; } } @@ -72,7 +86,7 @@ } .is-active + .section-volunteering__content { - max-height: 1500rem; + max-height: 500rem; border: 1rem solid var(--common-acord-button); } diff --git a/sass/variables/color-theme.scss b/sass/variables/color-theme.scss index e0939266..f6ed9b3e 100644 --- a/sass/variables/color-theme.scss +++ b/sass/variables/color-theme.scss @@ -13,6 +13,7 @@ --common-grey-v2: #5A5A5A; --common-grey-v3: #64776E; --common-grey-v4: #E5F0EB; + --common-grey-v5: #CECECE; --common-green-border: #99C4AF; --common-line-color: #AEC5BA; --common-black-sub: #26312C; diff --git a/templates/base.html b/templates/base.html index 3d7ec085..900c136e 100644 --- a/templates/base.html +++ b/templates/base.html @@ -108,7 +108,7 @@ {% include 'common/footer.html' %} - +{% include 'shortcodes/acordeon.html' %} {% include 'shortcodes/switch-theme.html' %} {% include 'shortcodes/header-switch.html' %} {% include 'shortcodes/animation-section-js.html' %} diff --git a/templates/faq.html b/templates/faq.html index 5e8321e9..16d827d8 100644 --- a/templates/faq.html +++ b/templates/faq.html @@ -1,103 +1,433 @@ {% extends "base.html" %} {%- block content %} -
-
-

{{ page.extra.hero_title | safe }}

-
-
-
- - {{ trans(key='search-label', lang=lang) }} -
-

- {{ page.extra.faq_question_title_1 | safe }} -

-
-
-

{{ page.extra.faq_question_title_2| safe }}

-

{{ page.extra.faq_question_app_q_1 | safe }}

- -

{{ page.extra.faq_answer_app_q_1_1 | safe }}

- -

{{ page.extra.faq_answer_app_q_1_2 | safe }}

+
+
+ +
+

+ {{ page.extra.hero_title | safe }} +

-

{{ page.extra.faq_question_app_q_2 | safe }}

-

{{ page.extra.faq_answer_app_q_2_1 | safe }}

-

{{ page.extra.faq_question_app_q_3 | safe }}

- -

{{ page.extra.faq_answer_app_q_3_1 | safe }}

+
+
+
-

{{ page.extra.faq_question_app_q_4 | safe }}

-

{{ page.extra.faq_answer_app_q_4_1 | safe }}

-

{{ page.extra.faq_answer_app_q_4_2 | safe }}

- - -
-
-

- {{ page.extra.faq_question_title_3 | safe }} -

-
-
-

- {{ page.extra.faq_question_title_4 | safe }} -

-
-
-

- {{ page.extra.faq_question_title_5 | safe }} -

-
-
-

- {{ page.extra.faq_question_title_6 | safe }} -

-
-
-

- {{ page.extra.faq_question_title_7 | safe }} -

-
-
-

- {{ page.extra.faq_question_title_8 | safe }} -

-
-
-

- {{ page.extra.faq_question_title_9 | safe }} -

-
-
-

- {{ page.extra.faq_question_title_10 | safe }} -

-
-
-

- {{ page.extra.faq_question_title_11 | safe }} -

-
-
-
- {{ trans(key='ged-involved-title', lang=lang) }} -
- - {{ trans(key='donate-title', lang=lang) }} - {{ trans(key='donate-description', lang=lang) }} -
-
- - {{ trans(key='contribute-code-title', lang=lang) }} - {{ trans(key='contribute-code-description', lang=lang) }} -
-
- - {{ trans(key='contribute-location-title', lang=lang) }} - {{ trans(key='contribute-location-description', lang=lang) }} -
-
+ +
+
+
+
+

+ {{ page.extra.faq_question_title_1| safe }} +

+
+ + +
+
+
+
+

{{ page.extra.faq_question_title_2| safe }}

+ +

{{ page.extra.faq_question_app_q_1 | safe }}

+ img +

{{ page.extra.faq_answer_app_q_1_1 | safe }}

+ img +

{{ page.extra.faq_answer_app_q_1_2 | safe }}

+ +

{{ page.extra.faq_question_app_q_2 | safe }}

+

{{ page.extra.faq_answer_app_q_2_1 | safe }}

+ +

{{ page.extra.faq_question_app_q_3 | safe }}

+ img +

{{ page.extra.faq_answer_app_q_3_1 | safe }}

+ +

{{ page.extra.faq_question_app_q_4 | safe }}

+

{{ page.extra.faq_answer_app_q_4_1 | safe }}

+

{{ page.extra.faq_answer_app_q_4_2 | safe }}

+ img + img +
+ +
+
+
+
+

+ {{ page.extra.faq_question_title_2| safe }} +

+
+ + +
+
+
+
+

{{ page.extra.faq_question_title_2| safe }}

+ +

{{ page.extra.faq_question_app_q_1 | safe }}

+ img +

{{ page.extra.faq_answer_app_q_1_1 | safe }}

+ img +

{{ page.extra.faq_answer_app_q_1_2 | safe }}

+ +

{{ page.extra.faq_question_app_q_2 | safe }}

+

{{ page.extra.faq_answer_app_q_2_1 | safe }}

+ +

{{ page.extra.faq_question_app_q_3 | safe }}

+ img +

{{ page.extra.faq_answer_app_q_3_1 | safe }}

+ +

{{ page.extra.faq_question_app_q_4 | safe }}

+

{{ page.extra.faq_answer_app_q_4_1 | safe }}

+

{{ page.extra.faq_answer_app_q_4_2 | safe }}

+ img + img +
+ +
+
+
+
+

+ {{ page.extra.faq_question_title_3| safe }} +

+
+ + +
+
+
+
+

{{ page.extra.faq_question_title_2| safe }}

+ +

{{ page.extra.faq_question_app_q_1 | safe }}

+ img +

{{ page.extra.faq_answer_app_q_1_1 | safe }}

+ img +

{{ page.extra.faq_answer_app_q_1_2 | safe }}

+ +

{{ page.extra.faq_question_app_q_2 | safe }}

+

{{ page.extra.faq_answer_app_q_2_1 | safe }}

+ +

{{ page.extra.faq_question_app_q_3 | safe }}

+ img +

{{ page.extra.faq_answer_app_q_3_1 | safe }}

+ +

{{ page.extra.faq_question_app_q_4 | safe }}

+

{{ page.extra.faq_answer_app_q_4_1 | safe }}

+

{{ page.extra.faq_answer_app_q_4_2 | safe }}

+ img + img +
+ +
+
+
+
+

+ {{ page.extra.faq_question_title_4| safe }} +

+
+ + +
+
+
+
+

{{ page.extra.faq_question_title_2| safe }}

+ +

{{ page.extra.faq_question_app_q_1 | safe }}

+ img +

{{ page.extra.faq_answer_app_q_1_1 | safe }}

+ img +

{{ page.extra.faq_answer_app_q_1_2 | safe }}

+ +

{{ page.extra.faq_question_app_q_2 | safe }}

+

{{ page.extra.faq_answer_app_q_2_1 | safe }}

+ +

{{ page.extra.faq_question_app_q_3 | safe }}

+ img +

{{ page.extra.faq_answer_app_q_3_1 | safe }}

+ +

{{ page.extra.faq_question_app_q_4 | safe }}

+

{{ page.extra.faq_answer_app_q_4_1 | safe }}

+

{{ page.extra.faq_answer_app_q_4_2 | safe }}

+ img + img +
+ +
+
+
+
+

+ {{ page.extra.faq_question_title_5| safe }} +

+
+ + +
+
+
+
+

{{ page.extra.faq_question_title_2| safe }}

+ +

{{ page.extra.faq_question_app_q_1 | safe }}

+ img +

{{ page.extra.faq_answer_app_q_1_1 | safe }}

+ img +

{{ page.extra.faq_answer_app_q_1_2 | safe }}

+ +

{{ page.extra.faq_question_app_q_2 | safe }}

+

{{ page.extra.faq_answer_app_q_2_1 | safe }}

+ +

{{ page.extra.faq_question_app_q_3 | safe }}

+ img +

{{ page.extra.faq_answer_app_q_3_1 | safe }}

+ +

{{ page.extra.faq_question_app_q_4 | safe }}

+

{{ page.extra.faq_answer_app_q_4_1 | safe }}

+

{{ page.extra.faq_answer_app_q_4_2 | safe }}

+ img + img +
+ +
+
+
+
+

+ {{ page.extra.faq_question_title_6| safe }} +

+
+ + +
+
+
+
+

{{ page.extra.faq_question_title_2| safe }}

+ +

{{ page.extra.faq_question_app_q_1 | safe }}

+ img +

{{ page.extra.faq_answer_app_q_1_1 | safe }}

+ img +

{{ page.extra.faq_answer_app_q_1_2 | safe }}

+ +

{{ page.extra.faq_question_app_q_2 | safe }}

+

{{ page.extra.faq_answer_app_q_2_1 | safe }}

+ +

{{ page.extra.faq_question_app_q_3 | safe }}

+ img +

{{ page.extra.faq_answer_app_q_3_1 | safe }}

+ +

{{ page.extra.faq_question_app_q_4 | safe }}

+

{{ page.extra.faq_answer_app_q_4_1 | safe }}

+

{{ page.extra.faq_answer_app_q_4_2 | safe }}

+ img + img +
+ +
+
+
+
+

+ {{ page.extra.faq_question_title_7| safe }} +

+
+ + +
+
+
+
+

{{ page.extra.faq_question_title_2| safe }}

+ +

{{ page.extra.faq_question_app_q_1 | safe }}

+ img +

{{ page.extra.faq_answer_app_q_1_1 | safe }}

+ img +

{{ page.extra.faq_answer_app_q_1_2 | safe }}

+ +

{{ page.extra.faq_question_app_q_2 | safe }}

+

{{ page.extra.faq_answer_app_q_2_1 | safe }}

+ +

{{ page.extra.faq_question_app_q_3 | safe }}

+ img +

{{ page.extra.faq_answer_app_q_3_1 | safe }}

+ +

{{ page.extra.faq_question_app_q_4 | safe }}

+

{{ page.extra.faq_answer_app_q_4_1 | safe }}

+

{{ page.extra.faq_answer_app_q_4_2 | safe }}

+ img + img +
+ +
+
+
+
+

+ {{ page.extra.faq_question_title_8| safe }} +

+
+ + +
+
+
+
+

{{ page.extra.faq_question_title_2| safe }}

+ +

{{ page.extra.faq_question_app_q_1 | safe }}

+ img +

{{ page.extra.faq_answer_app_q_1_1 | safe }}

+ img +

{{ page.extra.faq_answer_app_q_1_2 | safe }}

+ +

{{ page.extra.faq_question_app_q_2 | safe }}

+

{{ page.extra.faq_answer_app_q_2_1 | safe }}

+ +

{{ page.extra.faq_question_app_q_3 | safe }}

+ img +

{{ page.extra.faq_answer_app_q_3_1 | safe }}

+ +

{{ page.extra.faq_question_app_q_4 | safe }}

+

{{ page.extra.faq_answer_app_q_4_1 | safe }}

+

{{ page.extra.faq_answer_app_q_4_2 | safe }}

+ img + img +
+ +
+
+
+
+

+ {{ page.extra.faq_question_title_9| safe }} +

+
+ + +
+
+
+
+

{{ page.extra.faq_question_title_2| safe }}

+ +

{{ page.extra.faq_question_app_q_1 | safe }}

+ img +

{{ page.extra.faq_answer_app_q_1_1 | safe }}

+ img +

{{ page.extra.faq_answer_app_q_1_2 | safe }}

+ +

{{ page.extra.faq_question_app_q_2 | safe }}

+

{{ page.extra.faq_answer_app_q_2_1 | safe }}

+ +

{{ page.extra.faq_question_app_q_3 | safe }}

+ img +

{{ page.extra.faq_answer_app_q_3_1 | safe }}

+ +

{{ page.extra.faq_question_app_q_4 | safe }}

+

{{ page.extra.faq_answer_app_q_4_1 | safe }}

+

{{ page.extra.faq_answer_app_q_4_2 | safe }}

+ img + img +
+ +
+
+
+
+

+ {{ page.extra.faq_question_title_10| safe }} +

+
+ + +
+
+
+
+

{{ page.extra.faq_question_title_2| safe }}

+ +

{{ page.extra.faq_question_app_q_1 | safe }}

+ img +

{{ page.extra.faq_answer_app_q_1_1 | safe }}

+ img +

{{ page.extra.faq_answer_app_q_1_2 | safe }}

+ +

{{ page.extra.faq_question_app_q_2 | safe }}

+

{{ page.extra.faq_answer_app_q_2_1 | safe }}

+ +

{{ page.extra.faq_question_app_q_3 | safe }}

+ img +

{{ page.extra.faq_answer_app_q_3_1 | safe }}

+ +

{{ page.extra.faq_question_app_q_4 | safe }}

+

{{ page.extra.faq_answer_app_q_4_1 | safe }}

+

{{ page.extra.faq_answer_app_q_4_2 | safe }}

+ img + img +
+ +
+
+
+
+

+ {{ page.extra.faq_question_title_11| safe }} +

+
+ + +
+
+
+
+

{{ page.extra.faq_question_title_2| safe }}

+ +

{{ page.extra.faq_question_app_q_1 | safe }}

+ img +

{{ page.extra.faq_answer_app_q_1_1 | safe }}

+ img +

{{ page.extra.faq_answer_app_q_1_2 | safe }}

+ +

{{ page.extra.faq_question_app_q_2 | safe }}

+

{{ page.extra.faq_answer_app_q_2_1 | safe }}

+ +

{{ page.extra.faq_question_app_q_3 | safe }}

+ img +

{{ page.extra.faq_answer_app_q_3_1 | safe }}

+ +

{{ page.extra.faq_question_app_q_4 | safe }}

+

{{ page.extra.faq_answer_app_q_4_1 | safe }}

+

{{ page.extra.faq_answer_app_q_4_2 | safe }}

+ img + img +
+ +
+
+
+ +
+ + {% include 'section/donate.html' %} {%- endblock content %} \ No newline at end of file diff --git a/templates/new-donate.html b/templates/new-donate.html index 6098ab8d..c90ff7ea 100644 --- a/templates/new-donate.html +++ b/templates/new-donate.html @@ -150,46 +150,7 @@ -
-
-

{{ trans(key='ged-involved-title', lang=lang) }}

-
-
- {% include 'ui/icons/header/donate.html' %} -
- {{ trans(key='donate-title', lang=lang) }} -
- -

- {{ trans(key='donate-description', lang=lang) }} -

- -
-
- {% include 'ui/icons/header/code.html' %} -
- {{ trans(key='contribute-code-title', lang=lang) }} -
- -

- {{ trans(key='contribute-code-description', lang=lang) }} -

- -
-
- {% include 'ui/icons/header/location.html' %} -
- {{ trans(key='contribute-location-title', lang=lang) }} -
-

- {{ trans(key='contribute-location-description', lang=lang) }} -

- -
-
- -
-
+ {% include 'section/donate.html' %} \ No newline at end of file diff --git a/templates/support.html b/templates/support.html index 95e4e2ae..46a1bb46 100644 --- a/templates/support.html +++ b/templates/support.html @@ -62,46 +62,7 @@ -
-
-

{{ trans(key='ged-involved-title', lang=lang) }}

-
-
- {% include 'ui/icons/header/donate.html' %} -
- {{ trans(key='donate-title', lang=lang) }} -
- -

- {{ trans(key='donate-description', lang=lang) }} -

- -
-
- {% include 'ui/icons/header/code.html' %} -
- {{ trans(key='contribute-code-title', lang=lang) }} -
- -

- {{ trans(key='contribute-code-description', lang=lang) }} -

- -
-
- {% include 'ui/icons/header/location.html' %} -
- {{ trans(key='contribute-location-title', lang=lang) }} -
-

- {{ trans(key='contribute-location-description', lang=lang) }} -

- -
-
- -
-
+ {% include 'section/donate.html' %} {%- endblock content %} \ No newline at end of file diff --git a/templates/ui/search.html b/templates/ui/search.html new file mode 100644 index 00000000..ee4159a7 --- /dev/null +++ b/templates/ui/search.html @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/templates/volunteering.html b/templates/volunteering.html index ee1b0bf1..e437f034 100644 --- a/templates/volunteering.html +++ b/templates/volunteering.html @@ -325,60 +325,8 @@ -
-
-

Get Involved

-
-
- {% include 'ui/icons/header/donate.html' %} -
- Donate -
-

- The app runs on your donations, help improve it -

+ {% include 'section/donate.html' %} -
-
- {% include 'ui/icons/header/code.html' %} -
- Contribute Code -
-

- Build the app used by people around the world -

- -
-
- {% include 'ui/icons/header/location.html' %} -
- Contribute Location Info -
-

- Add info around you, and make the product - better for everyone -

- -
-
- -
-
- - {%- endblock content %} \ No newline at end of file