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
5 changed files with 82 additions and 61 deletions
Showing only changes of commit b437cdbf14 - Show all commits

View File

@ -6,6 +6,10 @@ el otro archivo css style.css que está en la carpeta milfs
padding-top: 10em;
}
#empresa_pie{
display: block;
}
@media (max-width: 768px) {
#panel_administrador{
padding: 0px !important;

View File

@ -26,6 +26,26 @@ h1, h2, h3, h4, h5, h6 {
opacity: 1;
}
.container,#principal_general{
padding-left: 0px;
padding-right: 0px;
}
.container-fluid,#caja{
padding-left: 0px;
padding-right: 0px;
margin-left: 0px;
margin-right: 0px;
}
#lo_ultimo{
background: white;
}
.lo_ultimo>img{
max-height: 300px;'
}
.navbar-inverse {
background-color: #222;
border-color: #090909;
@ -70,25 +90,13 @@ h1, h2, h3, h4, h5, h6 {
}
#menu_administrador{
background-color: gray;
background-color: white;
}
.btn-botonera-admin {
float: left;
.dropdown-menu>li>a:hover{
background-color: #e95420!important;
color: white;
}
#botonera-admin, #botonera-admin>a {
color: white !important;
}
.btn-botonera-admin:hover {
background-color: black;
}
.btn.btn-botonera-admin:hover {
color: white !important;
}
.intro-social-buttons {
padding-top: 10px !important;
}
@ -109,7 +117,7 @@ h1, h2, h3, h4, h5, h6 {
#menu_hamburguesa{
color: white;
background-color: none !important;
background-color: transparent !important;
}
.navbar-brand {
transform: translateX(-50%);
@ -364,7 +372,7 @@ span.etiquetatam10 {
margin-top: -13px;
}
.navbar-principal>li>a, {
.navbar-principal>li>a {
padding-top: 0px !important;
padding-bottom: 0 !important;
height: 30px;
@ -409,7 +417,8 @@ box-shadow: none;
}
}
< !-- ESTILOS PRIORITARIOS -->.modal-dialog {
/*ESTILOS PRIORITARIOS*/
.modal-dialog {
width: 95% !important;
height: auto;
padding: 0;
@ -456,8 +465,7 @@ legend.legend-area {
}
.fh5co-post-entry article h2 {
font-size: 28px;
!important;
font-size: 28px ;
}
#fh5co-offcanvas .fh5co-bio img {
@ -496,7 +504,7 @@ RESPONSIVE */
@media only screen and (max-width: 1200px) {
#logo_cabecera {
padding-top: 3em;
padding-top: 2em;
}
#div_panel_aplicaciones{
@ -506,6 +514,10 @@ RESPONSIVE */
.img-gris {
filter: grayscale(0);
}
.lead{
padding-left: 5em;
padding-right: 5em;
}
}
@media only screen and (max-width: 992px) {
@ -515,17 +527,24 @@ RESPONSIVE */
}
@media only screen and (max-width: 767px) {
@media only screen and (max-width: 769px) {
.navbar-inverse .navbar-nav>li>a:hover {
background: transparent;
}
.navbar-header {
margin: 0px !important;
float: left;
}
li.dropdown.open{
z-index: -1;
}
#slogan_cabecera{
font-size: 1.5em;
}
#logo_cabecera {
padding-top: 0em;
padding-top: 2em;
}
#div_panel_aplicaciones {
padding-top: 21em;
@ -540,12 +559,11 @@ RESPONSIVE */
#div_panel_aplicaciones {
padding-top: 15em;
}
#logo_cabecera {
max-width: 65% !important;
}
#principal_general {
padding-left: 2em;
}
#texto_articulo{
padding: 0px !important
}
@ -555,22 +573,22 @@ RESPONSIVE */
#contenedor_cabecera {
padding-top: 0em;
}
#principal_general {
padding-left: 3em;
}
#proyectos{
display: grid !important;
}
}
@media only screen and (max-width: 320px) {
@media only screen and (max-width: 360px) {
#slogan_cabecera {
font-size: 1em;
}
#div_panel_aplicaciones {
padding-top: 10em;
}
}

View File

