1
0

10 Commitit 34d706d0ca ... c9330e8e5f

Tekijä SHA1 Viesti Päivämäärä
  Tessier c9330e8e5f mobile content moment 4 vuotta sitten
  Tessier f425cb2abc fix mor link height 4 vuotta sitten
  Tessier 43b44f0cb9 mobile moment 4 vuotta sitten
  Tessier 47f0f245d0 fix back labelOnline 4 vuotta sitten
  Tessier f09d911df0 Merge branch 'colloque2021' into prod 4 vuotta sitten
  Tessier c11935cb48 add img Online 4 vuotta sitten
  Tessier c1bf9d3793 Merge branch 'colloque2021' into prod 4 vuotta sitten
  Tessier 74e8ea8838 dl ressource click img 4 vuotta sitten
  Tessier fa87d91f5a alig logo footer 4 vuotta sitten
  Tessier 43e958758d align logo footer 4 vuotta sitten

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
web/themes/custom/popsu_colloque/css-compiled/index.css


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
web/themes/custom/popsu_colloque/css-compiled/index.min.css


+ 7 - 0
web/themes/custom/popsu_colloque/css/components/thumbnails/thumbnails.scss

@@ -72,10 +72,17 @@ section{
     }
     .__wrap{
       padding: 0.5rem;
+    }
+    & > div{
+      height: 100%;
     }
      div > *{
       color:$color2;
     }
+    a{
+      display: block;
+      height: 100%;
+    }
   }
 
   &.bibliographie{

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 5 - 0
web/themes/custom/popsu_colloque/css/configs/mixin.scss


+ 13 - 0
web/themes/custom/popsu_colloque/css/pages/front.scss

@@ -96,3 +96,16 @@ header{
     color: $color2
   }
 }
+
+#block-views-block-slide-programme-block-1{
+  h3{
+    &::after{
+        display: inline-flex;
+      width: 60px;
+      height: 60px;
+      vertical-align: middle;
+      margin-left:20px;
+      @include labelOnline;
+    }
+  }
+}

+ 23 - 0
web/themes/custom/popsu_colloque/css/pages/informations.scss

@@ -5,6 +5,29 @@
   margin: 0 auto 1.5rem auto;  
   }
 }
+
+#info_prat_title{
+  position: relative;
+  &::after{
+    display: inline-flex;
+    position: absolute;
+    right: 0px;
+    top: 0px;
+    width: 50px;
+    height: 50px;
+    vertical-align: middle;
+    @include labelOnline;
+  }
+  @media screen and (min-width: 768px) {
+    &::after{
+      right: -20px;
+      top: 10px;
+      width: 150px;
+      height: 150px;
+    }
+  }
+}
+
 .geolocation-map-wrapper{
   height: 400px;
   .geolocation-map-container{

+ 15 - 0
web/themes/custom/popsu_colloque/css/pages/moments.scss

@@ -21,5 +21,20 @@
         }
       }
     }
+    .__content{
+      max-height: calc(1.5rem * 12 );
+      // 1.5rem = line-height if change don't forget script.js
+      overflow: hidden;
+      &.is_active{
+        max-height: 100%!important;
+      }
+  
+      @media screen and (min-width: 576px) {
+        max-height: 100%;
+      }
+    }
+    .more_link.is_active{
+      display: none!important;
+    }
   }
 }

+ 16 - 0
web/themes/custom/popsu_colloque/css/pages/programme.scss

@@ -4,6 +4,22 @@
     @media screen and (min-width: 768px) {
       padding-top: 0rem;
     }
+    h2{
+      position: relative;
+      &::after{
+        display: inline-flex;
+        position: absolute;
+        right: 0;
+        width: 100px;
+        height: 100px;
+        vertical-align: middle;
+        @include labelOnline;
+        @media screen and (min-width: 768px) {
+          width: 150px;
+          height: 150px;
+        }
+      }
+    }
     h3{
       font-size: 1.5rem;
       font-family: 'truenolight';

+ 8 - 0
web/themes/custom/popsu_colloque/css/pages/ressources.scss

@@ -7,3 +7,11 @@
     }
   }
 }
