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

Consistencia del Layout y Menú desplegable milfs #25

Merged
humano merged 7 commits from kleper/milfskleper:master into master 2018-10-25 13:25:26 +00:00
Conversation 0 Commits 7 Files Changed 5 +28 -23
2 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b3fde74a2f - Show all commits

43
css/style.css
View File

@ -17,7 +17,6 @@ h1, h2, h3, h4, h5, h6 {
#toc {
font-size: 1em;
padding-top: 11em;
max-height: 95% !important;
overflow: auto !important;
}
@ -26,6 +25,10 @@ h1, h2, h3, h4, h5, h6 {
opacity: 1;
}
#navbar-principal{
border-color: transparent;
}
#asistento{
padding-top: 5em;
}
@ -63,6 +66,10 @@ h1, h2, h3, h4, h5, h6 {
border-color: transparent;
}
#cabecera{
padding-top: 20em;
}
#contenedor_cabecera {
padding-top: 0em;
}
@ -101,11 +108,6 @@ h1, h2, h3, h4, h5, h6 {
padding-top: 10px !important;
}
#div_panel_aplicaciones {
padding-top: 21em;
}
/*NAVBAR BRAND*/
#menu_mobil{
display: grid !important;
@ -258,7 +260,6 @@ h1, h2, h3, h4, h5, h6 {
overflow-y: auto;
overflow-x: hidden;
padding: 0px 0px 70px 0px;
;
border: none;
}
@ -266,7 +267,7 @@ h1, h2, h3, h4, h5, h6 {
/* box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24);
transition: all 0.3s cubic-bezier(.25, .8, .25, 1);*/
border-radius: 0px !important;
padding: 50px;
padding-top: 2em;
border-bottom: 1px solid lightgrey;
}
@ -510,12 +511,12 @@ RESPONSIVE */
}
@media only screen and (max-width: 1200px) {
#logo_cabecera {
padding-top: 2em;
#cabecera{
padding-top: 24em;
}
#div_panel_aplicaciones{
padding-top: 23em;
#logo_cabecera {
padding-top: 2em;
}
.img-gris {
@ -553,18 +554,16 @@ RESPONSIVE */
#logo_cabecera {
padding-top: 2em;
}
#div_panel_aplicaciones {
padding-top: 21em;
.articulo_contenido {
padding-right: 2em;
padding-left: 1.5em;
}
}
@media only screen and (max-width: 586px) {
#contenedor_cabecera {
padding-top: 0em;
}
#div_panel_aplicaciones {
padding-top: 15em;
#cabecera{
padding-top: 21em;
}
#logo_cabecera {
@ -577,6 +576,9 @@ RESPONSIVE */
}
@media only screen and (max-width: 495px) {
#cabecera{
padding-top: 15em;
}
#proyectos{
display: grid !important;
@ -589,6 +591,9 @@ RESPONSIVE */
}
@media only screen and (max-width: 360px) {
#cabecera{
padding-top: 15em;
}
#principal_general{
padding-left: 0px;
padding-right: 0px;

8
funciones/funciones.php
View File

@ -1751,7 +1751,7 @@ $tipo= array("linea_planilla","","$area_principal","checkeo");
$cabecera="
<div class='cabecera_planilla row'>
<div class='col-xs-2'>
<div class='col-xs-2 col-sm-4'>
<img src='milfs/images/secure/?file=150/$imagen[0]' class='img img_planilla'>
</div>
<div class=''col-xs-10>
@ -1864,7 +1864,7 @@ mysqli_data_seek($sql_total, 0);
$cabecera="
<div class='cabecera_planilla row'>
<div class='col-xs-2'>
<div class='col-sm-3 col-xs-2'>
<img src='milfs/images/secure/?file=150/$imagen[0]' class='img img_planilla'>
</div>
<div class=''col-xs-10>
@ -6692,7 +6692,7 @@ $consulta= " SELECT * FROM form_campos WHERE id = id $w_empresa $w_especialista
</legend>
<table class='table table-condensed table-striped table-hover'>
<table class='table table-condensed table-bordered table-striped table-hover'>
<tr><th>id</th><th>Nombre</th><th>Descripcion</th><th><i class='glyphicon glyphicon-list' title='Tipo'></i> Tipo</th>$metacampo_titulo<th><i data-placement='top' data-toggle='tooltip' title='Área' class='glyphicon glyphicon-object-group'></i></th><th><i title='Estado' class='glyphicon glyphicon-eye-open'></i></th><th><i title='Empresa' class='glyphicon glyphicon-hospital-o'></i></th><th><i title='Propietario' class='glyphicon glyphicon-user'></i></th><td></td></tr>
$lineas
</table>
@ -9997,7 +9997,7 @@ if (mysqli_num_rows($sql)!='0'){
$logo = remplacetas('empresa','id',"$empresa",'imagen','') ;
$cabecera = "
<div class='' >
<div class=''>
<div class='row'>
<div class='col-md-3'>