Merge branch 'master' of kleper/milfskleper into master

This commit is contained in:
Fredy Rivera 2018-10-14 09:20:31 -05:00 committed by Gitea
commit c40e5e154e
2 changed files with 324 additions and 253 deletions

View File

@ -1,10 +1,12 @@
body { body {
overflow-x:hidden!important;
overflow-x: hidden !important;
font-family: "Roboto", "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: "Roboto", "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 14px; font-size: 14px;
line-height: 1.42857143; line-height: 1.42857143;
color: #333; color: #333;
font-weight: 400; font-weight: 400;
width: 100% !important;
} }
h1, h2, h3, h4, h5, h6 { h1, h2, h3, h4, h5, h6 {
@ -12,49 +14,78 @@ h1, h2, h3, h4, h5, h6 {
font-weight: 500; font-weight: 500;
line-height: 1.1; line-height: 1.1;
} }
#toc{
#toc {
font-size: 1em; font-size: 1em;
padding-top: 50px; padding-top: 50px;
max-height:95% !important; max-height: 95% !important;
overflow:auto !important; overflow: auto !important;
} }
.top { .top {
opacity: 1; opacity: 1;
} }
.navbar-inverse { .navbar-inverse {
background-color: #222; background-color: #222;
border-color: #090909; border-color: #090909;
}
.navbar-inverse .navbar-nav > li > a {
color: #9d9d9d;
}
.navbar-inverse .navbar-nav>li>a:hover, .navbar-inverse .navbar-nav>li>a:focus {
background: #fb4f59;
} }
#titulo_cabecera a{ .navbar-inverse .navbar-nav>li>a {
color: #9d9d9d;
}
.navbar-inverse .navbar-nav>li>a:hover, .navbar-inverse .navbar-nav>li>a:focus {
background: #fb4f59;
}
.navbar-inverse .navbar-collapse, .navbar-inverse .navbar-form {
border-color: transparent;
}
#contenedor_cabecera {
padding-top: 0em;
}
#logo_cabecera {
max-width: 80% !important;
margin: 0 auto;
}
#titulo_cabecera a {
color: lightgrey !important; color: lightgrey !important;
text-transform: uppercase; text-transform: uppercase;
} }
#menu_tupale {
height: 500px; #slogan_cabecera {
overflow: auto; font-size: 2em;
text-shadow: 0px 2px 3px rgba(0, 0, 0, 0.4);
margin-left: 5em;
margin-right: 5em;
} }
#cabecera-botonera-admin { .menu_tupale {
background-color: #777677; height: 50vh;
overflow: auto;
} }
#ingreso_usuario{
color: white !important; #div_panel_aplicaciones {
padding-top: 10px; padding-top: 21em;
padding-bottom: 10px;
white-space:normal !important;
word-wrap: break-word;
} }
/*NAVBAR BRAND*/ /*NAVBAR BRAND*/
#menu_mobil{
display: grid !important;
}
#menu_social{
text-align: right;
float: right;
}
#menu_hamburguesa{
color: white;
background-color: none !important;
}
.navbar-brand { .navbar-brand {
transform: translateX(-50%); transform: translateX(-50%);
left: 50%; left: 50%;
@ -65,105 +96,100 @@ h1, h2, h3, h4, h5, h6 {
display: block; display: block;
} }
.image_mobile{ .image_mobile {
display: none !important; display: none !important;
} }
/*logo barra navegacion*/ /*logo barra navegacion*/
.navbar-brand img{
width: 15em;
height: auto;
margin-top: 100px;
transition: all 1.3s ease;
.navbar-brand img {
width: 15em;
height: auto;
transition: all 1s ease;
} }
/* textos menú*/ /* textos menú*/
.navbar a { #navbar-principal {
font-size: 18px; font-size: 18px;
padding-bottom: 40px !important; padding-bottom: 2em !important;
padding-top: 40px !important; padding-top: 2em !important;
transition: all 0.3s ease; transition: all 0.3s ease;
} }
.navbar.shrink { .navbar.shrink {
min-height: 35px; min-height: 35px;
} }
#navbar-principal.shrink {
font-size: 18px;
padding-bottom: 1em !important;
padding-top: 1em !important;
}
.navbar.shrink a { .navbar.shrink img {
font-size: 18px; width: 5em;
padding-bottom: 18px !important; height: auto;
padding-top: 20px !important; transition: all 1.3s ease;
} margin: 0px;
}
.navbar.shrink img {
width: 5em;
height: auto;
transition: all 1.3s ease;
margin: 0px;
}
.navbar.shrink .navbar-toggle { .navbar.shrink .navbar-toggle {
margin: 8px 15px 8px 0; margin: 8px 15px 8px 0;
padding: 7px 8px; padding: 7px 8px;
} }
.navbar-toggle { .navbar-toggle {
margin: 13px 15px 13px 0; margin: 13px 15px 13px 0;
padding: 4px 5px; padding: 4px 5px;
} }
.btn-botonera-admin { .btn-botonera-admin {
margin-left: 20px; margin-left: 20px;
margin-right: 20px; margin-right: 20px;
border-left: 1px solid white;
} }
#botonera-admin, #botonera-admin>a {
color: white !important;
}
#botonera-admin, .btn-botonera-admin {
#botonera-admin>a { /* margin-left: 20px; */
color: white !important; /* margin-right: 20px; */
float: left;
} }
.btn-botonera-admin:hover { .btn-botonera-admin:hover {
background-color: black; background-color: black;
} }
.btn.btn-botonera-admin:hover { .btn.btn-botonera-admin:hover {
color: white !important; color: white !important;
} }
.intro-social-buttons { .intro-social-buttons {
padding-top: 10px !important; padding-top: 10px !important;
} }
#botonera_landing { #botonera_landing {
display: inline-flex; display: inline-flex;
} }
.boton_land { .boton_land {
margin-left: 3px !important; margin-left: 3px !important;
} }
.cabecera { .cabecera {
padding-bottom: 30px; padding-bottom: 30px;
padding-left: 80px !important; padding-left: 80px !important;
} }
#logo_cabecera {
max-width: 80% !important;
margin: 0 auto;
}
#encabezado_proyecto { #encabezado_proyecto {
padding-top: 30px; padding-top: 30px;
} }
/*PROYECTOS*/ /*PROYECTOS*/
/* @media (max-width: 767px){ /* @media (max-width: 767px){
@ -176,330 +202,376 @@ transition: all 1.3s ease;
background-color: #d4d4d4; background-color: #d4d4d4;
} }
.div_proyecto {
.div_proyecto{
display: inline-block; display: inline-block;
position: relative; position: relative;
margin: 10px; margin: 10px;
float: left; float: left;
background-color: grey; background-color: darkgray;
height: 14em; height: 14em;
width: 14em; width: 14em;
} }
.img-gris{ .img-gris {
position: absolute; position: absolute;
top: 50%; top: 50%;
left: 50%; left: 50%;
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
-webkit-filter: grayscale(100%) blur(3px) ; -webkit-filter: grayscale(100%) blur(3px);
max-height: 14em; max-height: 14em;
max-width: 14em; max-width: 14em;
z-index:10; z-index: 10;
transition:filter 0.2s; transition: filter 0.2s;
-webkit-transition:-webkit-filter 1s; -webkit-transition: -webkit-filter 1s;
}
.img-gris:hover{
filter: grayscale(0);
z-index: 11;
-webkit-filter: grayscale(0);
} }
.proyecto_titulo{ .img-gris:hover {
position: absolute; filter: grayscale(0);
top:100px; z-index: 11;
color:#fff; -webkit-filter: grayscale(0);
background-color:#000; }
padding:2px ;
opacity:0.5; .proyecto_titulo {
font-weight:bold; width:190px; z-index:20; word-wrap: break-word; position: absolute;
top: 100px;
color: #fff;
background-color: #000;
padding: 2px;
opacity: 0.5;
font-weight: bold;
width: 190px;
z-index: 20;
word-wrap: break-word;
} }
/*fin proyectos*/ /*fin proyectos*/
/*Panel Editor*/
.thumbnail { .thumbnail {
height: 100% !important; height: 100% !important;
overflow-y: auto; overflow-y: auto;
overflow-x: hidden; overflow-x: hidden;
padding: 0px 0px 70px 0px;; padding: 0px 0px 70px 0px;
border:none; ;
border: none;
} }
.box-secciones { .box-secciones {
/* box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24); /* 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);*/ transition: all 0.3s cubic-bezier(.25, .8, .25, 1);*/
border-radius: 0px !important; border-radius: 0px !important;
padding: 50px; padding: 50px;
border-bottom: 1px solid lightgrey; border-bottom: 1px solid lightgrey;
} }
.box-secciones:hover { .box-secciones:hover {
box-shadow: 0 14px 28px rgba(0, 0, 0, 0.25), 0 10px 10px rgba(0, 0, 0, 0.22); box-shadow: 0 14px 28px rgba(0, 0, 0, 0.25), 0 10px 10px rgba(0, 0, 0, 0.22);
} }
.img-secciones { .img-secciones {
max-height: 250px; max-height: 250px;
} }
#buscador_centro { #buscador_centro {
display: inline-flex; display: inline-flex;
} }
#buscador_blog { #buscador_blog {
display: inline-flex !important; display: inline-flex !important;
} }
#fh5co-footer{ #fh5co-footer {
display: inline-block; display: inline-block;
} }
/* nube de etiquetas */ /* nube de etiquetas */
div.etiquetas { div.etiquetas {
/* font-family: verdana,arial,helvetica; /* font-family: verdana,arial,helvetica;
font-size:8pt; font-size:8pt;
*/ */
padding: 5px; padding: 5px;
} }
div.etiquetas span { div.etiquetas span {
float: left; float: left;
margin: 0 3px 0 3px; margin: 0 3px 0 3px;
height: 20pt; height: 20pt;
white-space: nowrap; white-space: nowrap;
} }
span.etiquetatam1 { span.etiquetatam1 {
font-size: 110%; font-size: 110%;
} }
span.etiquetatam2 { span.etiquetatam2 {
font-size: 120%; font-size: 120%;
} }
span.etiquetatam3 { span.etiquetatam3 {
font-size: 130%; font-size: 130%;
} }
span.etiquetatam4 { span.etiquetatam4 {
font-size: 140%; font-size: 140%;
} }
span.etiquetatam5 { span.etiquetatam5 {
font-size: 150%; font-size: 150%;
} }
span.etiquetatam6 { span.etiquetatam6 {
font-size: 160%; font-size: 160%;
} }
span.etiquetatam7 { span.etiquetatam7 {
font-size: 170%; font-size: 170%;
} }
span.etiquetatam8 { span.etiquetatam8 {
font-size: 180%; font-size: 180%;
} }
span.etiquetatam9 { span.etiquetatam9 {
font-size: 250%; font-size: 250%;
} }
span.etiquetatam10 { span.etiquetatam10 {
font-size: 300%; font-size: 300%;
} }
/* nube de etiquetas */ /* nube de etiquetas */
.drop-up { .drop-up {
top: auto; top: auto;
bottom: 100% !important; bottom: 100% !important;
overflow: visible;
overflow: visible;
} }
.dropdown-menu { .dropdown-menu {
min-width: 300px; min-width: 300px;
padding: 3px; padding: 3px;
z-index: 99999; z-index: 99999;
} }
.navbar .navbar-nav { .navbar .navbar-nav {
display: inline-block; display: inline-block;
float: none; float: none;
} }
.navbar .navbar-collapse .navbar-principal { .navbar .navbar-collapse .navbar-principal {
text-align: center; text-align: center;
height: 30px; height: 30px;
margin-top: -13px; margin-top: -13px;
} }
.navbar-principal>li>a, .navbar-principal>li>a, {
{ padding-top: 0px !important;
padding-top: 0px !important; padding-bottom: 0 !important;
padding-bottom: 0 !important; height: 30px;
height: 30px; margin-top: -13px;
margin-top: -13px;
} }
.navbar-principal { .navbar-principal {
min-height: 30px !important; min-height: 30px !important;
} }
.topnav { .topnav {
width: 100px !important; width: 100px !important;
display: inline; display: inline;
height: 30px; height: 30px;
padding-top: -10px !important; padding-bottom: 0 !important;
padding-bottom: 0 !important; height: 30px;
height: 30px; background: none;
background: none; border: 0px;
border: 0px; -webkit-box-shadow: none;
-webkit-box-shadow: none; -moz-box-shadow: none;
-moz-box-shadow: none; box-shadow: none;
box-shadow: none;
} }
/*width:80px; background: none; border:0px; -webkit-box-shadow: none; /*width:80px; background: none; border:0px; -webkit-box-shadow: none;
-moz-box-shadow: none; -moz-box-shadow: none;
box-shadow: none; box-shadow: none;
*/ */
@media all { @media all {
div.saltopagina { div.saltopagina {
display: none; display: none;
} }
} }
@media print { @media print {
div.saltopagina { div.saltopagina {
display: block; display: block;
page-break-before: always; page-break-before: always;
} }
div.noprint { div.noprint {
display: none; display: none;
} }
} }
<!-- ESTILOS PRIORITARIOS --> < !-- ESTILOS PRIORITARIOS -->.modal-dialog {
.modal-dialog { width: 95% !important;
width: 95% !important; height: auto;
height: auto; padding: 0;
padding: 0;
} }
.modal-lg { .modal-lg {
width: 98% !important; width: 98% !important;
height: auto; height: auto;
padding: 0;
padding: 0;
} }
.modal-xs { .modal-xs {
width: 40% !important; width: 40% !important;
height: auto; height: auto;
padding: 0;
padding: 0;
} }
.modal-content { .modal-content {
height: auto; height: auto;
} }
.modal-body { .modal-body {
max-height: calc(100vh - 300px); max-height: calc(100vh - 300px);
min-height: calc(100vh - 300px); min-height: calc(100vh - 300px);
overflow-y: auto; overflow-y: auto;
} }
fieldset.fieldset-borde { fieldset.fieldset-borde {
border: 2px solid #EDEDED !important; border: 2px solid #EDEDED !important;
border-radius: 3px; border-radius: 3px;
padding: 0 1.4em 1.4em 1.4em !important; padding: 0 1.4em 1.4em 1.4em !important;
margin: 0 0 1.5em 0 !important; margin: 0 0 1.5em 0 !important;
-webkit-box-shadow: 0px 0px 0px 0px #000; -webkit-box-shadow: 0px 0px 0px 0px #000;
box-shadow: 0px 0px 0px 0px #000; box-shadow: 0px 0px 0px 0px #000;
} }
legend.legend-area { legend.legend-area {
font-size: 1.2em !important; font-size: 1.2em !important;
font-weight: bold !important; font-weight: bold !important;
text-align: left !important; text-align: left !important;
width: auto; width: auto;
padding: 0 10px; padding: 0 10px;
border-bottom: none; border-bottom: none;
} }
.fh5co-post-entry article h2 { .fh5co-post-entry article h2 {
font-size: 28px; font-size: 28px;
!important; !important;
} }
#fh5co-offcanvas .fh5co-bio img { #fh5co-offcanvas .fh5co-bio img {
border-radius: 10px !important; border-radius: 10px !important;
} }
fieldset.fieldset-borde { fieldset.fieldset-borde {
border: 2px solid #EDEDED !important; border: 2px solid #EDEDED !important;
border-radius: 3px; border-radius: 3px;
padding: 0 1.4em 1.4em 1.4em !important; padding: 0 1.4em 1.4em 1.4em !important;
margin: 0 0 1.5em 0 !important; margin: 0 0 1.5em 0 !important;
-webkit-box-shadow: 0px 0px 0px 0px #000; -webkit-box-shadow: 0px 0px 0px 0px #000;
box-shadow: 0px 0px 0px 0px #000; box-shadow: 0px 0px 0px 0px #000;
} }
legend.legend-area { legend.legend-area {
font-size: 1.2em !important; font-size: 1.2em !important;
font-weight: bold !important; font-weight: bold !important;
text-align: left !important; text-align: left !important;
width: auto; width: auto;
padding: 0 10px; padding: 0 10px;
border-bottom: none; border-bottom: none;
} }
/* /*
RESPONSIVE */ RESPONSIVE */
@media (max-width: 767px){ /*Se afectan todos hacia arriba*/
.box {
display: table !important; @media (min-width: 767px) {
} #cabecera {
margin-left: 20px;
margin-right: 20px;
}
} }
@media (min-width: 767px){ @media only screen and (max-width: 1200px) {
#logo_cabecera {
padding-top: 3em;
}
#div_panel_aplicaciones{
padding-top: 23em;
}
.img-gris {
filter: grayscale(0);
}
}
@media only screen and (max-width: 992px) {
#slogan_cabecera{ #slogan_cabecera{
font-size: 2em; margin: 0em !important;
text-shadow: 0px 2px 3px rgba(0,0,0,0.4);
margin-left: 5em;
margin-right: 5em;
}
#contenedor_cabecera{
padding-top: 15em;
padding-bottom: 3em;
} }
#cabecera{ }
margin-left: 20px;
margin-right: 20px; @media only screen and (max-width: 767px) {
.navbar-header {
margin: 0px !important;
float: left;
}
#slogan_cabecera{
font-size: 1.5em;
}
#logo_cabecera {
padding-top: 0em;
}
#div_panel_aplicaciones {
padding-top: 21em;
}
}
@media only screen and (max-width: 586px) {
#contenedor_cabecera {
padding-top: 0em;
}
#div_panel_aplicaciones {
padding-top: 15em;
}
#logo_cabecera {
max-width: 65% !important;
}
#principal_general {
padding-left: 2em;
}
#texto_articulo{
padding: 0px !important
}
}
@media only screen and (max-width: 495px) {
#contenedor_cabecera {
padding-top: 0em;
}
#principal_general {
padding-left: 3em;
}
#proyectos{
display: grid !important;
}
}
@media only screen and (max-width: 320px) {
#slogan_cabecera {
font-size: 1em;
}
#div_panel_aplicaciones {
padding-top: 10em;
} }
} }

