From 5f9f12eea2368b26ac191e29b56811051faeb25f Mon Sep 17 00:00:00 2001 From: h4ckypurpl3 Date: Fri, 20 Apr 2018 23:41:50 -0500 Subject: [PATCH 1/3] =?UTF-8?q?Revert=20"arreglando=20un=20id=20que=20apar?= =?UTF-8?q?ec=C3=ADa=20como=20un=20div"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 824f7f711db499fa0489370b4482296ee389573c. --- index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.php b/index.php index 9fc3c6d..f4979d0 100644 --- a/index.php +++ b/index.php @@ -1361,7 +1361,7 @@ echo $css_adicional;
-
+
From 0142691cfe1f950a3a6de65606977b735bb03788 Mon Sep 17 00:00:00 2001 From: h4ckypurpl3 Date: Sat, 21 Apr 2018 13:35:32 -0500 Subject: [PATCH 2/3] fetch con directorio remoto corriguiendo conflicto --- index.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/index.php b/index.php index 456525e..6504653 100644 --- a/index.php +++ b/index.php @@ -1361,13 +1361,10 @@ echo $css_adicional;
-<<<<<<< HEAD -
-
-======= +
->>>>>>> 8eca1b220dbaecbb61b41974573b70a4d8ee8bea + From 8a401651458ddc9c43499e6711a1e347c0f4ead8 Mon Sep 17 00:00:00 2001 From: h4ckypurpl3 Date: Sat, 21 Apr 2018 20:06:40 -0500 Subject: [PATCH 3/3] estilos landing page responsie --- index.php | 26 +- milfs/css/style.css | 431 +++++++++++++++++++++------------- milfs/funciones/funciones.php | 159 ++++++++----- 3 files changed, 379 insertions(+), 237 deletions(-) diff --git a/index.php b/index.php index 6504653..82f401f 100644 --- a/index.php +++ b/index.php @@ -1000,12 +1000,12 @@ $uri = $_SERVER['REQUEST_URI'];
  • -
    • -
    +
    - + @@ -1381,7 +1381,7 @@ echo $css_adicional; if(isset($_REQUEST['asistento'])) { echo asistente_aplicaciones("",'','',''); }else { - echo "Quiero crear una aplicación. "; + echo "Crea tu aplicación en 3 pasos "; } ?> @@ -1410,7 +1410,7 @@ echo $css_adicional; -
    +
    " ; - }else{ echo "
    " ;} ?> + }else{ echo "
    " ;} ?> 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; +} + +.cabecera { + padding-bottom: 30px; +} + +#logo_cabecera { + max-width: 80% !important; +} + +#encabezado_proyecto { + padding-top: 30px; +} + +.thumbnail { + height: 400px; + overflow-y: auto; + overflow-x: hidden; + padding: 10px; +} + +.box-secciones { + 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; + border: none; +} + +.box-secciones:hover { + box-shadow: 0 14px 28px rgba(0, 0, 0, 0.25), 0 10px 10px rgba(0, 0, 0, 0.22); +} + +.img-secciones { + max-height: 150px; +} + + + + + /* nube de etiquetas */ - -div.etiquetas{ - /* font-family: verdana,arial,helvetica; +div.etiquetas { + /* font-family: verdana,arial,helvetica; font-size:8pt; */ - padding:5px; + padding: 5px; } -div.etiquetas span{ - float: left; - margin: 0 3px 0 3px; - height: 20pt; - white-space: nowrap; -} -span.etiquetatam1{ - font-size: 110%; -} -span.etiquetatam2{ - font-size: 120%; -} -span.etiquetatam3{ - font-size: 130%; -} -span.etiquetatam4{ - font-size: 140%; -} -span.etiquetatam5{ - font-size: 150%; -} -span.etiquetatam6{ - font-size: 160%; -} -span.etiquetatam7{ - font-size: 170%; -} -span.etiquetatam8{ - font-size: 180%; -} -span.etiquetatam9{ - font-size: 250%; -} -span.etiquetatam10{ - font-size: 300%; -} -/* nube de etiquetas */ +div.etiquetas span { + float: left; + margin: 0 3px 0 3px; + height: 20pt; + white-space: nowrap; +} + +span.etiquetatam1 { + font-size: 110%; +} + +span.etiquetatam2 { + font-size: 120%; +} + +span.etiquetatam3 { + font-size: 130%; +} + +span.etiquetatam4 { + font-size: 140%; +} + +span.etiquetatam5 { + font-size: 150%; +} + +span.etiquetatam6 { + font-size: 160%; +} + +span.etiquetatam7 { + font-size: 170%; +} + +span.etiquetatam8 { + font-size: 180%; +} + +span.etiquetatam9 { + font-size: 250%; +} + +span.etiquetatam10 { + font-size: 300%; +} + + + + +/* nube de etiquetas */ .drop-up { top: auto; bottom: 100% !important; - + overflow: visible; } + .dropdown-menu { - min-width:300px; - padding: 3px; - z-index: 99999; + min-width: 300px; + padding: 3px; + z-index: 99999; } -.navbar .navbar-nav { + +.navbar .navbar-nav { display: inline-block; float: none; - } + .navbar .navbar-collapse .navbar-principal { text-align: center; - height: 30px; - margin-top: -13px; - -} - - .navbar-principal > li > a, { - padding-top:0px !important; padding-bottom:0 !important; height: 30px; margin-top: -13px; } -.navbar-principal {min-height:30px !important;} - - - -.topnav { - width: 100px !important; - display: inline; - height: 30px; - padding-top:-10px !important; - padding-bottom:0 !important; - height:30px; - background:none; - border:0px; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; +.navbar-principal>li>a, +{ + padding-top: 0px !important; + padding-bottom: 0 !important; + height: 30px; + margin-top: -13px; } +.navbar-principal { + min-height: 30px !important; +} + + + + +.topnav { + width: 100px !important; + display: inline; + height: 30px; + padding-top: -10px !important; + padding-bottom: 0 !important; + height: 30px; + background: none; + border: 0px; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; +} + + + + /*width:80px; background: none; border:0px; -webkit-box-shadow: none; -moz-box-shadow: none; box-shadow: none; */ - + @media all { - div.saltopagina{ - display: none; - } + div.saltopagina { + display: none; + } } - -@media print{ - div.saltopagina{ - display:block; - page-break-before:always; - } - div.noprint{ - display:none; - - } + +@media print { + div.saltopagina { + display: block; + page-break-before: always; + } + div.noprint { + display: none; + } } - -.modal-dialog { - width: 95% !important; - height: auto; - padding: 0; + +.modal-dialog { + width: 95% !important; + height: auto; + padding: 0; } .modal-lg { - width: 98% !important; - height: auto; - - padding: 0; + width: 98% !important; + height: auto; + + padding: 0; } + .modal-xs { - width: 40% !important; - height: auto; - - padding: 0; + width: 40% !important; + height: auto; + + padding: 0; } .modal-content { - height: auto; - + height: auto; } + .modal-body { max-height: calc(100vh - 300px); min-height: calc(100vh - 300px); @@ -160,92 +236,115 @@ box-shadow: none; fieldset.fieldset-borde { border: 2px solid #EDEDED !important; - border-radius:3px; + border-radius: 3px; padding: 0 1.4em 1.4em 1.4em !important; margin: 0 0 1.5em 0 !important; - -webkit-box-shadow: 0px 0px 0px 0px #000; - box-shadow: 0px 0px 0px 0px #000; + -webkit-box-shadow: 0px 0px 0px 0px #000; + box-shadow: 0px 0px 0px 0px #000; } legend.legend-area { - font-size: 1.2em !important; - font-weight: bold !important; - text-align: left !important; - width:auto; - padding:0 10px; - border-bottom:none; - } + font-size: 1.2em !important; + font-weight: bold !important; + text-align: left !important; + width: auto; + padding: 0 10px; + border-bottom: none; +} -.fh5co-post-entry article h2{ - font-size: 28px; !important; - } - #fh5co-offcanvas .fh5co-bio img{ -border-radius: 10px !important; - } - fieldset.fieldset-borde { +.fh5co-post-entry article h2 { + font-size: 28px; + !important; +} + +#fh5co-offcanvas .fh5co-bio img { + border-radius: 10px !important; +} + +fieldset.fieldset-borde { border: 2px solid #EDEDED !important; - border-radius:3px; + border-radius: 3px; padding: 0 1.4em 1.4em 1.4em !important; margin: 0 0 1.5em 0 !important; - -webkit-box-shadow: 0px 0px 0px 0px #000; - box-shadow: 0px 0px 0px 0px #000; + -webkit-box-shadow: 0px 0px 0px 0px #000; + box-shadow: 0px 0px 0px 0px #000; } legend.legend-area { - font-size: 1.2em !important; - font-weight: bold !important; - text-align: left !important; - width:auto; - padding:0 10px; - border-bottom:none; - } + font-size: 1.2em !important; + font-weight: bold !important; + text-align: left !important; + width: auto; + padding: 0 10px; + border-bottom: none; +} + + + /*RESPONSIVE*/ @media (max-width: 991px) { - #encabezado_proyecto{ - text-align: center; - } + #encabezado_proyecto { + text-align: center; + padding-top: 0px !important; + } - #logo_cabecera{ - margin-left: 8em !important; - max-width: 60% !important; - padding-top: 0px !important; - } - + #logo_cabecera { + margin-left: 8em !important; + max-width: 60% !important; + padding-top: 0px !important; + } } @media (max-width: 768px) { - .modal-body { - max-height: calc(100vh - 100px) !important; - min-height: calc(100vh - 100px) !important; - } - - - #encabezado_proyecto{ - padding-top: 0px !important; - + .modal-body { + max-height: calc(100vh - 100px) !important; + min-height: calc(100vh - 100px) !important; } - - - + #menu_tupale { + background-color: #dfdfdf; + } + .btn-botonera-admin { + margin-left:0px; + margin-right: 0px; + border-left: none; } + + .dropdown-menu>li>a { + color: #333 !important; + } + + .thumbnail { + height: 100%; + } + + #secciones, + .articulo_cuadro { + padding: 0px; + } +} + @media (max-width: 600px) { - #logo_cabecera{ - margin-left: 5em !important; - } - -} - - @media (max-width: 480px) { - #logo_cabecera{ - margin-left: 3em !important; - } - + #logo_cabecera { + margin-left: 5em !important; + } } -/*FIN responsive*/ +@media (max-width: 480px) { + #logo_cabecera { + margin-left: 1em !important; + max-width: 100% !important; + } +} + + + + + + +/*FIN responsive*/ \ No newline at end of file diff --git a/milfs/funciones/funciones.php b/milfs/funciones/funciones.php index c3e4a10..3c38f14 100644 --- a/milfs/funciones/funciones.php +++ b/milfs/funciones/funciones.php @@ -356,7 +356,7 @@ $consulta ="SELECT *,count(distinct control) as cantidad FROM form_datos WHERE f include("./milfs/includes/datos.php"); include("./milfs/includes/parametrizacion.php"); $cantidad=mysqli_num_rows($sql); - while($row=mysqli_fetch_assoc($sql)) + while($row=mysqli_fetch_assoc($sql)) { $nombre_autor = remplacetas("$tabla_autenticacion","id",$row['id_usuario'],"username",'') ; if($nombre_autor[0] !="") { $Autor = $nombre_autor[0];} @@ -421,7 +421,7 @@ $sql=mysqli_query($link,$consulta); if (mysqli_num_rows($sql)!='0'){ //$resultado = mysqli_num_rows($sql); //$resultado = mysqli_result($sql,0,"cantidad"); -while($row=mysqli_fetch_assoc($sql)) +while($row=mysqli_fetch_assoc($sql)) { if($tipo == "array") { $resultado[$row['item']] = $row['descripcion']; @@ -774,22 +774,22 @@ $footer
    - +
    -
    +

    $titulo[0]
    $descripcion[0]

    $form-titulo
    $login
    -
    +
    - - $notes - + + $notes +