wip avec résolution de conflits
This commit is contained in:
parent
63b2d2b256
commit
ef19ba2b72
208 changed files with 178625 additions and 192002 deletions
|
|
@ -7,7 +7,7 @@
|
|||
<div class="storytelling">
|
||||
<div class="storytelling__conteneur">
|
||||
{{
|
||||
images.genere_source_img_multi_formats("#{ site.theme.link }/assets/img/about/haikuabout", '', dimensions_image[0], dimensions_image[1], '')
|
||||
images.genere_source_img_multi_formats("#{ site.theme.link }/assets/img/about/haikuabout", 'A montage of many different pictures/drawings of jewelry and of someone working.', image_dimensions[0], image_dimensions[1], 'storytelling-montage')
|
||||
}}
|
||||
|
||||
{# Épingles #}
|
||||
|
|
@ -23,7 +23,7 @@
|
|||
role="presentation"
|
||||
src="{{ site.theme.link }}/assets/img/icons/aboutlclick-black.svg"
|
||||
width="82"
|
||||
>
|
||||
/>
|
||||
</button>
|
||||
|
||||
<button
|
||||
|
|
@ -38,7 +38,7 @@
|
|||
role="presentation"
|
||||
src="{{ site.theme.link }}/assets/img/icons/aboutlclick-black.svg"
|
||||
width="82"
|
||||
>
|
||||
/>
|
||||
</button>
|
||||
|
||||
<button
|
||||
|
|
@ -53,7 +53,7 @@
|
|||
role="presentation"
|
||||
src="{{ site.theme.link }}/assets/img/icons/aboutlclick-black.svg"
|
||||
width="82"
|
||||
>
|
||||
/>
|
||||
</button>
|
||||
|
||||
<button
|
||||
|
|
@ -68,7 +68,7 @@
|
|||
role="presentation"
|
||||
src="{{ site.theme.link }}/assets/img/icons/aboutlclick-black.svg"
|
||||
width="82"
|
||||
>
|
||||
/>
|
||||
</button>
|
||||
|
||||
<button
|
||||
|
|
@ -83,7 +83,7 @@
|
|||
role="presentation"
|
||||
src="{{ site.theme.link }}/assets/img/icons/aboutlclick-black.svg"
|
||||
width="82"
|
||||
>
|
||||
/>
|
||||
</button>
|
||||
|
||||
<button
|
||||
|
|
@ -98,7 +98,7 @@
|
|||
role="presentation"
|
||||
src="{{ site.theme.link }}/assets/img/icons/aboutlclick-black.svg"
|
||||
width="82"
|
||||
>
|
||||
/>
|
||||
</button>
|
||||
|
||||
{# Boîtes de texte #}
|
||||
|
|
@ -116,7 +116,7 @@
|
|||
role="presentation"
|
||||
src="{{ site.theme.link }}/assets/img/icons/cross.svg"
|
||||
width="20"
|
||||
>
|
||||
/>
|
||||
</button>
|
||||
|
||||
<p>
|
||||
|
|
@ -141,7 +141,7 @@
|
|||
role="presentation"
|
||||
src="{{ site.theme.link }}/assets/img/icons/cross.svg"
|
||||
width="20"
|
||||
>
|
||||
/>
|
||||
</button>
|
||||
|
||||
<p>
|
||||
|
|
@ -168,7 +168,7 @@
|
|||
role="presentation"
|
||||
src="{{ site.theme.link }}/assets/img/icons/cross.svg"
|
||||
width="20"
|
||||
>
|
||||
/>
|
||||
</button>
|
||||
|
||||
<p>
|
||||
|
|
@ -196,7 +196,7 @@
|
|||
role="presentation"
|
||||
src="{{ site.theme.link }}/assets/img/icons/cross.svg"
|
||||
width="20"
|
||||
>
|
||||
/>
|
||||
</button>
|
||||
|
||||
<p>Here you can see some of the tools used at the studio.</p>
|
||||
|
|
@ -223,7 +223,7 @@
|
|||
role="presentation"
|
||||
src="{{ site.theme.link }}/assets/img/icons/cross.svg"
|
||||
width="20"
|
||||
>
|
||||
/>
|
||||
</button>
|
||||
|
||||
<p>
|
||||
|
|
@ -254,7 +254,7 @@
|
|||
role="presentation"
|
||||
src="{{ site.theme.link }}/assets/img/icons/cross.svg"
|
||||
width="20"
|
||||
>
|
||||
/>
|
||||
</button>
|
||||
|
||||
<p>
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
alt="An arrow pointing to the top"
|
||||
aria-hidden="true"
|
||||
src="{{ site.theme.link }}/assets/img/icons/arrow.svg"
|
||||
>
|
||||
/>
|
||||
<span
|
||||
class="visuellement-cache"
|
||||
id="bouton-retour-haut-label"
|
||||
|
|
|
|||
|
|
@ -4,12 +4,13 @@
|
|||
{{ include('parts/en-tetes-backend.twig') }}
|
||||
|
||||
<script id="injection">
|
||||
// Injection d'états pour les Scripts de la page.
|
||||
// dprint-ignore-file
|
||||
// Injection d'états pour les Scripts de la page.
|
||||
|
||||
const _etats = {
|
||||
authString: "{{ auth_string }}",
|
||||
nonce: "{{ nonce_wc }}",
|
||||
};
|
||||
const _etats = {
|
||||
authString: "{{ auth_string }}",
|
||||
nonce: "{{ nonce_wc }}",
|
||||
};
|
||||
</script>
|
||||
{% endblock head %}
|
||||
|
||||
|
|
|
|||
|
|
@ -91,8 +91,8 @@
|
|||
<p>
|
||||
Haiku Atelier jewelry are guarantee for a year. If your piece unexpectedly broke or loses its gold color
|
||||
within a year, you can send it back to us and we will repair it for free, you will just have to organize
|
||||
your own shipping label (our workshop is located in Brussels).<br> We still provide after sale services past
|
||||
the guarantee year, the price of those services will be determined depending on each case.
|
||||
your own shipping label (our workshop is located in Brussels).<br /> We still provide after sale services
|
||||
past the guarantee year, the price of those services will be determined depending on each case.
|
||||
</p>
|
||||
</section>
|
||||
|
||||
|
|
@ -136,7 +136,7 @@
|
|||
</p>
|
||||
|
||||
<p>
|
||||
The site uses the 3D Secure payment system to prevent fraud.<br>
|
||||
The site uses the 3D Secure payment system to prevent fraud.<br />
|
||||
Customers can pay for their purchase order:
|
||||
</p>
|
||||
|
||||
|
|
@ -154,15 +154,15 @@
|
|||
<p>
|
||||
International deliveries are subject to import charges, duties, taxes, or fees of the destination country.
|
||||
These funds are set by the government of that country, in accordance with import/export regulations, and
|
||||
billed by the courier. Haiku Atelier is not responsible for these duties, taxes, or other charges.<br> If a
|
||||
package is returned because a customer has refused to pay any import taxes or customs duties owed, the
|
||||
billed by the courier. Haiku Atelier is not responsible for these duties, taxes, or other charges.<br /> If
|
||||
a package is returned because a customer has refused to pay any import taxes or customs duties owed, the
|
||||
package refund will not include shipping and return costs.
|
||||
</p>
|
||||
|
||||
<p>
|
||||
Haiku Atelier is the exclusive owner of all intellectual property rights or holds the rights of use relating
|
||||
to both the structure and the content of the site. The GTCU are subject to French law, regardless of the
|
||||
country of residence of the user and the place of placing the purchase order.<br>In the absence of an
|
||||
country of residence of the user and the place of placing the purchase order.<br />In the absence of an
|
||||
amicable agreement, any dispute will be submitted to the competent French courts.
|
||||
</p>
|
||||
</section>
|
||||
|
|
@ -173,7 +173,7 @@
|
|||
</header>
|
||||
|
||||
<p>
|
||||
<strong>Contact:</strong><br>
|
||||
<strong>Contact:</strong><br />
|
||||
For inquiries and customer service, please refer to <a
|
||||
class="lien-lien"
|
||||
href="/contact"
|
||||
|
|
@ -181,8 +181,8 @@
|
|||
</p>
|
||||
|
||||
<p>
|
||||
<strong>Credits:</strong><br>
|
||||
Webdesign by Manon Designere.<br>
|
||||
<strong>Credits:</strong><br />
|
||||
Webdesign by Manon Designere.<br />
|
||||
Development by Gauthier Colin--Haag.
|
||||
</p>
|
||||
</section>
|
||||
|
|
|
|||
|
|
@ -3,19 +3,19 @@
|
|||
<source
|
||||
srcset="{{ rel_url }}.jxl"
|
||||
type="image/jxl"
|
||||
>
|
||||
/>
|
||||
<source
|
||||
srcset="{{ rel_url }}.avif"
|
||||
type="image/avif"
|
||||
>
|
||||
/>
|
||||
<source
|
||||
srcset="{{ rel_url }}.webp"
|
||||
type="image/webp"
|
||||
>
|
||||
/>
|
||||
<source
|
||||
srcset="{{ rel_url }}.png"
|
||||
type="image/png"
|
||||
>
|
||||
/>
|
||||
|
||||
<img
|
||||
alt="{{ alt }}"
|
||||
|
|
@ -25,6 +25,6 @@
|
|||
src="{{ rel_url }}.jpg"
|
||||
width="{{ width }}"
|
||||
onload="this.style.opacity = 1"
|
||||
>
|
||||
/>
|
||||
</picture>
|
||||
{% endmacro %}
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
{% block head %}
|
||||
<script id="injection">
|
||||
// Injection d'états pour les Scripts de la page.
|
||||
// Injection d'états pour les Scripts de la page.
|
||||
|
||||
const _etats = {
|
||||
nonce: "{{ nonce_wc }}",
|
||||
authString: "{{ auth_string }}",
|
||||
};
|
||||
const _etats = {
|
||||
nonce: "{{ nonce_wc }}",
|
||||
authString: "{{ auth_string }}",
|
||||
};
|
||||
</script>
|
||||
{% endblock head %}
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
loading="eager"
|
||||
src="{{ site.theme.link }}/assets/img/logos/logo-v2-text.svg"
|
||||
width="307"
|
||||
>
|
||||
/>
|
||||
</div>
|
||||
|
||||
{# TODO: Utiliser un Menu WordPress ? #}
|
||||
|
|
@ -97,7 +97,7 @@
|
|||
decoding="async"
|
||||
loading="eager"
|
||||
src="{{ site.theme.link }}/assets/img/logos/logo-lines.svg"
|
||||
>
|
||||
/>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,39 +1,39 @@
|
|||
<head>
|
||||
<meta charset="{{ site.charset }}">
|
||||
<meta charset="{{ site.charset }}" />
|
||||
<meta
|
||||
name="description"
|
||||
content="{{ site.description }}"
|
||||
>
|
||||
/>
|
||||
<meta
|
||||
name="viewport"
|
||||
content="width=device-width, initial-scale=1"
|
||||
>
|
||||
/>
|
||||
|
||||
{# Pinterest #}
|
||||
<meta
|
||||
name="p:domain_verify"
|
||||
content="98fed4c924501d2f2a90c5b37e165085"
|
||||
>
|
||||
/>
|
||||
|
||||
{# Favicon #}
|
||||
<link
|
||||
rel="apple-touch-icon"
|
||||
href="{{ site.theme.link }}/assets/img/apple-touch-icon.png"
|
||||
>
|
||||
/>
|
||||
<link
|
||||
rel="icon"
|
||||
href="{{ site.theme.link }}/assets/img/favicon.ico"
|
||||
sizes="48x48"
|
||||
>
|
||||
/>
|
||||
<link
|
||||
rel="icon"
|
||||
href="{{ site.theme.link }}/assets/img/favicon.svg"
|
||||
type="image/svg+xml"
|
||||
>
|
||||
/>
|
||||
<link
|
||||
rel="manifest"
|
||||
href="{{ site.theme.link }}/assets/site.webmanifest"
|
||||
>
|
||||
/>
|
||||
|
||||
{# Préchargements #}
|
||||
<link
|
||||
|
|
@ -41,21 +41,21 @@
|
|||
href="{{ site.theme.link }}/assets/img/icons/cloud-gris.svg"
|
||||
rel="preload"
|
||||
type="image/svg+xml"
|
||||
>
|
||||
/>
|
||||
<link
|
||||
as="font"
|
||||
crossorigin
|
||||
href="{{ site.theme.link }}/assets/fonts/lato/lato-variable-webfont.woff2"
|
||||
rel="preload"
|
||||
type="font/woff2"
|
||||
>
|
||||
/>
|
||||
<link
|
||||
as="font"
|
||||
crossorigin
|
||||
href="{{ site.theme.link }}/assets/fonts/lato/lato-variable-italic-webfont.woff2"
|
||||
rel="preload"
|
||||
type="font/woff2"
|
||||
>
|
||||
/>
|
||||
|
||||
{# Plausible #}
|
||||
{% if environnement == 'production' %}
|
||||
|
|
|
|||
|
|
@ -20,13 +20,13 @@
|
|||
height="18"
|
||||
src="{{ site.theme.link }}/assets/img/paypal/logo-paypal.svg"
|
||||
width="13.48"
|
||||
>
|
||||
/>
|
||||
<img
|
||||
alt="PayPal"
|
||||
height="18"
|
||||
src="{{ site.theme.link }}/assets/img/paypal/titre-paypal.svg"
|
||||
width="67.69"
|
||||
>
|
||||
/>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
|
|
@ -41,7 +41,7 @@
|
|||
id="separation-adresses"
|
||||
name="separation-adresses"
|
||||
type="checkbox"
|
||||
>
|
||||
/>
|
||||
<label for="separation-adresses">Use a separate billing address</label>
|
||||
</div>
|
||||
|
||||
|
|
@ -59,7 +59,7 @@
|
|||
required
|
||||
type="text"
|
||||
value="{{ adresse_livraison.first_name }}"
|
||||
>
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div class="formulaire__champs__champ">
|
||||
|
|
@ -72,7 +72,7 @@
|
|||
required
|
||||
type="text"
|
||||
value="{{ adresse_livraison.last_name }}"
|
||||
>
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div class="formulaire__champs__champ">
|
||||
|
|
@ -84,7 +84,7 @@
|
|||
required
|
||||
type="text"
|
||||
value="{{ adresse_livraison.address_1 }}"
|
||||
>
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div class="formulaire__champs__champ">
|
||||
|
|
@ -96,7 +96,7 @@
|
|||
required
|
||||
type="text"
|
||||
value="{{ adresse_livraison.postcode }}"
|
||||
>
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div class="formulaire__champs__champ">
|
||||
|
|
@ -109,7 +109,7 @@
|
|||
required
|
||||
type="text"
|
||||
value="{{ adresse_livraison.city }}"
|
||||
>
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div class="formulaire__champs__champ">
|
||||
|
|
@ -121,7 +121,7 @@
|
|||
placeholder="If applicable"
|
||||
type="text"
|
||||
value="{{ adresse_livraison.state }}"
|
||||
>
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div class="formulaire__champs__champ">
|
||||
|
|
@ -152,7 +152,7 @@
|
|||
required
|
||||
type="tel"
|
||||
value="{{ adresse_livraison.phone }}"
|
||||
>
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div class="formulaire__champs__champ">
|
||||
|
|
@ -165,7 +165,7 @@
|
|||
required
|
||||
type="email"
|
||||
value="{{ email }}"
|
||||
>
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -188,7 +188,7 @@
|
|||
required
|
||||
type="text"
|
||||
value="{{ adresse_facturation.first_name }}"
|
||||
>
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div class="formulaire__champs__champ">
|
||||
|
|
@ -202,7 +202,7 @@
|
|||
required
|
||||
type="text"
|
||||
value="{{ adresse_facturation.last_name }}"
|
||||
>
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div class="formulaire__champs__champ">
|
||||
|
|
@ -215,7 +215,7 @@
|
|||
required
|
||||
type="text"
|
||||
value="{{ adresse_facturation.address_1 }}"
|
||||
>
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div class="formulaire__champs__champ">
|
||||
|
|
@ -228,7 +228,7 @@
|
|||
required
|
||||
type="text"
|
||||
value="{{ adresse_facturation.postcode }}"
|
||||
>
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div class="formulaire__champs__champ">
|
||||
|
|
@ -242,7 +242,7 @@
|
|||
required
|
||||
type="text"
|
||||
value="{{ adresse_facturation.city }}"
|
||||
>
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div class="formulaire__champs__champ">
|
||||
|
|
@ -255,7 +255,7 @@
|
|||
placeholder="If applicable"
|
||||
type="text"
|
||||
value="{{ adresse_facturation.state }}"
|
||||
>
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div class="formulaire__champs__champ">
|
||||
|
|
@ -287,7 +287,7 @@
|
|||
required
|
||||
type="tel"
|
||||
value="{{ adresse_facturation.phone }}"
|
||||
>
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div class="formulaire__champs__champ">
|
||||
|
|
@ -301,7 +301,7 @@
|
|||
required
|
||||
type="email"
|
||||
value="{{ email }} "
|
||||
>
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -336,7 +336,7 @@
|
|||
id="paiement-stripe"
|
||||
name="type-paiement"
|
||||
type="radio"
|
||||
>
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
{# Affiche tous les attributs relevants pour la variation choisie #}
|
||||
{% for attribut in produit.attributs %}
|
||||
{% if attribut.valeur %}
|
||||
{{ attribut.nom }}: <strong>{{ attribut.valeur }}</strong><br>
|
||||
{{ attribut.nom }}: <strong>{{ attribut.valeur }}</strong><br />
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
{# Affiche le nom de la Variation #}
|
||||
|
|
@ -50,7 +50,7 @@
|
|||
min="1"
|
||||
type="number"
|
||||
value="{{ produit.quantite }}"
|
||||
>
|
||||
/>
|
||||
<button
|
||||
class="detail-produit__actions__addition"
|
||||
type="button"
|
||||
|
|
@ -100,7 +100,7 @@
|
|||
placeholder="Discount code or gift card"
|
||||
type="text"
|
||||
value="{{ code_promo ? code_promo }}"
|
||||
>
|
||||
/>
|
||||
<button
|
||||
class="bouton-blanc-sur-noir"
|
||||
for="code-promo"
|
||||
|
|
@ -164,7 +164,7 @@
|
|||
name="choix-methode-livraison"
|
||||
type="radio"
|
||||
value="{{ methode_livraison.id }}"
|
||||
>
|
||||
/>
|
||||
<label for="methode-livraison-{{ methode_livraison.id }}">{{ methode_livraison.titre }} ({{
|
||||
methode_livraison.prix
|
||||
}}€)</label>
|
||||
|
|
@ -173,7 +173,7 @@
|
|||
</fieldset>
|
||||
|
||||
<p class="panneau__sous-totaux__conditions-livraison">
|
||||
Belgium and France: free shipping on orders above 50€ (Pickup Point only).<br>
|
||||
Belgium and France: free shipping on orders above 50€ (Pickup Point only).<br />
|
||||
Worldwide: free shipping on orders above 100€.
|
||||
</p>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -3,27 +3,27 @@
|
|||
data-page="1"
|
||||
{% if id_categorie_produits %}data-id-categorie-produits="{{ id_categorie_produits }}"{% endif %}
|
||||
>
|
||||
{% if produits|length > 0 %}
|
||||
{% for produit in produits %}
|
||||
{% if products|length > 0 %}
|
||||
{% for product in products %}
|
||||
{# TODO: Trouver une meilleure arborescence et des noms de classe #}
|
||||
<article class="produit">
|
||||
<figure role="figure">
|
||||
<a href="{{ produit.url }}">
|
||||
<a href="{{ product.url }}">
|
||||
<picture class="produit__illustration produit__illustration__principale">
|
||||
{{ produit.photo_repos }}
|
||||
{{ product.default_photo }}
|
||||
</picture>
|
||||
|
||||
<picture class="produit__illustration produit__illustration__survol">
|
||||
{{ produit.photo_survol }}
|
||||
{{ product.hover_photo }}
|
||||
</picture>
|
||||
</a>
|
||||
|
||||
<figcaption class="produit__textuel">
|
||||
<h3 class="produit__textuel__titre">
|
||||
<a href="{{ produit.url }}">{{ produit.nom }}</a>
|
||||
<a href="{{ product.url }}">{{ product.name }}</a>
|
||||
</h3>
|
||||
<p class="produit__textuel__prix">
|
||||
{{ produit.prix ? "#{produit.prix}€" : produit.prix }}
|
||||
{{ product.price ? "#{product.price}€" : product.price }}
|
||||
</p>
|
||||
</figcaption>
|
||||
</figure>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
{% block head %}
|
||||
<script id="injection">
|
||||
// dprint-ignore-file
|
||||
// dprint-ignore-file
|
||||
// Injection d'états pour les Scripts de la page.
|
||||
|
||||
/**
|
||||
|
|
@ -23,7 +23,6 @@
|
|||
id="product-json"
|
||||
type="application/json"
|
||||
>
|
||||
// dprint-ignore
|
||||
{{ product_json }}
|
||||
</script>
|
||||
{% endblock head %}
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@
|
|||
{# Affiche tous les attributs relevants pour la variation choisie #}
|
||||
{% if produit.attribut|length > 0 %}
|
||||
{% for attribut in produit.attribut %}
|
||||
{{ attribut.nom }}: <strong>{{ attribut.valeur }}</strong><br>
|
||||
{{ attribut.nom }}: <strong>{{ attribut.valeur }}</strong><br />
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
qty: <strong>{{ produit.quantite }}</strong>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue