fix conflict
This commit is contained in:
Nolwenn
Romuald
parent
3ade87d0dc
commit
5d9de8c0bf
223
themes/toutpratique/css/autoload/owl.carousel.css
Normal file
223
themes/toutpratique/css/autoload/owl.carousel.css
Normal file
@ -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;
|
||||||
|
}
|
||||||
@ -7053,7 +7053,6 @@ div.languages>span{
|
|||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/***************************************************************************************/
|
/***************************************************************************************/
|
||||||
/************************************ DOOFINDER ************************************/
|
/************************************ DOOFINDER ************************************/
|
||||||
|
|
||||||
@ -7431,5 +7430,17 @@ div.languages>span{
|
|||||||
}
|
}
|
||||||
|
|
||||||
@media(max-width: 480px) {
|
@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; }
|
||||||
}
|
}
|
||||||
@ -1,8 +1,12 @@
|
|||||||
|
|
||||||
<!-- Bloc constructor -->
|
<!-- Bloc constructor -->
|
||||||
<div id="constructorLink" class="container">
|
<div class="container">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
{hook h='displayConstructorLink'}
|
<div id="constructorLink" class="col-sm-6">
|
||||||
|
{hook h='displayConstructorLink'}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{hook h='displayHomeTabContent'}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="container">
|
<div class="container">
|
||||||
|
|||||||
2
themes/toutpratique/js/autoload/owl.carousel.min.js
vendored
Normal file
2
themes/toutpratique/js/autoload/owl.carousel.min.js
vendored
Normal file
File diff suppressed because one or more lines are too long
@ -25,4 +25,25 @@
|
|||||||
|
|
||||||
$(document).ready(function(){
|
$(document).ready(function(){
|
||||||
$('#home-page-tabs li:first, #index .tab-content ul:first').addClass('active');
|
$('#home-page-tabs li:first, #index .tab-content ul:first').addClass('active');
|
||||||
|
$('#owl').owlCarousel({
|
||||||
|
loop:true,
|
||||||
|
navigation : true,
|
||||||
|
margin:10,
|
||||||
|
navText:'',
|
||||||
|
nav:true,
|
||||||
|
responsive:{
|
||||||
|
0:{
|
||||||
|
items:1
|
||||||
|
},
|
||||||
|
480:{
|
||||||
|
items:1
|
||||||
|
},
|
||||||
|
620:{
|
||||||
|
items:2
|
||||||
|
},
|
||||||
|
767:{
|
||||||
|
items:1
|
||||||
|
},
|
||||||
|
}
|
||||||
|
});
|
||||||
});
|
});
|
||||||
@ -1,4 +1,5 @@
|
|||||||
<div class="col-xs-6 col-xxs-12">
|
{if $block->active}
|
||||||
|
<div >
|
||||||
<div class="inner">
|
<div class="inner">
|
||||||
<div class="img">
|
<div class="img">
|
||||||
<img src="{$base_dir}img/constructor/image/{$block->id}_{$cookie->id_lang}.jpg" />
|
<img src="{$base_dir}img/constructor/image/{$block->id}_{$cookie->id_lang}.jpg" />
|
||||||
@ -8,6 +9,6 @@
|
|||||||
<a href="{$block->link}" class="btn">
|
<a href="{$block->link}" class="btn">
|
||||||
{$block->subtitle}
|
{$block->subtitle}
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
{/if}
|
||||||
@ -1,31 +1,13 @@
|
|||||||
{*
|
|
||||||
* 2007-2015 PrestaShop
|
|
||||||
*
|
|
||||||
* NOTICE OF LICENSE
|
|
||||||
*
|
|
||||||
* This source file is subject to the Academic Free License (AFL 3.0)
|
|
||||||
* that is bundled with this package in the file LICENSE.txt.
|
|
||||||
* It is also available through the world-wide-web at this URL:
|
|
||||||
* http://opensource.org/licenses/afl-3.0.php
|
|
||||||
* If you did not receive a copy of the license and are unable to
|
|
||||||
* obtain it through the world-wide-web, please send an email
|
|
||||||
* to license@prestashop.com so we can send you a copy immediately.
|
|
||||||
*
|
|
||||||
* DISCLAIMER
|
|
||||||
*
|
|
||||||
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
|
|
||||||
* versions in the future. If you wish to customize PrestaShop for your
|
|
||||||
* needs please refer to http://www.prestashop.com for more information.
|
|
||||||
*
|
|
||||||
* @author PrestaShop SA <contact@prestashop.com>
|
|
||||||
* @copyright 2007-2015 PrestaShop SA
|
|
||||||
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
|
|
||||||
* International Registered Trademark & Property of PrestaShop SA
|
|
||||||
*}
|
|
||||||
{if isset($products) && $products}
|
{if isset($products) && $products}
|
||||||
{include file="$tpl_dir./product-list.tpl" class='homefeatured tab-pane' id='homefeatured'}
|
<div class="col-sm-6">
|
||||||
|
<div id="owl">
|
||||||
|
{include file="$tpl_dir./product-list-blocs.tpl" class='homefeatured tab-pane' id='homefeatured'}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
{else}
|
{else}
|
||||||
<ul id="homefeatured" class="homefeatured tab-pane">
|
|
||||||
<li class="alert alert-info">{l s='No featured products at this time.' mod='homefeatured'}</li>
|
<ul id="homefeatured" class="homefeatured tab-pane">
|
||||||
</ul>
|
<li class="alert alert-info">{l s='No featured products at this time.' mod='homefeatured'}</li>
|
||||||
|
</ul>
|
||||||
|
|
||||||
{/if}
|
{/if}
|
||||||
Loading…
x
Reference in New Issue
Block a user