Merged branch master into 1.0

obisconcept · Feb 1, 2017 · 14dfbe1 · 14dfbe1
2 parents cde437f + 2b4ee8e
commit 14dfbe1
Show file tree

Hide file tree

Showing 8 changed files with 67 additions and 38 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 A Neos CMS package with a Swiper node type
 
 ## Packages
-- Swiper 3.3.1
+- Swiper 3.4.1
 
 ## Installation
 Add the package in your site package composer.json

diff --git a/Resources/Private/Assets/JavaScript/swiper.min.js b/Resources/Private/Assets/JavaScript/swiper.min.js
diff --git a/Resources/Private/Assets/Styles/swiper.min.scss b/Resources/Private/Assets/Styles/swiper.min.scss
diff --git a/Resources/Public/JavaScript/backend.min.js b/Resources/Public/JavaScript/backend.min.js
diff --git a/Resources/Public/JavaScript/main.js b/Resources/Public/JavaScript/main.js
diff --git a/Resources/Public/JavaScript/main.min.js b/Resources/Public/JavaScript/main.min.js
diff --git a/Resources/Public/Styles/main.css b/Resources/Public/Styles/main.css
@@ -1,5 +1,5 @@
 /**
- * Swiper 3.3.1
+ * Swiper 3.4.1
  * Most modern mobile touch slider and framework with hardware accelerated transitions
  * 
  * http://www.idangero.us/swiper/
@@ -10,10 +10,11 @@
  * 
  * Licensed under MIT
  * 
- * Released on: February 7, 2016
+ * Released on: December 13, 2016
  */
 .swiper-container {
-  margin: 0 auto;
+  margin-left: auto;
+  margin-right: auto;
   position: relative;
   overflow: hidden;
   z-index: 1; }
@@ -395,6 +396,31 @@ button.swiper-pagination-bullet {
 .swiper-container-fade .swiper-slide-active, .swiper-container-fade .swiper-slide-active .swiper-slide-active {
   pointer-events: auto; }
 
+.swiper-zoom-container {
+  width: 100%;
+  height: 100%;
+  display: -webkit-box;
+  display: -moz-box;
+  display: -ms-flexbox;
+  display: -webkit-flex;
+  display: flex;
+  -webkit-box-pack: center;
+  -moz-box-pack: center;
+  -ms-flex-pack: center;
+  -webkit-justify-content: center;
+  justify-content: center;
+  -webkit-box-align: center;
+  -moz-box-align: center;
+  -ms-flex-align: center;
+  -webkit-align-items: center;
+  align-items: center;
+  text-align: center; }
+
+.swiper-zoom-container > canvas, .swiper-zoom-container > img, .swiper-zoom-container > svg {
+  max-width: 100%;
+  max-height: 100%;
+  object-fit: contain; }
+
 .swiper-scrollbar {
   border-radius: 10px;
   position: relative;

diff --git a/Resources/Public/Styles/main.min.css b/Resources/Public/Styles/main.min.css