h4ckypurpl3
/
tupali_fork
forked from qwerty/tupali
1
0
Fork 0
Code Releases Wiki Activity

Merge branch 'master' of h4ckypurpl3/tupali_fork into master

This commit is contained in:
Fredy Rivera 2019-03-25 18:20:30 -05:00 committed by Gitea
parent 50ad95f17e 4366c2d836
commit ec7acad20f
3 changed files with 39 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
index.php
View File

@ -1552,7 +1552,7 @@ echo $css_adicional;
<!-- </div> --> <!-- </div> -->
<!-- Modal --> <!-- Modal -->
<div class='modal fade animated bounceIn' id='muestraInfo' tabindex='-1' role='dialog' aria-labelledby='myModalLabel' aria-hidden='true'> <div class='modal fade animated' id='muestraInfo' tabindex='-1' role='dialog' aria-labelledby='myModalLabel' aria-hidden='true'>
<div id="modal_landing" class='modal-dialog modal-lg' > <div id="modal_landing" class='modal-dialog modal-lg' >
<div class='modal-content'> <div class='modal-content'>
<button type='button' class='close' data-dismiss='modal' aria-hidden='true'><i class='fa fa-times-circle'></i> </button> <button type='button' class='close' data-dismiss='modal' aria-hidden='true'><i class='fa fa-times-circle'></i> </button>
@ -1657,7 +1657,7 @@ echo $css_adicional;
</div> </div>
<div class='col-md-9' id='texto_articulo'>" <div class='col-md-9' id='texto_articulo'>"
; ;
}else{ echo "<div class='col-md-12 col-lg-12' id='lo_ultimo'>" ;} }else{ echo "<div class='col-md-12 col-lg-12' id='texto_articulo'>" ;}
?> ?>
<?php echo $eventos; <?php echo $eventos;
if($id_empresa=="") { if($id_empresa=="") {
@ -1714,7 +1714,7 @@ echo $css_adicional;
<?php echo $menu; ?> <?php echo $menu; ?>
<div class='modal fade animated bounceIn' id='muestraInfo' tabindex='-1' role='dialog' aria-labelledby='myModalLabel' aria-hidden='true'> <div class='modal fade animated' id='muestraInfo' tabindex='-1' role='dialog' aria-labelledby='myModalLabel' aria-hidden='true'>
<div <div id="modal_landing" class='modal-dialog modal-lg' > <div <div id="modal_landing" class='modal-dialog modal-lg' >
<div class='modal-content'> <div class='modal-content'>
<div class='modal-header' > <div class='modal-header' >

8
librerias/landingjs/scripts_landing.js
View File

@ -10,6 +10,10 @@ $(window).scroll(function(){
$(".top").css("opacity", 1 - $(window).scrollTop() / 100); $(".top").css("opacity", 1 - $(window).scrollTop() / 100);
}); });
$('.dropdown-menu').click(function(e) { $(document).ready(function(){
e.stopPropagation(); //This will prevent the event from bubbling up and close the dropdown when you type/click on text boxes. $('#user_dropdow').on("click", function(e){
$(this).next('ul').toggle();
e.stopPropagation();
e.preventDefault();
});
}); });

2
milfs

@ -1 +1 @@
Subproject commit b5146f32e000cf8b8b94d1dea6c738a27f3c5461 Subproject commit ab730fa739789f141914a7503facb8e80f43b981