Skip to content

GitLab

Commit 653f1e4b authored by Henrique Marques's avatar Henrique Marques
Browse files

Merge branch 'develop'

parents ec492ba7 6760aede
Pipeline #7363 passed with stages
in 50 seconds
Hide whitespace changes
Inline Side-by-side
Showing with 89 additions and 31 deletions
themes/comite-nacional-lula-livre/assets/javascript/app.js
View file @ 653f1e4b
......@@ -16,6 +16,12 @@ jQuery(window).on('scroll', function(){
}
});
if(jQuery('.section-youtube').length > 0 ){
setTimeout(function(){
jQuery('.section-youtube .overflow-auto').css('max-height', jQuery('.js-youtube-channel--iframe').height()+'px');
}, 500);
}
if(jQuery('#mapa-cadastro').length > 0 ){
var mymap = L.map('mapa-cadastro').setView([-16, -57], 4);
L.tileLayer('https://api.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token=pk.eyJ1IjoibWFwYm94IiwiYSI6ImNpejY4NXVycTA2emYycXBndHRqcmZ3N3gifQ.rJcFIG214AriISLbB6B5aw', {
......
themes/comite-nacional-lula-livre/assets/javascript/components/FormCadastro.vue
View file @ 653f1e4b
......@@ -43,7 +43,7 @@
</div>
<div class="column small-12 large-12">
<div class="g-recaptcha g-recaptcha-form-cadastro" data-sitekey="6LeIgmoUAAAAAEKKpjLhF2mjpDm-45H8nQDdhuuV"></div>
<div class="g-recaptcha g-recaptcha-form-cadastro" data-sitekey="6LcLUaIUAAAAALIgxWhisKmUZT7BZAXMbr7mraU2"></div>
<a href="javascript:void(0);" class="button primary block js-form-cadastro--submit-button" @click="submit" :disabled="form.LONGITUDE == '' && form.LATITUDE == ''">enviar</a>
<p class="js-form-cadastro--messages" v-if="message != ''">{{ message }}</p>
......
themes/comite-nacional-lula-livre/assets/scss/2--atoms/_a-positioning.scss
View file @ 653f1e4b
......@@ -75,4 +75,8 @@
.relative{
position: relative;
}
.overflow-auto{
overflow: auto;
}
\ No newline at end of file
themes/comite-nacional-lula-livre/assets/scss/3--components/_c-section-youtube.scss
View file @ 653f1e4b
.section-youtube {
border-bottom: 1px solid $c_alto;
border-top: 1px solid $c_alto;
padding: 30px 0px;
box-shadow: none;
z-index: 12;
@include tablet{
.column{ text-align: center; }
}
.section-title{
align-items: center;
justify-content: space-between;
display: flex;
}
&--button {
border: 2px solid $c_primary;
border: 2px solid white;
border-radius: 5px;
font-family: $title-font-family;
padding: 5px 25px;
text-transform: uppercase;
color: white;
transition: all .6s;
&:hover{
color: white;
background: rgba(255,255,255, 0.2);
}
}
.left{
......@@ -22,11 +35,13 @@
.youtube-channel--thumbnail {
&.active img{
border-bottom: 4px solid $c_primary ;
border-color: #e63e55;
}
img{
margin-top: 15px;
border: 2px solid white;
border-radius: 5px;
margin-bottom: 15px;
}
}
......
themes/comite-nacional-lula-livre/dist/app.css
View file @ 653f1e4b
......@@ -7139,6 +7139,10 @@ ul.nav {
position: relative;
}
.overflow-auto {
overflow: auto;
}
/* --------------------------------------------------------------------------
SPACING
-------------------------------------------------------------------------- */
......@@ -8304,9 +8308,9 @@ input[type=text]:focus, input[type=number]:focus, input[type=email]:focus, input
}
.section-youtube {
border-bottom: 1px solid #D4D4D4;
border-top: 1px solid #D4D4D4;
padding: 30px 0px;
box-shadow: none;
z-index: 12;
}
@media (max-width: 1024px) {
......@@ -8315,12 +8319,28 @@ input[type=text]:focus, input[type=number]:focus, input[type=email]:focus, input
}
}
.section-youtube .section-title, .section-youtube .widget_nav_menu .widget-title, .widget_nav_menu .section-youtube .widget-title {
-ms-flex-align: center;
align-items: center;
-ms-flex-pack: justify;
justify-content: space-between;
display: -ms-flexbox;
display: flex;
}
.section-youtube--button {
border: 2px solid #E63D55;
border: 2px solid white;
border-radius: 5px;
font-family: "Oswald", sans-serif;
padding: 5px 25px;
text-transform: uppercase;
color: white;
transition: all .6s;
}
.section-youtube--button:hover {
color: white;
background: rgba(255, 255, 255, 0.2);
}
.section-youtube .left {
......@@ -8328,11 +8348,13 @@ input[type=text]:focus, input[type=number]:focus, input[type=email]:focus, input
}
.youtube-channel--thumbnail.active img {
border-bottom: 4px solid #E63D55;
border-color: #e63e55;
}
.youtube-channel--thumbnail img {
margin-top: 15px;
border: 2px solid white;
border-radius: 5px;
margin-bottom: 15px;
}
.youtube-channel--subscribe {
......
themes/comite-nacional-lula-livre/dist/app.js
View file @ 653f1e4b
......@@ -11430,6 +11430,12 @@ jQuery(window).on('scroll', function () {
}
});
 
if (jQuery('.section-youtube').length > 0) {
setTimeout(function () {
jQuery('.section-youtube .overflow-auto').css('max-height', jQuery('.js-youtube-channel--iframe').height() + 'px');
}, 500);
}
if (jQuery('#mapa-cadastro').length > 0) {
var mymap = L.map('mapa-cadastro').setView([-16, -57], 4);
L.tileLayer('https://api.tiles.mapbox.com/v4/{id}/{z}/{x}/{y}.png?access_token=pk.eyJ1IjoibWFwYm94IiwiYSI6ImNpejY4NXVycTA2emYycXBndHRqcmZ3N3gifQ.rJcFIG214AriISLbB6B5aw', {
......@@ -30213,7 +30219,7 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c
}, [_c('div', {
staticClass: "g-recaptcha g-recaptcha-form-cadastro",
attrs: {
"data-sitekey": "6LeIgmoUAAAAAEKKpjLhF2mjpDm-45H8nQDdhuuV"
"data-sitekey": "6LcLUaIUAAAAALIgxWhisKmUZT7BZAXMbr7mraU2"
}
}), _vm._v(" "), _c('a', {
staticClass: "button primary block js-form-cadastro--submit-button",
themes/comite-nacional-lula-livre/library/pagebuilder-widgets/youtube-channel/tpl/template.php
View file @ 653f1e4b
......@@ -33,14 +33,17 @@ $extract_vid = function($video){
};
?>
<div class="row section-youtube">
<div class="column small-12 large-6 text-right left">
<h2 class="section-title mb20"><?= $instance['title'] ?></h2>
<?php if($instance['button_href']): ?>
<a href="<?= $instance['button_href'] ?>" class="section-youtube--button mr20" target="<?= $instance['button_external_link'] ? '_blank' : '_self' ?>">
<?= pll_e('Ver mais') ?>
</a>
<?php endif; ?>
<div class="arts-repo--inner relative row section-youtube">
<div class="column small-12 large-12">
<h3 class="section-title text-white mb20">
<?= $instance['title'] ?>
<?php if($instance['button_href']): ?>
<a href="<?= $instance['button_href'] ?>" class="section-youtube--button fz14" target="<?= $instance['button_external_link'] ? '_blank' : '_self' ?>">
<?= pll_e('Ver mais') ?>
</a>
<?php endif; ?>
</h3>
<!--
<div class="youtube-channel--subscribe">
......@@ -48,18 +51,20 @@ $extract_vid = function($video){
</div>
-->
</div>
<div class="column small-12 large-6">
<div class="column small-12 large-12">
<div class="row">
<iframe class="column small-12 large-12 js-youtube-channel--iframe" src="https://www.youtube.com/embed/<?= $extract_vid($result->items[0]) ?>" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
</div>
<div class="row">
<?php foreach($result->items as $index => $video): ?>
<div class="column small-3 large-3 <?= $video->snippet->liveBroadcastContent == 'live' ? 'live' : '' ?>">
<a href="#" class="youtube-channel--thumbnail js-youtube-channel--thumbnail <?= $index == 0 ? 'active' : '' ?>" data-video-id="<?= $extract_vid($video) ?>" title="<?= htmlentities($video->snippet->title) ?>">
<img width="100%" src="<?= $video->snippet->thumbnails->medium->url ?>" >
</a>
</div>
<?php endforeach; ?>
<iframe class="column small-12 large-9 js-youtube-channel--iframe" src="https://www.youtube.com/embed/<?= $extract_vid($result->items[0]) ?>" frameborder="0" allow="autoplay; encrypted-media" allowfullscreen></iframe>
<div class="column large-3 overflow-auto">
<?php foreach($result->items as $index => $video): ?>
<div class="<?= $video->snippet->liveBroadcastContent == 'live' ? 'live' : '' ?>">
<a href="#" class="youtube-channel--thumbnail js-youtube-channel--thumbnail <?= $index == 0 ? 'active' : '' ?>" data-video-id="<?= $extract_vid($video) ?>" title="<?= htmlentities($video->snippet->title) ?>">
<img width="100%" src="<?= $video->snippet->thumbnails->medium->url ?>" >
</a>
</div>
<?php endforeach; ?>
</div>
</div>
</div>
</div>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment