integrazione parziale horizoltal tabs

lussoluca · Oct 15, 2015 · b0b4b12 · b0b4b12
1 parent 6bff431
commit b0b4b12
Show file tree

Hide file tree

Showing 6 changed files with 133 additions and 135 deletions.
diff --git a/config/schema/owlcarousel.schema.yml b/config/schema/owlcarousel.schema.yml
@@ -45,6 +45,16 @@ owlcarousel.owlcarousel.*:
     responsiveitemfive:
       type: integer
       label: 'Desktop large items'
+    responsiverefreshrate:
+      type: integer
+      label: 'responsive refresh rate'
+    responsivebaseelement:
+      type: integer
+      label: 'responsive base element'
+    responsiveclass:
+      type: integer
+      label: 'helper responsive class'
+
     margin:
       type: integer
       label: 'margin-right(px) on item.'
@@ -66,6 +76,7 @@ owlcarousel.owlcarousel.*:
     autowidth:
       type: boolean
       label: Set non grid content. Try using width style on divs.
+
     autoplay:
       type: boolean
       label: Autoplay
@@ -78,6 +89,7 @@ owlcarousel.owlcarousel.*:
     autoplayhoverpause:
       type: boolean
       label: Pause on mouse hover.
+
     nav:
       type: boolean
       label: Show next/prev buttons.
@@ -198,9 +210,11 @@ owlcarousel.owlcarousel.*:
     fallbackeasing:
       type: string
       label: Easing for CSS2 $.animate.
+
     autoheight:
       type: boolean
       label: Enable autoheight.
+
     video:
       type: boolean
       label: Enable fetching YouTube/Vimeo videos.
@@ -210,12 +224,14 @@ owlcarousel.owlcarousel.*:
     videowidth:
       type: number
       label: Set width for videos.
+
     lazyload:
       type: boolean
       label: Lazy load images. data-src and data-src-retina for highres. Also load images into background inline style if element is not <img>
     lazyloadcontent:
       type: boolean
       label: lazyContent was introduced during beta tests but i removed it from the final release due to bad implementation. It is a nice options so i will work on it in the nearest feature.
+
     urlhashlistener:
       type: boolean
       label: Listen to url hash changes. data-hash on items is required.

diff --git a/css/owl.settings.css b/css/owl.settings.css
@@ -1,4 +1,4 @@
-@media (min-width: 680px) {
+@media (min-width: 980px) {
     [class*='1/2'] {
         float: left;
         width: 50%;
@@ -17,7 +17,7 @@
     }
 
 }
-/*
+
 .settings {
     clear: both;
     width: 100%;
@@ -61,53 +61,18 @@
     background-color: #e0e0d8;
 
     font-size: 1em;
-    line-height: 20px;
+    line-height: 35px;
     padding: 0 5px;
 
     cursor: pointer;
 }
 
-.settings__link:hover,
+.settings__link:not(.is--disabled):hover,
 .is--active .settings__link {
     border-bottom: 5px solid #0074bd;
     background-color: white;
 }
 
-@media (min-width: 680px) {
-    .settings__tabs {
-        float: left;
-        width: 25%;
-        flex-direction: column;
-        background-color: white;
-        border-right: 1px solid #e0e0d8;
-    }
-
-    .settings__tab {
-        text-align: right;
-        width: 100%;
-        flex-grow: 0;
-
-        margin-left: 1px;
-    }
-
-    .settings__link {
-        font-size: 1.4em;
-        line-height: 40px;
-        border-bottom: none;
-        border-right: 5px solid transparent;
-    }
-
-    .settings__link:hover {
-        border-bottom: none;
-    }
-
-    .is--active .settings__link {
-        border-bottom: none;
-        border-right: 5px solid #0074bd;
-    }
-
-}
-
 .settings__contentainer {
     padding: 0 20px;
 }
@@ -121,20 +86,8 @@
     width: 100%;
 }
 
-@media (min-width: 680px) {
-    .settings__contentainer {
-        float: left;
-        width: 75%;
-
-        display: flex;
-    }
-
-    .settings__content .form-item:first-child {
-        margin-top: 0;
-    }
-}
 
 .is--disabled{
     opacity: .2;
-}
-*/
+    cursor: default;
+}
diff --git a/js/owl.settings.js b/js/owl.settings.js
@@ -1,10 +1,9 @@
 (function($, Drupal){
-    /*Drupal.behaviors.owlCarouselTabsSettings = {
+    Drupal.behaviors.owlCarouselTabsSettings = {
         attach: function (context) {
-            var tabs = $('.js-tabs'),
-                links = tabs.children(),
-                target,
-                responsive;
+            console.log('yo');
+            var links = $('.js-link:not(.js-disabled)'),
+                target;
             links.on('click touchstart', function(e){
                 el = $(e.target);
                 target = $('[data-target=' + el.data().target + ']');
@@ -15,6 +14,7 @@
             });
         }
     }
+    /*
     Drupal.behaviors.owlCarouselResponsiveSettings = {
         attach: function (context) {
             var trigger = $('.js-form-item-responsive'),

diff --git a/owlcarousel.libraries.yml b/owlcarousel.libraries.yml
@@ -12,12 +12,13 @@ owlcarousel:
 owlsettings:
   version: 1.0
   js:
-    js/owl.settings.js : {}
+    component:
+      js/owl.settings.js : {}
   css:
     component:
       css/owl.settings.css : {}
 owlanimate:
   version: 1.0
   css:
     component:
-        css/animate.css
+        css/animate.css : {}
diff --git a/src/Entity/OwlCarouselStyle.php b/src/Entity/OwlCarouselStyle.php
@@ -133,16 +133,22 @@ class OwlCarouselStyle extends ConfigEntityBase {
   protected $items;
 
   protected $responsive;
+
   protected $responsiveitemone;
-  protected $responsiveitemtwo;
-  protected $responsiveitemthree;
-  protected $responsiveitemfour;
-  protected $responsiveitemfive;
   protected $responsivequeryone;
+
+  protected $responsiveitemtwo;
   protected $responsivequerytwo;
+
+  protected $responsiveitemthree;
   protected $responsivequerythree;
+
+  protected $responsiveitemfour;
   protected $responsivequeryfour;
+
+  protected $responsiveitemfive;
   protected $responsivequeryfive;
+
   protected $responsiverefreshrate;
   protected $responsivebaseelement;
   protected $responsiveclass;