View File

@ -2691,7 +2691,7 @@ $listado .= "<li > <a class='btn btn-link' onclick=\"xajax_portal_filtro_cadena
Filtro $campo_nombre[0] <i class='glyphicon glyphicon-filter'></i> Filtro $campo_nombre[0] <i class='glyphicon glyphicon-filter'></i>
<span class='caret'></span> <span class='caret'></span>
</button> </button>
<ul class='dropdown-menu' aria-labelledby='drown_$tabla'> <ul class='menu_tupale dropdown-menu' aria-labelledby='drown_$tabla'>
$listado $listado
</ul> </ul>
</div> </div>
@ -4148,13 +4148,12 @@ $boton="
$cambiar_empresa $cambiar_empresa
<div class='btn-group btn form-inline' role='group' aria-label='botonera-administracion' id='botonera-admin'> <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> <div onclick=\"xajax_panel_aplicaciones('$tipo','$empresa','div_panel_aplicaciones'); \" class='btn btn-botonera-admin'>Editor</div>
$desadministrador <a href='milfs/' class='btn btn-botonera-admin'>Des-administrador</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>
</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"; $resultado="$boton";
return $resultado; return $resultado;
}else { }else {
@ -4854,7 +4853,7 @@ $consulta= "SELECT *, $tabla_autenticacion.id AS id_usuario
$_SESSION['tabla_autenticacion']= "$tabla_autenticacion"; $_SESSION['tabla_autenticacion']= "$tabla_autenticacion";
$_SESSION['prioridad'] = mysqli_result($sql,0,"prioridad"); $_SESSION['prioridad'] = mysqli_result($sql,0,"prioridad");
$_SESSION['id_empresa']= mysqli_result($sql,0,"id_empresa"); $_SESSION['id_empresa']= mysqli_result($sql,0,"id_empresa");
$_SESSION[$usuarios_sesion]= "$usuarios_sesion"; $_SESSION[$usuarios_sesion]= "$usuarios_sesion";
$_SESSION['site']= "$url"; $_SESSION['site']= "$url";
$_SESSION['consulta']= "$consulta"; $_SESSION['consulta']= "$consulta";
@ -5813,7 +5812,7 @@ while( $row = mysqli_fetch_array( $sql ) ) {
<div class='proyecto col-md-$cols col-sm-$cols ' title=''> <div class='proyecto col-md-$cols col-sm-$cols ' title=''>
<div class='div_proyecto'> <div class='div_proyecto'>
<a href='http://$dominio[0]/e$row[id_empresa]' target ='empresa'> <a href='http://$dominio[0]/e$row[id_empresa]' target ='empresa'>
<div class='proyecto_titulo ' style=''>$row[razon_social]</div> <div href='http://$dominio[0]/e$row[id_empresa]' target ='empresa' class='proyecto_titulo ' style=''>$row[razon_social]</div>
$logo $logo