From 18d3296acf94470319e747122b7e94d5434f3fa3 Mon Sep 17 00:00:00 2001
From: Gil Greenberg <ggreenberg@somethingdigital.com>
Date: Fri, 20 Oct 2017 15:24:51 -0400
Subject: [PATCH 1/2] Add support for fotorama 'thumbmargin' setting within a
 theme's view.xml

<vars module="Magento_Catalog">
    <var name="gallery">
        <var name="thumbmargin">16</var>
    </var>
</var>
---
 .../Catalog/view/frontend/templates/product/view/gallery.phtml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
index 5a064b33355..2bfe986b6de 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
@@ -68,6 +68,9 @@
                         "thumbheight": <?php /* @escapeNotVerified */ echo $block->getImageAttribute('product_page_image_small', 'height')
                         ?: $block->getImageAttribute('product_page_image_small', 'width'); ?>,
                     <?php endif; ?>
+                    <?php if (($block->getVar("gallery/thumbmargin"))): ?>
+                        "thumbmargin": <?php echo $block->getVar("gallery/thumbmargin"); ?>,
+                    <?php endif; ?>
                     <?php if ($block->getImageAttribute('product_page_image_medium', 'height') || $block->getImageAttribute('product_page_image_medium', 'width')): ?>
                         "height": <?php /* @escapeNotVerified */ echo $block->getImageAttribute('product_page_image_medium', 'height')
                         ?: $block->getImageAttribute('product_page_image_medium', 'width'); ?>,

From 30b7d1d1f406c19cc484f801e6e32db4fc76839f Mon Sep 17 00:00:00 2001
From: Volodymyr Zaets <vzaets@magento.com>
Date: Mon, 16 Apr 2018 12:29:45 +0300
Subject: [PATCH 2/2] [2.2] Add support for fotorama 'thumbmargin' setting
 within a theme's view.xml #68

---
 .../Catalog/view/frontend/templates/product/view/gallery.phtml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
index 2bfe986b6de..ffecb2ba4f3 100644
--- a/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
+++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml
@@ -69,7 +69,7 @@
                         ?: $block->getImageAttribute('product_page_image_small', 'width'); ?>,
                     <?php endif; ?>
                     <?php if (($block->getVar("gallery/thumbmargin"))): ?>
-                        "thumbmargin": <?php echo $block->getVar("gallery/thumbmargin"); ?>,
+                        "thumbmargin": <?= /* @noEscape */ (int)$block->getVar("gallery/thumbmargin"); ?>,
                     <?php endif; ?>
                     <?php if ($block->getImageAttribute('product_page_image_medium', 'height') || $block->getImageAttribute('product_page_image_medium', 'width')): ?>
                         "height": <?php /* @escapeNotVerified */ echo $block->getImageAttribute('product_page_image_medium', 'height')