Merge branch 'master' of h4ckypurpl3/tupali_fork into master

This commit is contained in:
Fredy Rivera 2019-03-26 18:31:19 -05:00 committed by Gitea
commit ed90b66ca3
3 changed files with 7 additions and 8 deletions

View File

@ -1599,6 +1599,7 @@ echo $css_adicional;
<!-- END #fh5co-offcanvas --> <!-- END #fh5co-offcanvas -->
<header id="fh5co-header"> <header id="fh5co-header">
<!-- En el contenedor principal superior está: el nombre de empresa, el eslogan, el asistento --> <!-- En el contenedor principal superior está: el nombre de empresa, el eslogan, el asistento -->
<div class="container-fluid" id='principal_superior'> <div class="container-fluid" id='principal_superior'>
<div id='formulario_login' class='' ></div> <div id='formulario_login' class='' ></div>
<div id='div_panel_aplicaciones' class=''></div> <div id='div_panel_aplicaciones' class=''></div>

View File

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

2
milfs

@ -1 +1 @@
Subproject commit ab730fa739789f141914a7503facb8e80f43b981 Subproject commit 5c07e7931e1c4949a71233a6814e9ed7b45108fe