From b437cdbf14a1f0701368f3b1c50cf8e044d3d253 Mon Sep 17 00:00:00 2001 From: h4ckypurpl3 Date: Wed, 24 Oct 2018 16:40:40 -0500 Subject: [PATCH 1/6] =?UTF-8?q?hice=20varias=20cosas,=20primero=20organic?= =?UTF-8?q?=C3=A9=20el=20imput=20de=20cierre=20de=20sesion=20para=20que=20?= =?UTF-8?q?no=20chocara=20arriba=20en=20la=20navbar=20con=20el=20logo=20y?= =?UTF-8?q?=20que=20tales,=20luego=20busqu=C3=A9=20cerrar=20un=20div=20de?= =?UTF-8?q?=20la=20parte=20de=20lo=20ultimo=20y=20agregue=20unos=20ids=20p?= =?UTF-8?q?ara=20diferencias=20ese=20container,=20tambien=20le=20quit?= =?UTF-8?q?=C3=A9=20el=20margin=20y=20padding=20a=20los=20contenedores=20e?= =?UTF-8?q?n=20general,=20es=20mejor=20trabajar=20as=C3=AD=20para=20tener?= =?UTF-8?q?=20control=20de=20lo=20que=20pasa=20con=20las=20cajas=20lo=20mi?= =?UTF-8?q?smo=20en=20=20submodulo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/milfs.css | 4 ++ css/style.css | 82 +++++++++++++++++++++++++---------------- funciones/funciones.php | 22 +++++------ index.php | 33 ++++++++--------- js/scripts.js | 2 +- 5 files changed, 82 insertions(+), 61 deletions(-) diff --git a/css/milfs.css b/css/milfs.css index c708726..1fdefdc 100644 --- a/css/milfs.css +++ b/css/milfs.css @@ -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; diff --git a/css/style.css b/css/style.css index f1fc0b7..254b1d2 100644 --- a/css/style.css +++ b/css/style.css @@ -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; } + + } + diff --git a/funciones/funciones.php b/funciones/funciones.php index d3d447e..0d5dac4 100644 --- a/funciones/funciones.php +++ b/funciones/funciones.php @@ -782,7 +782,7 @@ foreach($clasificacion as $clave => $v){ $tabla_clasificacion = "$tabla_clasificacion
"; $contenido ="
-Cerrar [x] +Cerrar [x]
@@ -1064,7 +1064,7 @@ function notas_tablero($form) {
- + $administracion Tupale.co @@ -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 .= " -
"; @@ -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 { diff --git a/index.php b/index.php index d8d6ead..dd3a21d 100644 --- a/index.php +++ b/index.php @@ -187,7 +187,7 @@ legend.legend-area { - -