Merge branch 'preprod' of https://github.com/organicmaps/organicmaps.github.io into preprod

config.toml

@@ -11,15 +11,49 @@ generate_feed = true
 feed_filename = "rss.xml"
 
 # Whether to build a search index to be used later on by a JavaScript library
-build_search_index = false
+build_search_index = true
+#default_language = "en"
 
-ignored_content = [".DS_Store"]
+#index_format = "elasticlunr_javascript"
+
+#[search]
+#    include_title = true
+#    include_description = true
+#    include_path = true
+#    include_content = true
 
 
 taxonomies = [
     {name = "faq", feed = false},
 ]
 
+# Whether to include the title of the page/section in the index
+#include_title = true
+# Whether to include the description of the page/section in the index
+#include_description = false
+# Whether to include the path of the page/section in the index
+#include_path = true
+
+# Whether to include the rendered content of the page/section in the index
+#include_content = true
+
+# At which character to truncate the content to. Useful if you have a lot of pages and the index would
+# become too big to load on the site. Defaults to not being set.
+# truncate_content_length = 100
+
+# Wether to produce the search index as a javascript file or as a JSON file
+# Accepted value "elasticlunr_javascript" or "elasticlunr_json"
+
+
+ignored_content = [".DS_Store"]
+
+
+
+#[taxonomies]
+#name = "faq"
+#paginate_by = 0  # This effectively disables pagination for this taxonomy if desired
+#feed = false
+
 [markdown]
 external_links_target_blank = true
 

news-newwwwwwwww/index.md

@@ -1,11 +0,0 @@
----
-title: "Organic Maps: Latest news and updates from our team"
-description: Stay in touch with the latest Organic Maps releases, news and updates from our team
-template: news.html
-page_template: news_post.html
-sort_by: date
-extra:
-  menu_title: News
-  menu_title_pre: Home
-  hero_image: /news/kv-news.png
----

sass/component/post-min.scss

@@ -5,7 +5,10 @@
   display: flex;
   flex-direction: column;
   align-items: flex-start;
-
+  ul {
+    list-style: disc;
+    padding-left: 20px;
+  }
   &__row {
     display: grid;
     grid-template-columns: 1fr 1fr;
@@ -14,16 +17,22 @@
   &__img {
     margin-bottom: 20rem;
     width: 100%;
-    max-width: 400rem;
+
     &--float {
       float: right;
+      max-width: 100rem;
+      margin:  5rem;
+      max-height: 200rem;
+      object-fit: contain;
     }
     &--one {
-     max-height: 278rem;
+      max-height: 278rem;
+      max-width: 100%;
+      height: 278rem;
       object-fit: cover;
       object-position: center;
       border-radius: 10rem;
-      height: 100%;
+
       &:not(:first-of-type) {
         display: none;
       }
@@ -43,6 +52,7 @@
 
   &__content {
     overflow: hidden;
+    margin-bottom: 60rem;
   }
 
   &__title {

sass/pages/new-support.scss

@@ -248,10 +248,18 @@
     display: flex;
     justify-content: space-between;
     align-items: center;
+    padding-top: 20rem;
 
   }
   &__tab-close {
     cursor: pointer;
+
+  }
+  &__tab--1 {
+    display: none;
+  }
+  &__tab--2 {
+    display: none;
   }
  &__tab-row {
 

templates/faq/list.html

@@ -51,11 +51,38 @@
     <ul class="faq-page-list__table">
       <li class="faq-page-list__table-item"><a class="h5-boold faq-page-list__table-title" href="{{term.permalink}}">{{term.name}} questions</a></li>
       {%- for faq_page in term.pages | sort(attribute="extra.order") -%}
-      <li class="faq-page-list__table-item"><a class="h5 faq-page-list__table-link" href="{{ faq_page.permalink }}">{{ faq_page.title }}</a></li>
+        <li class="faq-page-list__table-item"><a class="h5 faq-page-list__table-link" href="{{ faq_page.permalink }}">{{ faq_page.title }}</a></li>
       {%- endfor -%}
+
     </ul>
     {%- endfor -%}
 
+
+
+    <h1>test</h1>
+
+    <script>
+
+      let faqs = [
+          {%- for term in terms -%}
+          {%- for faq_page in term.pages -%}
+          {
+            "title": "{{ faq_page.title | escape(json=true) }}",
+            "description": "{{ faq_page.description | escape(json=true) }}",
+            "url": "{{ faq_page.permalink }}"
+
+          }{%- if not loop.last -%},{%- endif -%}
+          {%- endfor -%}
+          {%- if not loop.last -%},{%- endif -%}
+          {%- endfor -%}
+        ]
+
+    </script>
+
+    <script>
+      console.log(faqs);
+    </script>
+
   </div>
 </section>
 
@@ -66,4 +93,7 @@
   {% include 'section/social-icon.html' %}
 </section>
 {% include 'section/donate.html' %}
+
+
+
 {% endblock content %}

templates/news.html

@@ -71,12 +71,13 @@
     {% endfor %}
     {% if page.assets %}
     {% for photo in page.assets | sort %}
+
     <img class="post-min__img post-min__img--one" src="{{ page.path | safe }}{{ photo | split(pat='/') | last }}"/>
-    <!--        need to set firs image and discuss-->
+
     {% endfor %}
 
     {% else %}
-    <img class="post-min__img post-min__img--one" src="/"/>
+    <img class="post-min__img post-min__img--one" src="/images/post/img2.png"/>
     {% endif %}
     {% if page.title %}
     <h2 class="h2-sub_v2 post-min__title">