@ -782,7 +782,7 @@ foreach($clasificacion as $clave => $v){
$tabla_clasificacion = "<table class='table table-responsive'><tr>$tabla_clasificacion</tr></table>";
$contenido ="
<div class='container-fluid'>
<a onclick=\"xajax_limpia_div('contenido'); \" href='#menu-toggle' class=' pull-right' id='cerrar-toggle'>Cerrar [x] </a>
<a onclick=\"xajax_limpia_div('contenido'); \" href='#menu-toggle' class=' pull-right' id='cerrar-toggle'>Cerrar [x] </a>
<hr>
<div class='col-md-5'>
@ -1064,7 +1064,7 @@ function notas_tablero($form) {
</ul>
</div>
<a onclick=\"xajax_notas_estadisticas('$form','contenido',''); \" href='#menu-toggle' class='btn btn-default menu-toggle' id='estadisticas-toggle'><i class='fa fa-bar-chart' aria-hidden='true'></i></a>
$administracion
<a href='https://tupale.co' class=' pull-right'>Tupale.co </a>
@ -3844,7 +3844,7 @@ while( $row = mysqli_fetch_array( $datos_consulta ) ) {
if($tipo_campo[0]=='10'){
$render = relacion_render("$row[form_id]","$row[id_campo]",$contenido[0],'5','');
$contenido[0] = "$valor_actual";}
else {
$render=html_entity_decode($contenido[0]);}
if($tipo_campo[0]=='24' or $tipo_campo[0]=='30'){ $render= json_render("$contenido[0]","html","$control");}
@ -5362,7 +5362,7 @@ $link=Conectarse();
}
//$impresion = mostrar_identificador("$row[campo]","","landingpage","","");
$contenido .= "
<article class='col-lg-$cols col-md-$cols col-sm-$cols col-xs-6 col-xxs-12 animate-box'>
<article class='col-lg-$cols col-md-$cols col-sm-$cols col-xs-6 col-xxs-12 animate-box mas_visto'>
<figure class='vistos_figure'>
<a href='i$row[campo]'>
<img style=' max-height:320px;' class=' img-responsive img-rounded ' src ='milfs/images/secure/?file=300/$imagen[0]'>
@ -5438,10 +5438,10 @@ $link=Conectarse();
$contenido_campo =substr($contenido_campo,0,$maximo)."... ";
}
$contenido .= "
<article class='col-lg-$cols col-md-$cols col-sm-$cols col-xs-6 col-xxs-12 animate-box'>
<article class='col-lg-$cols col-md-$cols col-sm-$cols col-xs-6 col-xxs-12 animate-box lo_ultimo'>
<figure>
<a href='i$row[control]'>
<img style=' max-height:320px;' class=' img-responsive img-rounded' src ='milfs/images/secure/?file=150/$imagen[0]'>
<img style=' max-height:350px;' class=' img-responsive img-rounded' src ='milfs/images/secure/?file=150/$imagen[0]'>
</a>
</figure>
<span class='fh5co-meta'><a href='i$row[control]'>$titulo_post[0] </a></span>
@ -5918,7 +5918,7 @@ while( $row = mysqli_fetch_array( $sql ) ) {
}
$resultado ="
<!-- PROYECTOS -->
<section class='container-fluid' id='proyectos'>
<div class='container-fluid' id='proyectos'>
<div class=' text-center'>
<h1>Proyectos</h1>
<p class='lead'>Conoce los proyectos que usan Tupale.co para la implementación de sus herramientas, selecciona para conocer más</p>
@ -5929,7 +5929,7 @@ while( $row = mysqli_fetch_array( $sql ) ) {
</div>
</div>
</section>
</div>
<!-- FIN Proyectos -->
";
@ -13036,7 +13036,7 @@ if (mysqli_num_rows($sql)!='0'){
$campo_tipo =$campo_tipo[0];
$contenido = formulario_valor_campo("$id","$row[id_campo]","","$control",'',"$timestamp");
//$contenido= nl2br($contenido);
$contenido_array = $contenido;
$contenido_multiple= $contenido[10];
@ -13138,9 +13138,9 @@ if (mysqli_num_rows($sql)!='0'){
}
}
elseif(($campo_tipo=='2' OR $campo_tipo=='7')AND $contenido !=""){
$contenido= html_entity_decode(stripslashes("$contenido"));
}
else {

View File

@ -187,7 +187,7 @@ legend.legend-area {
</style>
</head>
<body onload="revisarSession()"; >
<?php if($embebido ==1) {
<?php if($embebido ==1) {
if($form!=''){ echo formulario_embebido($form,$opciones);}
elseif($identificador !='') { echo mostrar_identificador($identificador,$id);}
//elseif($_REQUEST['psi'] !='') { include("psi.php") ; echo $aviso;}
@ -199,7 +199,7 @@ else{}
<?php echo @$onload; ?>
<?php
if ( isset ( $_SESSION['id'] ) ) { ?>
<div class="navbar navbar-inverse navbar-fixed-top " role="navigation">
<div class="navbar navbar-inverse navbar-fixed-top " id="barra_milfs" role="navigation">
<div class="container-fluid">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header">
@ -209,12 +209,12 @@ else{}
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="#"><img src="favicon-152.png" style="width:60px" alt="MILFS" title="Multi Interactive Light Form System"></a>
</div>
<?php echo milfs() ?>
</div><!-- /.container-fluid -->
@ -226,13 +226,18 @@ else{}
<div id='debug'></div>
<div class='container' id='contenedor_principal'>
<div id='contenido'>
<div class='row'>
<div id='' class='col-sm-6'>
<?php if(isset($_SESSION['id'])){ echo "
<form id='manejo_sesion' name='form_session' class='navbar-form navbar-left'>
<div class='input-group'>
<input type='text' name='tiempo_session' size='18' class='form-control input-sm' readonly>
<span class='input-group-addon'><a href='#' onclick=\"location.reload();\" title='Renovar'><span class='glyphicon glyphicon-refresh' aria-hidden='true'></span></a></span>
</div>
</form> "; } ?>
<?php
///echo adjuntar_basico('33');
@ -311,13 +316,7 @@ $(document).ready(function() {
$('.wysiwyg_auto').summernote({dialogsInBody: true});
});
</script>
<?php if(isset($_SESSION['id'])){ echo "
<form name='form_session' class='navbar-form navbar-left'>
<div class='input-group'>
<input type='text' name='tiempo_session' size='30' class='form-control input-sm' readonly>
<span class='input-group-addon'><a href='#' onclick=\"location.reload();\" title='Renovar'>Reload</a></span>
</div>
</form> "; } ?>
</script>
</body>
</html>

View File

@ -8,7 +8,7 @@
restante = (tiempo - transcurrido_minutos)
prefin = (tiempo*60)-transcurrido
document.form_session.tiempo_session.value = "Cerrar en: "+restante+" minutos ";
document.form_session.tiempo_session.value = "Cierra en: "+restante+" minutos ";
if(restante == 1 ){
//alert(transcurrido);