Merge branch 'main' of github.com:JannexNet/SHX-Theme

assets/component-cart-drawer.css

@@ -332,6 +332,7 @@ cart-drawer-items {
 
 .cart-drawer .cart__checkout-button {
   max-width: none;
+  font-weight: 800;
 }
 
 .drawer__footer .cart__dynamic-checkout-buttons {

assets/section-contact-form.css

@@ -18,26 +18,38 @@
   .contact .field {
     margin-bottom: 2rem;
   }
-}
 
-.contact__button {
-  margin-top: 3rem;
-}
-
-.contact__button button {
-  width: 100%;
-}
-
-@media screen and (min-width: 750px) {
-  .contact__button {
-    margin-top: 4rem;
-  }
-}
-
-@media screen and (min-width: 750px) {
   .contact__fields {
     display: grid;
     grid-template-columns: repeat(2, 1fr);
     grid-column-gap: 2rem;
   }
 }
+/*
+.contact__button {
+  margin-top: 3rem;
+} */
+
+.contact__button button {
+  width: 100%;
+}
+
+/*
+@media screen and (min-width: 750px) {
+  .contact__button {
+    margin-top: 4rem;
+  }
+} */
+
+#shx-contact-form-contact-us-send {
+  width: 150px;
+  height: 150px;
+  margin: 0 auto;
+}
+
+@media screen and (min-width: 750px) {
+  #shx-contact-form-contact-us-send {
+    width: 250px;
+    height: 250px;
+  }
+}

config/settings_data.json

@@ -127,7 +127,7 @@
     "show_vendor": false,
     "show_cart_note": true,
     "cart_drawer_collection": "",
-    "cart_color_scheme": "scheme-1",
+    "cart_color_scheme": "scheme-2",
     "checkout_logo_image": "shopify:\/\/shop_images\/Frame_68.svg",
     "checkout_logo_position": "left",
     "checkout_accent_color": "#af9363",
