Browse Source

removed audio player cartel background color + fixed cartel autoswitch

Bachir Soussi Chiadmi 5 years ago
parent
commit
cc2458e948

File diff suppressed because it is too large
+ 0 - 0
sites/all/themes/custom/edlptheme/assets/dist/scripts/main.min.js


File diff suppressed because it is too large
+ 0 - 0
sites/all/themes/custom/edlptheme/assets/dist/styles/app.min.css


+ 2 - 1
sites/all/themes/custom/edlptheme/assets/scripts/main.js

@@ -1157,8 +1157,9 @@
         _$body.trigger({'type':'new-audio-cartel-loaded'});
         initAjaxLinks();
         // init cartel auto switch
+        this.scndCartel_visible = 0;
+        this.$cartel.removeClass('second-visible');
         this.cartelSwitchInterval = setInterval(this.switchCartel.bind(this), this.cartelSwitchIntervalMS);
-
         // call drupal behaviours (for addtoany)
         Drupal.attachBehaviors(this.$cartel);
         // open automaticly tha article if needed

+ 8 - 2
sites/all/themes/custom/edlptheme/assets/styles/app.scss

@@ -662,6 +662,7 @@ main[role="main"]{
     max-height: 100%;
     white-space: normal;
     @include btn;
+    background-color: transparent;
   }
   .btns{
     @include audio_controls;
@@ -717,7 +718,7 @@ main[role="main"]{
     width: calc(100% - 260px);
     // outline: 1px solid orange;
     margin-left: 1em;
-    background-color: white;
+    // background-color: white;
     opacity: 1;
     transition: opacity 0.5s ease-in-out;
     &.loading{opacity: 0;}
@@ -736,6 +737,8 @@ main[role="main"]{
       // outline: 1px solid green;
       .first-cartel{
         // visibility: hidden;
+        opacity:1;
+        transition: opacity 0.2s ease-in-out;
         .entrees{
           @include entree-micro-square;
         }
@@ -752,7 +755,7 @@ main[role="main"]{
       .second-cartel{
         position: absolute;
         top: 0; left:0;
-        background-color: white;
+        // background-color: white;
         height:100%; min-width: 100%;
         opacity: 0;
         transition: opacity 0.2s ease-in-out;
@@ -812,6 +815,9 @@ main[role="main"]{
     }
 
     &:hover, &.second-visible{
+      .first-cartel{
+        opacity: 0;
+      }
       .second-cartel{
         opacity: 1;
       }

Some files were not shown because too many files changed in this diff