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 +82 -61
5 changed files with 82 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b437cdbf14 - Show all commits

4
css/milfs.css
View File

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

82
css/style.css
View File

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

10
funciones/funciones.php
View File

@ -5362,7 +5362,7 @@ $link=Conectarse();
} }
//$impresion = mostrar_identificador("$row[campo]","","landingpage","",""); //$impresion = mostrar_identificador("$row[campo]","","landingpage","","");
$contenido .= " $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'> <figure class='vistos_figure'>
<a href='i$row[campo]'> <a href='i$row[campo]'>
<img style=' max-height:320px;' class=' img-responsive img-rounded ' src ='milfs/images/secure/?file=300/$imagen[0]'> <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_campo =substr($contenido_campo,0,$maximo)."... ";
} }
$contenido .= " $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> <figure>
<a href='i$row[control]'> <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> </a>
</figure> </figure>
<span class='fh5co-meta'><a href='i$row[control]'>$titulo_post[0] </a></span> <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 =" $resultado ="
<!-- PROYECTOS --> <!-- PROYECTOS -->
<section class='container-fluid' id='proyectos'> <div class='container-fluid' id='proyectos'>
<div class=' text-center'> <div class=' text-center'>
<h1>Proyectos</h1> <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> <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>
</div> </div>
</section> </div>
<!-- FIN Proyectos --> <!-- FIN Proyectos -->
"; ";

19
index.php
View File

@ -199,7 +199,7 @@ else{}
<?php echo @$onload; ?> <?php echo @$onload; ?>
<?php <?php
if ( isset ( $_SESSION['id'] ) ) { ?> 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"> <div class="container-fluid">
<!-- Brand and toggle get grouped for better mobile display --> <!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header"> <div class="navbar-header">
@ -231,8 +231,13 @@ else{}
<div class='row'> <div class='row'>
<div id='' class='col-sm-6'> <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 <?php
///echo adjuntar_basico('33'); ///echo adjuntar_basico('33');
@ -312,12 +317,6 @@ $(document).ready(function() {
}); });
</script> </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> "; } ?>
</body> </body>
</html> </html>

2
js/scripts.js
View File

@ -8,7 +8,7 @@
restante = (tiempo - transcurrido_minutos) restante = (tiempo - transcurrido_minutos)
prefin = (tiempo*60)-transcurrido 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 ){ if(restante == 1 ){
//alert(transcurrido); //alert(transcurrido);