qwerty/milfs
2
0
Fork 2
Code Issues 6 Pull Requests 1 Releases Wiki Activity

Implementación landingpage #18

Merged
humano merged 11 commits from kleper/milfskleper:master into master 2018-10-14 14:20:31 +00:00
Conversation 0 Commits 11 Files Changed 2 +24 -17
2 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 39ebe3efc1 - Show all commits

35
css/style.css
View File

@ -43,9 +43,6 @@ h1, h2, h3, h4, h5, h6 {
overflow: auto;
}
#cabecera-botonera-admin {
background-color: #777677;
}
#ingreso_usuario{
color: white !important;
padding-top: 10px;
@ -80,26 +77,26 @@ transition: all 1.3s ease;
/* textos menú*/
.navbar a {
#navbar-principal {
font-size: 18px;
padding-bottom: 40px !important;
padding-top: 40px !important;
padding-bottom: 30px !important;
padding-top: 30px !important;
transition: all 0.3s ease;
}
.navbar.shrink {
.nabvar.shrink {
min-height: 35px;
}
.navbar.shrink a {
#navbar-principal.shrink {
font-size: 18px;
padding-bottom: 18px !important;
padding-top: 20px !important;
padding-bottom: 10px !important;
padding-top: 10px !important;
}
.navbar.shrink img {
.navbar.shrink img {
width: 5em;
height: auto;
transition: all 1.3s ease;
@ -118,9 +115,8 @@ transition: all 1.3s ease;
}
.btn-botonera-admin {
margin-left: 20px;
/* margin-left: 20px; */
margin-right: 20px;
border-left: 1px solid white;
}
@ -480,10 +476,18 @@ legend.legend-area {
/*
RESPONSIVE */
@media (max-width: 360px){
#contenedor_cabecera{
padding-top: 10em;
}
@media (max-width: 767px){
.box {
display: table !important;
}
}
@media (min-width: 767px){
@ -494,9 +498,12 @@ RESPONSIVE */
margin-right: 5em;
}
#contenedor_cabecera{
padding-top: 15em;
padding-top: 20em;
padding-bottom: 3em;
}
#logo_cabecera{
padding-top: 30px;
}
#cabecera{
margin-left: 20px;

6
funciones/funciones.php
View File

@ -4149,12 +4149,12 @@ $boton="
<div class='btn-group btn form-inline' role='group' aria-label='botonera-administracion' id='botonera-admin'>
<div onclick=\"xajax_panel_aplicaciones('$tipo','$empresa','div_panel_aplicaciones'); \" class='btn btn-botonera-admin'>Editor</div>
$desadministrador
<a class='btn btn-botonera-admin hidden-xs' onclick=\"xajax_cerrar_sesion(); \">$_SESSION[username] $_SESSION[equipo] Salir <i class='glyphicon glyphicon-log-out '></i></a>
<!-- <a class='btn btn-botonera-admin hidden-xs' onclick=\"xajax_cerrar_sesion(); \">$_SESSION[username] $_SESSION[equipo] Salir <i class='glyphicon glyphicon-log-out '></i></a> -->
</div>
</div>
<a class='btn btn-botonera-admin visible-xs' onclick=\"xajax_cerrar_sesion(); \">$_SESSION[username] $_SESSION[equipo] Salir <i class='glyphicon glyphicon-log-out '></i></a>
<div class='container-fluid' id='div_panel_aplicaciones' style='max-height:500px; overflow:auto;'></div>";
<div class='container-fluid' id='div_panel_aplicacionesx' style='max-height:500px; overflow:auto;'></div>";
$resultado="$boton";
return $resultado;
}else {
@ -4854,7 +4854,7 @@ $consulta= "SELECT *, $tabla_autenticacion.id AS id_usuario
$_SESSION['tabla_autenticacion']= "$tabla_autenticacion";
$_SESSION['prioridad'] = mysqli_result($sql,0,"prioridad");
$_SESSION['id_empresa']= mysqli_result($sql,0,"id_empresa");
$_SESSION[$usuarios_sesion]= "$usuarios_sesion";
$_SESSION['site']= "$url";
$_SESSION['consulta']= "$consulta";