diff --git a/app/assets/fonts/inclusive-sans/InclusiveSans-Bold.woff b/app/assets/fonts/inclusive-sans/InclusiveSans-Bold.woff new file mode 100644 index 0000000000000000000000000000000000000000..944edc3063a6e744b010a614862f47de1dd7f790 Binary files /dev/null and b/app/assets/fonts/inclusive-sans/InclusiveSans-Bold.woff differ diff --git a/app/assets/fonts/inclusive-sans/InclusiveSans-Bold.woff2 b/app/assets/fonts/inclusive-sans/InclusiveSans-Bold.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..7802821361e5e1c67e8f86dce951444f18335038 Binary files /dev/null and b/app/assets/fonts/inclusive-sans/InclusiveSans-Bold.woff2 differ diff --git a/app/assets/fonts/inclusive-sans/InclusiveSans-BoldItalic.woff b/app/assets/fonts/inclusive-sans/InclusiveSans-BoldItalic.woff new file mode 100644 index 0000000000000000000000000000000000000000..37f526b2d936a050314f752d4b96df20ca833d58 Binary files /dev/null and b/app/assets/fonts/inclusive-sans/InclusiveSans-BoldItalic.woff differ diff --git a/app/assets/fonts/inclusive-sans/InclusiveSans-BoldItalic.woff2 b/app/assets/fonts/inclusive-sans/InclusiveSans-BoldItalic.woff2 new file mode 100644 index 0000000000000000000000000000000000000000..2456c5eb95198c48efb0a817a75a9cf633e17efe Binary files /dev/null and b/app/assets/fonts/inclusive-sans/InclusiveSans-BoldItalic.woff2 differ diff --git a/app/assets/fonts/inclusive-sans/InclusiveSans-Italic.woff b/app/assets/fonts/inclusive-sans/InclusiveSans-Italic.woff index 892926db40968738b6ac91d912c48ef5cd3e4c0e..2dc47cd9856293e69a8187cf1353c0d08687e652 100644 Binary files a/app/assets/fonts/inclusive-sans/InclusiveSans-Italic.woff and b/app/assets/fonts/inclusive-sans/InclusiveSans-Italic.woff differ diff --git a/app/assets/fonts/inclusive-sans/InclusiveSans-Italic.woff2 b/app/assets/fonts/inclusive-sans/InclusiveSans-Italic.woff2 index 1d9c22feead7510545574961834cb225e3b49509..60ef3c648baeb0147cea4f909a5a223b214f15fb 100644 Binary files a/app/assets/fonts/inclusive-sans/InclusiveSans-Italic.woff2 and b/app/assets/fonts/inclusive-sans/InclusiveSans-Italic.woff2 differ diff --git a/app/assets/fonts/inclusive-sans/InclusiveSans-Regular.woff b/app/assets/fonts/inclusive-sans/InclusiveSans-Regular.woff index fe55237c51d7d51164dee99747f63b9831c689b4..3d116fe1c03e2fa102499691c6fee62c99e11c3a 100644 Binary files a/app/assets/fonts/inclusive-sans/InclusiveSans-Regular.woff and b/app/assets/fonts/inclusive-sans/InclusiveSans-Regular.woff differ diff --git a/app/assets/fonts/inclusive-sans/InclusiveSans-Regular.woff2 b/app/assets/fonts/inclusive-sans/InclusiveSans-Regular.woff2 index 556bb703b005911273f654d9eeb19d37f5890e9d..01b2019a58a036d64a3b7f746c9884e2151ca790 100644 Binary files a/app/assets/fonts/inclusive-sans/InclusiveSans-Regular.woff2 and b/app/assets/fonts/inclusive-sans/InclusiveSans-Regular.woff2 differ diff --git a/app/assets/stylesheets/admin/design-system/fonts.sass b/app/assets/stylesheets/admin/design-system/fonts.sass index a79ca4dcb2dbc58030ebb1e1174c54e215518b75..b7e893aa2613567ada3ded122db25a0de066208f 100644 --- a/app/assets/stylesheets/admin/design-system/fonts.sass +++ b/app/assets/stylesheets/admin/design-system/fonts.sass @@ -14,6 +14,20 @@ font-weight: normal src: asset-url("inclusive-sans/InclusiveSans-Italic.woff2") format("woff2"), url("inclusive-sans/InclusiveSans-Italic.woff") format("woff") +@font-face + font-display: swap + font-family: 'InclusiveSans' + font-style: normal + font-weight: bold + src: asset-url("inclusive-sans/InclusiveSans-Bold.woff2") format("woff2"), url("inclusive-sans/InclusiveSans-Bold.woff") format("woff") + +@font-face + font-display: swap + font-family: 'InclusiveSans' + font-style: italic + font-weight: bold + src: asset-url("inclusive-sans/InclusiveSans-BoldItalic.woff2") format("woff2"), url("inclusive-sans/InclusiveSans-BoldItalic.woff") format("woff") + // Adelphe @font-face diff --git a/app/views/admin/communication/blocks/templates/contact/_snippet.html.erb b/app/views/admin/communication/blocks/templates/contact/_snippet.html.erb index ed0db32e5dbd25dcabf150aa3ee3b971fe24d268..c031194a70765b44ede05ab81cecfb9f22ab5c71 100644 --- a/app/views/admin/communication/blocks/templates/contact/_snippet.html.erb +++ b/app/views/admin/communication/blocks/templates/contact/_snippet.html.erb @@ -1,12 +1,17 @@ <address itemscope itemtype="https://schema.org/Organization" class="mb-0"> - <%= strip_tags block_component_snippet block, :name %> + <% if block.template.name.present? %> + <b><%= strip_tags block_component_snippet block, :name %></b><br> + <% end %> + <% if block.template.information.present? %> + <%= strip_tags block_component_snippet block, :information %><br> + <% end %> <span itemprop="address" itemscope itemtype="https://schema.org/PostalAddress"> <span itemprop="streetAddress"> <%= strip_tags block_component_snippet block, :address %> </span> <span itemprop="addressLocality"> <%= strip_tags block_component_snippet block, :city %> - </span> + </span><br> <span itemprop="postalCode"> <%= strip_tags block_component_snippet block, :zipcode %> </span> @@ -14,12 +19,16 @@ <%= strip_tags block_component_snippet block, :country %> </span> </span> - <% block.template.phone_numbers.each do |phone_number| %> - <%= phone_number %> - <% end %> - <% block.template.emails.each do |email| %> - <%= email %> - <% end %> + <div> + <% block.template.phone_numbers.each do |phone_number| %> + <%= phone_number %> + <% end %> + </div> + <div> + <% block.template.emails.each do |email| %> + <%= email %> + <% end %> + </div> </address> <ul class="list-unstyled"> <% block.template.elements.each do |element| %>