@@ -358,10 +358,10 @@
       },
       "scheme-shx-navbar-figuren": {
         "settings": {
-          "background": "#A3CB38",
+          "background": "#a3cb38",
           "background_gradient": "",
           "text": "#121212",
-          "button": "#D980FA",
+          "button": "#d980fa",
           "button_label": "#ffffff",
           "secondary_button_label": "#121212",
           "shadow": "#121212"

locales/de.json

@@ -1,3 +1,12 @@
+/*
+* ------------------------------------------------------------
+* IMPORTANT: The contents of this file are auto-generated.
+*
+* This file may be updated by the Shopify admin language editor
+* or related systems. Please exercise caution as any changes
+* made to this file may be overwritten.
+* ------------------------------------------------------------
+*/
 {
   "general": {
     "password_page": {
@@ -7,7 +16,7 @@
       "login_form_password_placeholder": "Dein Passwort",
       "login_form_error": "Falsches Passwort!",
       "login_form_submit": "Eingeben",
-      "admin_link_html": "Bist du der Shop-Inhaber? <a href=\"/admin\" class=\"link underlined-link\">Hier einloggen</a>",
+      "admin_link_html": "Bist du der Shop-Inhaber? <a href=\"\/admin\" class=\"link underlined-link\">Hier einloggen<\/a>",
       "powered_by_shopify_html": "Dieser Shop wird unterstützt von {{ shopify }}"
     },
     "social": {
@@ -35,7 +44,10 @@
       "next": "Nächste Seite",
       "previous": "Vorherige Seite"
     },
-    "search": { "search": "Suchen", "reset": "Suchbegriff zurücksetzen" },
+    "search": {
+      "search": "Suchen",
+      "reset": "Suchbegriff zurücksetzen"
+    },
     "cart": {
       "view": "Warenkorb ansehen ({{ count }})",
       "item_added": "Artikel wurde in den Warenkorb gelegt",
@@ -114,7 +126,7 @@
         "minimum_of": "Mindestens {{ quantity }}",
         "maximum_of": "Maximal {{ quantity }}",
         "multiples_of": "In {{ quantity }}er Schritten",
-        "in_cart_html": "<span class=\"quantity-cart\">{{ quantity }}</span> im Warenkorb",
+        "in_cart_html": "<span class=\"quantity-cart\">{{ quantity }}<\/span> im Warenkorb",
         "note": "Mengenregeln anzeigen"
       },
       "price": {
@@ -134,8 +146,8 @@
         "view_store_info": "Shop-Informationen anzeigen",
         "check_other_stores": "Verfügbarkeit in anderen Shops überprüfen",
         "pick_up_available": "Abholung verfügbar",
-        "pick_up_available_at_html": "Abholung bei <span class=\"color-foreground\">{{ location_name }}</span> verfügbar",
-        "pick_up_unavailable_at_html": "Abholung bei <span class=\"color-foreground\">{{ location_name }}</span> derzeit nicht verfügbar",
+        "pick_up_available_at_html": "Abholung bei <span class=\"color-foreground\">{{ location_name }}<\/span> verfügbar",
+        "pick_up_unavailable_at_html": "Abholung bei <span class=\"color-foreground\">{{ location_name }}<\/span> derzeit nicht verfügbar",
         "unavailable": "Verfügbarkeit für Abholungen konnte nicht geladen werden",
         "refresh": "Aktualisieren"
       },
@@ -151,7 +163,7 @@
       },
       "view_full_details": "Vollständige Details anzeigen",
       "include_taxes": "inkl. MwSt.",
-      "shipping_policy_html": "<a href=\"{{ link }}\">Versand</a> wird beim Checkout berechnet",
+      "shipping_policy_html": "<a href=\"{{ link }}\">Versand<\/a> wird beim Checkout berechnet",
       "choose_options": "Optionen auswählen",
       "choose_product_options": "Optionen für {{ product_name }} auswählen",
       "value_unavailable": "{{ option_value }} – nicht verfügbar",
@@ -167,12 +179,14 @@
         "title": "Volumenabhängige Preisgestaltung",
         "note": "Volumenabhängige Preisgestaltung verfügbar",
         "minimum": "{{ quantity }}+",
-        "price_at_each": "bei {{ price }}/Stück",
+        "price_at_each": "bei {{ price }}\/Stück",
         "price_range": "{{ minimum }}–{{ maximum }}"
       },
       "product_variants": "Produktvarianten"
     },
-    "modal": { "label": "Medien-Galerie" },
+    "modal": {
+      "label": "Medien-Galerie"
+    },
     "facets": {
       "apply": "Anwenden",
       "clear": "Löschen",
@@ -239,7 +253,9 @@
       "suggestions": "Vorschläge",
       "pages": "Seiten"
     },
-    "cart": { "cart": "Warenkorb" },
+    "cart": {
+      "cart": "Warenkorb"
+    },
     "contact": {
       "form": {
         "name": "Name",
@@ -266,14 +282,14 @@
       "title": "Dein Warenkorb",
       "caption": "Artikel im Warenkorb",
       "remove_title": "{{ title }} entfernen",
-      "note": "Spezielle Bestellanweisungen",
+      "note": "Bestellhinweis hinzufügen",
       "checkout": "Zur Kasse",
       "empty": "Dein Warenkorb ist leer",
       "cart_error": "Beim Aktualisieren deines Warenkorbs ist ein Fehler aufgetreten. Bitte versuche es erneut.",
       "cart_quantity_error_html": "Du kannst deinem Warenkorb nur {{ quantity }} Stück dieses Artikels hinzufügen.",
-      "taxes_and_shipping_policy_at_checkout_html": "Steuern, Rabatte und <a href=\"{{ link }}\">Versand</a> werden beim Checkout berechnet",
+      "taxes_and_shipping_policy_at_checkout_html": "Steuern, Rabatte und <a href=\"{{ link }}\">Versand<\/a> werden beim Checkout berechnet",
       "taxes_included_but_shipping_at_checkout": "Inklusive Steuern, Versand und Rabatte werden beim Checkout berechnet",
-      "taxes_included_and_shipping_policy_html": "Inklusive Steuern. <a href=\"{{ link }}\">Versand</a> und Rabatte werden beim Checkout berechnet.",
+      "taxes_included_and_shipping_policy_html": "Inklusive Steuern. <a href=\"{{ link }}\">Versand<\/a> und Rabatte werden beim Checkout berechnet.",
       "taxes_and_shipping_at_checkout": "Steuern, Rabatte und Versand werden beim Checkout berechnet",
       "headings": {
         "product": "Produkt",
@@ -285,12 +301,14 @@
       "update": "Aktualisieren",
       "login": {
         "title": "Hast du ein Konto?",
-        "paragraph_html": "<a href=\"{{ link }}\" class=\"link underlined-link\">Logge dich ein</a>, damit es beim Checkout schneller geht."
+        "paragraph_html": "<a href=\"{{ link }}\" class=\"link underlined-link\">Logge dich ein<\/a>, damit es beim Checkout schneller geht."
       },
       "estimated_total": "Zwischensumme",
       "new_estimated_total": "Neuer geschätzter Gesamtbetrag"
     },
-    "footer": { "payment": "Zahlungsmethoden" },
+    "footer": {
+      "payment": "Zahlungsmethoden"
+    },
     "featured_blog": {
       "view_all": "Alle anzeigen",
       "onboarding_title": "Blog-Beitrag",
@@ -300,13 +318,17 @@
       "view_all": "Alle anzeigen",
       "view_all_label": "Alle Produkte in der Kategorie {{ collection_name }} anzeigen"
     },
-    "collection_list": { "view_all": "Alle anzeigen" },
+    "collection_list": {
+      "view_all": "Alle anzeigen"
+    },
     "collection_template": {
       "title": "Kategorie",
       "empty": "Keine Produkte gefunden",
-      "use_fewer_filters_html": "Verwende weniger Filter oder <a class=\"{{ class }}\" href=\"{{ link }}\">entferne alle</a>"
+      "use_fewer_filters_html": "Verwende weniger Filter oder <a class=\"{{ class }}\" href=\"{{ link }}\">entferne alle<\/a>"
+    },
+    "video": {
+      "load_video": "Video laden: {{ description }}"
     },
-    "video": { "load_video": "Video laden: {{ description }}" },
     "slideshow": {
       "load_slide": "Folie laden",
       "previous_slideshow": "Vorherige Folie",
@@ -316,7 +338,9 @@
       "carousel": "Karussell",
       "slide": "Folie"
     },
-    "page": { "title": "Seitentitel" },
+    "page": {
+      "title": "Seitentitel"
+    },
     "announcements": {
       "previous_announcement": "Vorherige Ankündigung",
       "next_announcement": "Nächste Ankündigung",
@@ -327,7 +351,7 @@
     "quick_order_list": {
       "product_total": "Produktzwischensumme",
       "view_cart": "Warenkorb ansehen",
-      "each": "{{ money }}/Stück",
+      "each": "{{ money }}\/Stück",
       "product": "Produkt",
       "variant": "Variante",
       "variant_total": "Varianten insgesamt",
@@ -348,13 +372,13 @@
     }
   },
   "localization": {
-    "country_label": "Land/Region",
+    "country_label": "Land\/Region",
     "language_label": "Sprache",
     "update_language": "Sprache aktualisieren",
-    "update_country": "Land/Region aktualisieren",
+    "update_country": "Land\/Region aktualisieren",
     "search": "Suchen",
-    "popular_countries_regions": "Beliebte Länder/Regionen",
-    "country_results_count": "{{ count }} Länder/Regionen gefunden"
+    "popular_countries_regions": "Beliebte Länder\/Regionen",
+    "country_results_count": "{{ count }} Länder\/Regionen gefunden"
   },
   "customer": {
     "account": {
@@ -383,8 +407,8 @@
       "address1": "Adresse 1",
       "address2": "Adresse 2",
       "city": "Ort",
-      "country": "Land/Region",
-      "province": "Bundesland/Provinz",
+      "country": "Land\/Region",
+      "province": "Bundesland\/Provinz",
       "zip": "PLZ",
       "phone": "Telefonnummer",
       "set_default": "Als Standard-Adresse festlegen",
@@ -498,7 +522,11 @@
       "collapsed": "Formular für den Empfänger des Geschenkgutscheins minimiert"
     }
   },
-  "shopify": { "links": { "powered_by_shopify": " " } },
+  "shopify": {
+    "links": {
+      "powered_by_shopify": " "
+    }
+  },
   "pagefly": {
     "products": {
       "product": {

sections/contact-form.liquid

@@ -18,10 +18,9 @@
   <div class="contact page-width page-width--narrow section-{{ section.id }}-padding">
     <div style="background-color: #fff; padding: 10px 20px 20px 20px; border-radius: 12px; box-shadow: 0 0 12px rgba(0, 0, 0, 0.1);">
       {%- if section.settings.heading != blank -%}
-        <h2 class="title title-wrapper--no-top-margin inline-richtext {{ section.settings.heading_size }}{% if settings.animations_reveal_on_scroll %} scroll-trigger animate--slide-in{% endif %}">
+        <h2 class="title title-wrapper--no-top-margin inline-richtext {{ section.settings.heading_size }}{% if settings.animations_reveal_on_scroll %} scroll-trigger animate--slide-in{% endif %}" style="text-align: center; margin-bottom: 0;">
           {{ section.settings.heading }}
         </h2>
-        <p>Fragen oder Anregungen? Wir freuen uns auf deine Nachricht!</p>
       {%- else -%}
         <h2 class="visually-hidden">{{ 'templates.contact.form.title' | t }}</h2>
       {%- endif -%}
@@ -33,6 +32,15 @@
       -%}
       {%- form 'contact', id: 'ContactForm', class: contact_form_class -%}
         {%- if form.posted_successfully? -%}
+          <dotlottie-player
+            id="shx-contact-form-contact-us-send"
+            src="{{ 'lottie_page_contact_us_send.lottie' | asset_url }}"
+            background="transparent"
+            speed="1"
+            autoplay
+            direction="1"
+            mode="bounce"></dotlottie-player>
+
           <h2 class="form-status form-status-list form__message" tabindex="-1" autofocus>
             {% render 'icon-success' %}
             {{ 'templates.contact.form.post_success' | t }}
@@ -52,102 +60,105 @@
               </a>
             </li>
           </ul>
-        {%- endif -%}
-        <div class="contact__fields">
+        {% else %}
+          <p style="text-align: center">Fragen oder Anregungen? Wir freuen uns auf deine Nachricht!</p>
+          
+          <div class="contact__fields">
+            <div class="field">
+              <input
+                class="field__input"
+                autocomplete="name"
+                type="text"
+                id="ContactForm-name"
+                name="contact[{{ 'templates.contact.form.name' | t }}]"
+                value="{% if form.name %}{{ form.name }}{% elsif customer %}{{ customer.name }}{% endif %}"
+                placeholder="{{ 'templates.contact.form.name' | t }}"
+              >
+              <label class="field__label" for="ContactForm-name">{{ 'templates.contact.form.name' | t }}</label>
+            </div>
+            <div class="field field--with-error">
+              <input
+                autocomplete="email"
+                type="email"
+                id="ContactForm-email"
+                class="field__input"
+                name="contact[email]"
+                spellcheck="false"
+                autocapitalize="off"
+                value="{% if form.email %}{{ form.email }}{% elsif customer %}{{ customer.email }}{% endif %}"
+                aria-required="true"
+                {% if form.errors contains 'email' %}
+                  aria-invalid="true"
+                  aria-describedby="ContactForm-email-error"
+                {% endif %}
+                placeholder="{{ 'templates.contact.form.email' | t }}"
+              >
+              <label class="field__label" for="ContactForm-email">
+                {{- 'templates.contact.form.email' | t }}
+                <span aria-hidden="true">*</span></label
+              >
+              {%- if form.errors contains 'email' -%}
+                <small class="contact__field-error" id="ContactForm-email-error">
+                  <span class="visually-hidden">{{ 'accessibility.error' | t }}</span>
+                  <span class="form__message">
+                    {%- render 'icon-error' -%}
+                    {{- form.errors.translated_fields.email | capitalize }}
+                    {{ form.errors.messages.email -}}
+                  </span>
+                </small>
+              {%- endif -%}
+            </div>
+          </div>
+          {% comment %}
           <div class="field">
             <input
+              type="tel"
+              id="ContactForm-phone"
               class="field__input"
-              autocomplete="name"
-              type="text"
-              id="ContactForm-name"
-              name="contact[{{ 'templates.contact.form.name' | t }}]"
-              value="{% if form.name %}{{ form.name }}{% elsif customer %}{{ customer.name }}{% endif %}"
-              placeholder="{{ 'templates.contact.form.name' | t }}"
+              autocomplete="tel"
+              name="contact[{{ 'templates.contact.form.phone' | t }}]"
+              pattern="[0-9\-]*"
+              value="{% if form.phone %}{{ form.phone }}{% elsif customer %}{{ customer.phone }}{% endif %}"
+              placeholder="{{ 'templates.contact.form.phone' | t }}"
             >
-            <label class="field__label" for="ContactForm-name">{{ 'templates.contact.form.name' | t }}</label>
+            <label class="field__label" for="ContactForm-phone">{{ 'templates.contact.form.phone' | t }}</label>
           </div>
-          <div class="field field--with-error">
-            <input
-              autocomplete="email"
-              type="email"
-              id="ContactForm-email"
-              class="field__input"
-              name="contact[email]"
-              spellcheck="false"
-              autocapitalize="off"
-              value="{% if form.email %}{{ form.email }}{% elsif customer %}{{ customer.email }}{% endif %}"
-              aria-required="true"
-              {% if form.errors contains 'email' %}
-                aria-invalid="true"
-                aria-describedby="ContactForm-email-error"
-              {% endif %}
-              placeholder="{{ 'templates.contact.form.email' | t }}"
-            >
-            <label class="field__label" for="ContactForm-email">
-              {{- 'templates.contact.form.email' | t }}
-              <span aria-hidden="true">*</span></label
-            >
-            {%- if form.errors contains 'email' -%}
-              <small class="contact__field-error" id="ContactForm-email-error">
-                <span class="visually-hidden">{{ 'accessibility.error' | t }}</span>
-                <span class="form__message">
-                  {%- render 'icon-error' -%}
-                  {{- form.errors.translated_fields.email | capitalize }}
-                  {{ form.errors.messages.email -}}
-                </span>
-              </small>
-            {%- endif -%}
+          {% endcomment %}
+          <div class="field">
+            <select id="ContactForm-reason" name="contact[reason]" class="field__input" style="height: 60px">
+              <option value="allgemein">Allgemein</option>
+              <option value="feedback">Feedback</option>
+              <option value="einProblemMelden">Ein Problem melden</option>
+              <option value="erstattungOderRabattBeantragen">Erstattung oder Rabatt beantragen</option>
+              <option value="produktfrage">Produktfrage</option>
+              <option value="sonderanfertigung">Sonderanfertigung</option>
+              <option value="kooperationAnfragen">Kooperation anfragen</option>
+              <option value="sonstiges">Sonstiges</option>
+            </select>
+            <label class="form__label field__label" for="ContactForm-reason">
+              Betreff
+            </label>
           </div>
-        </div>
-        {% comment %}
-        <div class="field">
-          <input
-            type="tel"
-            id="ContactForm-phone"
-            class="field__input"
-            autocomplete="tel"
-            name="contact[{{ 'templates.contact.form.phone' | t }}]"
-            pattern="[0-9\-]*"
-            value="{% if form.phone %}{{ form.phone }}{% elsif customer %}{{ customer.phone }}{% endif %}"
-            placeholder="{{ 'templates.contact.form.phone' | t }}"
-          >
-          <label class="field__label" for="ContactForm-phone">{{ 'templates.contact.form.phone' | t }}</label>
-        </div>
-        {% endcomment %}
-        <div class="field">
-          <select id="ContactForm-reason" name="contact[reason]" class="field__input" style="height: 60px">
-            <option value="allgemein">Allgemein</option>
-            <option value="feedback">Feedback</option>
-            <option value="einProblemMelden">Ein Problem melden</option>
-            <option value="erstattungOderRabattBeantragen">Erstattung oder Rabatt beantragen</option>
-            <option value="produktfrage">Produktfrage</option>
-            <option value="sonderanfertigung">Sonderanfertigung</option>
-            <option value="kooperationAnfragen">Kooperation anfragen</option>
-            <option value="sonstiges">Sonstiges</option>
-          </select>
-          <label class="form__label field__label" for="ContactForm-reason">
-            Betreff
-          </label>
-        </div>
-        <div class="field">
-          <textarea
-            rows="10"
-            id="ContactForm-body"
-            class="text-area field__input"
-            name="contact[{{ 'templates.contact.form.comment' | t }}]"
-            placeholder="{{ 'templates.contact.form.comment' | t }}"
-          >
-            {{- form.body -}}
-          </textarea>
-          <label class="form__label field__label" for="ContactForm-body">
-            {{- 'templates.contact.form.comment' | t -}}
-          </label>
-        </div>
-        <div class="contact__button">
-          <button type="submit" class="button">
-            {{ 'templates.contact.form.send' | t }}
-          </button>
-        </div>
+          <div class="field">
+            <textarea
+              rows="10"
+              id="ContactForm-body"
+              class="text-area field__input"
+              name="contact[{{ 'templates.contact.form.comment' | t }}]"
+              placeholder="{{ 'templates.contact.form.comment' | t }}"
+            >
+              {{- form.body -}}
+            </textarea>
+            <label class="form__label field__label" for="ContactForm-body">
+              {{- 'templates.contact.form.comment' | t -}}
+            </label>
+          </div>
+          <div class="contact__button">
+            <button type="submit" class="button">
+              {{ 'templates.contact.form.send' | t }}
+            </button>
+          </div>
+        {%- endif -%}
       {%- endform -%}
     </div>
   </div>

sections/main-404.liquid

@@ -12,7 +12,6 @@
 
 <div class="template-404 page-width page-margin center">
   <dotlottie-player
-    id="SHX-feedback-modal-lottie2"
     src="{{ 'lottie_404.lottie' | asset_url }}"
     background="transparent"
     speed="1"

snippets/cart-drawer.liquid

@@ -86,10 +86,6 @@
           {% assign progress_percentage = 100 %}
         {% endif %}
 
-        <script>
-          console.log("cart39", {{ cart | json }}, {{ remaining_amount }}, {{ free_shipping_threshold }}, {{ progress_percentage }}, {{ total_price }}, {{ free_shipping_threshold }}, {{ total_price | times: 100 | divided_by: free_shipping_threshold }})
-        </script>
-
         <div style="padding: 12px 12px 0 12px; margin-bottom: 20px; background-color: #deecde; text-align: center;">
           <span span style="font-size: 14px; color: #4B7046">
             {% if total_price < free_shipping_threshold %}  

templates/product.json

@@ -62,6 +62,7 @@
         },
         "icon_with_text_yXXnBb": {
           "type": "icon-with-text",
+          "disabled": true,
           "settings": {
             "layout": "vertical",
             "icon_1": "heart",