From 5d9de8c0bfc5abbe5cbd37148e80c5d1b66f93e0 Mon Sep 17 00:00:00 2001 From: Nolwenn Date: Thu, 1 Dec 2016 11:14:23 +0100 Subject: [PATCH] fix conflict --- .../css/autoload/owl.carousel.css | 223 ++++++++++++++++++ themes/toutpratique/css/global.css | 15 +- themes/toutpratique/index.tpl | 8 +- .../js/autoload/owl.carousel.min.js | 2 + themes/toutpratique/js/index.js | 21 ++ .../modules/advconstructor/edito.tpl | 7 +- .../modules/homefeatured/homefeatured.tpl | 38 +-- 7 files changed, 279 insertions(+), 35 deletions(-) create mode 100644 themes/toutpratique/css/autoload/owl.carousel.css create mode 100644 themes/toutpratique/js/autoload/owl.carousel.min.js diff --git a/themes/toutpratique/css/autoload/owl.carousel.css b/themes/toutpratique/css/autoload/owl.carousel.css new file mode 100644 index 00000000..d2af98bf --- /dev/null +++ b/themes/toutpratique/css/autoload/owl.carousel.css @@ -0,0 +1,223 @@ + +.owl-carousel .animated { + -webkit-animation-duration: 1000ms; + animation-duration: 1000ms; + -webkit-animation-fill-mode: both; + animation-fill-mode: both; +} +.owl-carousel .owl-animated-in { + z-index: 0; +} +.owl-carousel .owl-animated-out { + z-index: 1; +} +.owl-carousel .fadeOut { + -webkit-animation-name: fadeOut; + animation-name: fadeOut; +} + +@-webkit-keyframes fadeOut { + 0% { + opacity: 1; + } + + 100% { + opacity: 0; + } +} +@keyframes fadeOut { + 0% { + opacity: 1; + } + + 100% { + opacity: 0; + } +} + +/* + * Owl Carousel - Auto Height Plugin + */ +.owl-height { + -webkit-transition: height 500ms ease-in-out; + -moz-transition: height 500ms ease-in-out; + -ms-transition: height 500ms ease-in-out; + -o-transition: height 500ms ease-in-out; + transition: height 500ms ease-in-out; +} + +/* + * Core Owl Carousel CSS File + */ +.owl-carousel { + display: none; + width: 100%; + -webkit-tap-highlight-color: transparent; + /* position relative and z-index fix webkit rendering fonts issue */ + position: relative; + z-index: 1; +} +.owl-carousel .owl-stage { + position: relative; + -ms-touch-action: pan-Y; +} +.owl-carousel .owl-stage:after { + content: "."; + display: block; + clear: both; + visibility: hidden; + line-height: 0; + height: 0; +} +.owl-carousel .owl-stage-outer { + position: relative; + overflow: hidden; + /* fix for flashing background */ + -webkit-transform: translate3d(0px, 0px, 0px); +} +.owl-carousel .owl-controls .owl-nav .owl-prev, +.owl-carousel .owl-controls .owl-nav .owl-next, +.owl-carousel .owl-controls .owl-dot { + cursor: pointer; + cursor: hand; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; +} +.owl-carousel.owl-loaded { + display: block; +} +.owl-carousel.owl-loading { + opacity: 0; + display: block; +} +.owl-carousel.owl-hidden { + opacity: 0; +} +.owl-carousel .owl-refresh .owl-item { + display: none; +} +.owl-carousel .owl-item { + position: relative; + min-height: 1px; + float: left; + -webkit-backface-visibility: hidden; + -webkit-tap-highlight-color: transparent; + -webkit-touch-callout: none; + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; +} +.owl-carousel .owl-item img { + -webkit-transform-style: preserve-3d; +} +.owl-carousel.owl-text-select-on .owl-item { + -webkit-user-select: auto; + -moz-user-select: auto; + -ms-user-select: auto; + user-select: auto; +} +.owl-carousel .owl-grab { + cursor: move; + cursor: -webkit-grab; + cursor: -o-grab; + cursor: -ms-grab; + cursor: grab; +} +.owl-carousel.owl-rtl { + direction: rtl; +} +.owl-carousel.owl-rtl .owl-item { + float: right; +} + +/* No Js */ +.no-js .owl-carousel { + display: block; +} + +/* + * Owl Carousel - Lazy Load Plugin + */ +.owl-carousel .owl-item .owl-lazy { + opacity: 0; + -webkit-transition: opacity 400ms ease; + -moz-transition: opacity 400ms ease; + -ms-transition: opacity 400ms ease; + -o-transition: opacity 400ms ease; + transition: opacity 400ms ease; +} +.owl-carousel .owl-item img { + transform-style: preserve-3d; +} + +/* + * Owl Carousel - Video Plugin + */ +.owl-carousel .owl-video-wrapper { + position: relative; + height: 100%; + background: #000; +} +.owl-carousel .owl-video-play-icon { + position: absolute; + height: 80px; + width: 80px; + left: 50%; + top: 50%; + margin-left: -40px; + margin-top: -40px; + background: url("owl.video.play.png") no-repeat; + cursor: pointer; + z-index: 1; + -webkit-backface-visibility: hidden; + -webkit-transition: scale 100ms ease; + -moz-transition: scale 100ms ease; + -ms-transition: scale 100ms ease; + -o-transition: scale 100ms ease; + transition: scale 100ms ease; +} +.owl-carousel .owl-video-play-icon:hover { + -webkit-transition: scale(1.3, 1.3); + -moz-transition: scale(1.3, 1.3); + -ms-transition: scale(1.3, 1.3); + -o-transition: scale(1.3, 1.3); + transition: scale(1.3, 1.3); +} +.owl-carousel .owl-video-playing .owl-video-tn, +.owl-carousel .owl-video-playing .owl-video-play-icon { + display: none; +} +.owl-carousel .owl-video-tn { + opacity: 0; + height: 100%; + background-position: center center; + background-repeat: no-repeat; + -webkit-background-size: contain; + -moz-background-size: contain; + -o-background-size: contain; + background-size: contain; + -webkit-transition: opacity 400ms ease; + -moz-transition: opacity 400ms ease; + -ms-transition: opacity 400ms ease; + -o-transition: opacity 400ms ease; + transition: opacity 400ms ease; +} +.owl-carousel .owl-video-frame { + position: relative; + z-index: 1; +} + +.owl-controls { text-align: center; margin-top: -15px; position: relative; z-index: 10; } +.owl-dots .owl-dot.active { background-color: #e44e58; } +.owl-dots .owl-dot { + background-color: #333333; + width: 10px; + height: 10px; + margin-right: 10px; + border-radius: 15px; + display: inline-block; +} \ No newline at end of file diff --git a/themes/toutpratique/css/global.css b/themes/toutpratique/css/global.css index d57a734b..7750f6e3 100644 --- a/themes/toutpratique/css/global.css +++ b/themes/toutpratique/css/global.css @@ -7053,7 +7053,6 @@ div.languages>span{ width: 100%; } - /***************************************************************************************/ /************************************ DOOFINDER ************************************/ @@ -7431,5 +7430,17 @@ div.languages>span{ } @media(max-width: 480px) { - ##idTabavisverifies #headerAV { font-size: 14px; } + #idTabavisverifies #headerAV { font-size: 14px; } +} + +/*****************************************/ +/******* BLOCK HOMEFEATURED HOME ******/ + +#index #owl .bloc.product-container { width: 100%; padding: 0; } +#index #owl { margin-top: 30px; } +@media(max-width: 767px) { + #index .bloc.product-container .product-img img { min-height: 0; } +} +@media (max-width: 620px) { + .owl-controls { margin-top: -40px; } } \ No newline at end of file diff --git a/themes/toutpratique/index.tpl b/themes/toutpratique/index.tpl index df3113b1..3b2753ac 100644 --- a/themes/toutpratique/index.tpl +++ b/themes/toutpratique/index.tpl @@ -1,8 +1,12 @@ -