+
+
+#block-popsu-colloque-submenu{
+  .is-active{
+    color:white;
+    background:#1d378eff;
+  }
+}

+ 21 - 0
web/themes/custom/popsu_colloque/js/script.js

@@ -322,6 +322,26 @@
     });
   }
 
+  function hidden_morelinkMoment(){
+
+    TxtMomentHeght = $('#moments .__content').height();
+    limitHeight = 16 * 8;
+
+    $morelink = $('#moments .more_link');
+
+  if(TxtMomentHeght <= limitHeight){
+    $morelink.addClass('is_active');
+  }
+
+    
+    $morelink.click(function(e) {
+      e.preventDefault();
+      $('#moments .__content').addClass('is_active');
+      $morelink.addClass('is_active');
+    })
+
+  }
+
   $( document ).ready(function() {
     // currenturl();
     notes();
@@ -330,6 +350,7 @@
     replaceAny();
     select_custom();
     remove_isactive();
+    hidden_morelinkMoment();
   });
 
 })(jQuery);

+ 1 - 1
web/themes/custom/popsu_colloque/template/fields/field--node--title--informations-pratiques.html.twig

@@ -46,6 +46,6 @@
 
 {% if label_hidden %}
   {% for item in items %}
-    <h2>{{ item.content }}</h2>
+    <h2 id="info_prat_title">{{ item.content }}</h2>
   {% endfor %}
 {% endif %}

+ 1 - 1
web/themes/custom/popsu_colloque/template/fields/field--site-setting-entity--field-file--les-logos-du-colloque.html.twig

@@ -46,7 +46,7 @@
 
 {% if label_hidden %}
   {% if multiple %}
-    <div class="">
+    <div class="d-flex">
       {% for item in items %}
         <div class="">{{ item.content }}</div>
       {% endfor %}

+ 15 - 4
web/themes/custom/popsu_colloque/template/node/node--moments.html.twig

@@ -100,20 +100,31 @@
         <div class="__content">
           {{content.body}}
         </div>
-      </div>
-    </div>
 
+        <div class="mt-3 more_link mx-auto d-inline-block d-sm-none w-auto">
+          <a class="blue text-uppercase" href="#">Lire la suite</a>
+        </div>
 
+      </div>
+    </div>
+      
+      <section class="mt-4 col-12 px-0 d-block d-md-none">
+        {{content.field_role_de_l_intervenant}}
+      </section>
+      
     <div class="__ressources">
       <section class="__publications">
         {{content.field_publications}}
       </section>
+
       <section class="__bibliographie">
         {{content.field_bibliographie}}
       </section>
     </div>
+
   </div>
-  <div class="__wrap_side col-sm-12 col-md-3">
-  {{content.field_role_de_l_intervenant}}
+  
+  <div class="__wrap_side col-sm-12 col-md-3 d-none d-md-block">
+    {{content.field_role_de_l_intervenant}}
   </div>
 </article>

+ 5 - 0
web/themes/custom/popsu_colloque/template/node/node--publications--full.html.twig

@@ -89,9 +89,14 @@
       </div>
     {% endif %}
     <div class="__wrap_content d-flex flex-wrap flex-lg-nowrap">
+    
+
+
       {% if content.field_ajouter_un_media[0]['#paragraph'].field_image %}
         <div class="__hero col-12 col-md-12 col-lg-4 px-0 pr-lg-4 m-0 my-4 mx-sm-0 my-lg-0">
+          <a href="{{content.field_telecharger_la_ressource[0]["#markup"]}}" target="_blank">
           {{content.field_ajouter_un_media}}
+          </a>
         </div>
       {% endif %}
       <div>

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä