Merge branch 'master' of kleper/milfskleper into master

This commit is contained in:
Fredy Rivera 2018-11-02 17:08:37 -05:00 committed by Gitea
commit b4e9347b3a
2 changed files with 5 additions and 7 deletions

View File

@ -552,9 +552,9 @@ RESPONSIVE */
float: left;
}
li.dropdown.open{
z-index: -1;
}
a.dropdown-toggle.img-rounded.visible-xs{
background-color: #08080800 !important;
}
#slogan_cabecera{
font-size: 1.5em;
@ -595,9 +595,7 @@ RESPONSIVE */
#cabecera{
padding-top: 15em;
}
#contenedor_cabecera {
padding-right: 0em;
}
#principal_general{
margin-left: 2em;
margin-right: 2em;

View File

@ -248,7 +248,7 @@ else{}
echo "$encabezado";
//if(isset($_SESSION['id_empresa'])) {$id_empresa_portada='1'; echo panel_aplicaciones('1',"");}
echo " </div>
<div id='div_login' class='col-sm-6'>";
<div id='div_login' class='col-xs-12 col-sm-6'>";
if(isset($_REQUEST['change'])){
echo cambiar_password_formato("$_REQUEST[change]");
}