Merge branch 'ui'

conedevelopment · Apr 20, 2024 · c19bc33 · c19bc33
2 parents e11440f + 3b34a7b
commit c19bc33
Show file tree

Hide file tree

Showing 50 changed files with 3,673 additions and 161 deletions.
diff --git a/.eleventy.js b/.eleventy.js
@@ -63,7 +63,7 @@ module.exports = config => {
     config.addTransform('htmlmin', htmlMinTransform);
   }
 
-  config.setUseGitIgnore(false);
+  config.setUseGitIgnore(true);
 
   return {
     markdownTemplateEngine: 'njk',

diff --git a/.gitignore b/.gitignore
@@ -174,5 +174,3 @@ $RECYCLE.BIN/
 
 # Windows shortcuts
 *.lnk
-
-/src/css/
diff --git a/package.json b/package.json
@@ -1,13 +1,4 @@
 {
-  "name": "cone-site",
-  "version": "1.0.0",
-  "author": "Cone (https://conedevelopment.com)",
-  "babel": {
-    "presets": [
-      "latest"
-    ]
-  },
-  "main": ".eleventy.js",
   "scripts": {
     "delete:dist": "del-cli --force dist",
     "dev:sass": "sass --load-path=node_modules --watch --no-source-map --update --style=expanded src/scss:src/css",

diff --git a/src/_data/navigation.json b/src/_data/navigation.json
@@ -119,6 +119,12 @@
         "external": false,
         "class": ""
       },
+      {
+        "caption": "Projektjeink",
+        "url": "/hu/projektjeink/",
+        "external": false,
+        "class": ""
+      },
       {
         "caption": "Blog",
         "url": "/hu/blog/",
@@ -202,11 +208,6 @@
             "caption": "Spruce CSS",
             "url": "https://sprucecss.com/",
             "external": true
-          },
-          {
-            "caption": "SimplePay x WooCommerce",
-            "url": "https://simplepay.conedevelopment.com/",
-            "external": true
           }
         ]
       }

diff --git a/src/_includes/layout/base.html b/src/_includes/layout/base.html
@@ -29,7 +29,7 @@
             {% include "partial/hreflang.html" %}
         {% endif %}
     </head>
-    <body>
+    <body class="page--{% if page.fileSlug %}{{ page.fileSlug }}{% else %}home{% endif %}">
         <a class="btn btn--primary skip-link" href="#content">Skip to content</a>
         {% include "partial/header.html" %}
 

diff --git a/src/_includes/layout/posts.html b/src/_includes/layout/posts.html
@@ -10,7 +10,7 @@
     {% set posts = collections[tag].reverse() %}
     {% set hero = {
         title: {
-            caption: 'Címke: <span class="highlighted">' + tag + '</span>'
+            caption: '<span class="highlighted">#' + tag + '</span>'
         },
         classes: 'hero--center hero--font-size:small hero--padding-block:small'
     } %}

diff --git a/src/_includes/layout/project.html b/src/_includes/layout/project.html
@@ -0,0 +1,7 @@
+{% extends "layout/base.html" %}
+
+{% block content %}
+    {% include "partial/hero.html" %}
+    {% include "partial/highlighted-text.html" %}
+    {% include "partial/list-reference.html" %}
+{% endblock %}
diff --git a/src/_includes/layout/services.html b/src/_includes/layout/services.html
@@ -3,6 +3,7 @@
 {% block content %}
     {% include "partial/hero.html" %}
     {% include "partial/testimonial.html" %}
+    {% include "partial/grid.html" %}
     {% include "partial/accordion.html" %}
     {% include "partial/cta.html" %}
 {% endblock %}
diff --git a/src/_includes/partial/accordion.html b/src/_includes/partial/accordion.html
@@ -21,8 +21,10 @@ <h2 class="section-title section-title--vertical">
                                 {% for item in block.items %}
                                     <div class="accordion-card">
                                         <h3 class="accordion-card__title">{{ item.title }}</h3>
-                                        <div class="accordion-card__content">
-                                            {{ item.description | safe }}
+                                        <div class="accordion-card__content" aria-hidden="true">
+                                            <div>
+                                                {{ item.description | safe }}
+                                            </div>
                                         </div>
                                     </div>
                                 {% endfor %}

diff --git a/src/_includes/partial/grid.html b/src/_includes/partial/grid.html
@@ -0,0 +1,29 @@
+{% if grid.items %}
+    <div class="l-grid">
+        <div class="container">
+            <div class="l-grid__inner">
+                {% if grid.title %}
+                    <h2 class="section-title">
+                        {% svgIcon grid.title.image %}
+                        {{ grid.title.caption | safe }}
+                    </h2>
+                {% endif %}
+                <div class="l-grid__body">
+                    {% for item in grid.items %}
+                        <div class="grid-card">
+                            <div class="grid-card__header">
+                                <div class="grid-card__icon">
+                                    {% svgIcon item.image %}
+                                </div>
+                                <h3 class="grid-card__title">{{ item.title }}</h3>
+                            </div>
+                            <div class="grid-card__content">
+                                {{ item.description | safe }}
+                            </div>
+                        </div>
+                    {% endfor %}
+                </div>
+            </div>
+        </div>
+    </div>
+{% endif %}
diff --git a/src/_includes/partial/highlighted-text.html b/src/_includes/partial/highlighted-text.html
@@ -1,17 +1,19 @@
-{% if highlighted.title %}
+{% if highlighted.description %}
     <div class="highlighted-text">
         <div class="container">
             <div class="highlighted-text__inner">
-                <h2 class="section-title section-title--vertical section-title--light">
-                    {% svgIcon highlighted.title.image %}
-                    {% if highlighted.title.url %}
-                        <a href="{{ highlighted.title.url }}" class="section-title__link">
-                    {% endif %}
-                        {{ highlighted.title.caption | safe }}
-                    {% if highlighted.title.url %}
-                        </a>
-                    {% endif %}
-                </h2>
+                {% if highlighted.title %}
+                    <h2 class="section-title section-title--vertical section-title--light">
+                        {% svgIcon highlighted.title.image %}
+                        {% if highlighted.title.url %}
+                            <a href="{{ highlighted.title.url }}" class="section-title__link">
+                        {% endif %}
+                            {{ highlighted.title.caption | safe }}
+                        {% if highlighted.title.url %}
+                            </a>
+                        {% endif %}
+                    </h2>
+                {% endif %}
                 {{ highlighted.description | safe }}
             </div>
         </div>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -174,5 +174,3 @@ $RECYCLE.BIN/

		# Windows shortcuts
		*.lnk

		/src/css/