From 28c935e11e9ef038d54860b6117454cb135ef005 Mon Sep 17 00:00:00 2001 From: h4ckypurpl3 Date: Tue, 9 Oct 2018 00:38:11 -0500 Subject: [PATCH 1/3] =?UTF-8?q?=20implementaci=C3=B3n=20landingpage=20logo?= =?UTF-8?q?=20y=20barra=20superior=20de=20navegaci=C3=B3n=20en=20submodulo?= =?UTF-8?q?=20milfs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/style.css | 100 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 97 insertions(+), 3 deletions(-) diff --git a/css/style.css b/css/style.css index e271bcc..e314166 100644 --- a/css/style.css +++ b/css/style.css @@ -13,15 +13,91 @@ h1, h2, h3, h4, h5, h6 { line-height: 1.1; } -#cabecera{ - margin-left: 20px; - margin-right: 20px; + +.top { + opacity: 1; } + +#titulo_cabecera a{ + color: lightgrey !important; + text-transform: uppercase; +} + + + #cabecera-botonera-admin { background-color: #777677; } +#ingreso_usuario{ + color: white !important; + padding-top: 10px; + padding-bottom: 10px; + white-space:normal !important; + word-wrap: break-word; +} +/*NAVBAR BRAND*/ +.navbar-brand { + transform: translateX(-50%); + left: 50%; + position: absolute; +} +.image_full { + display: block; +} + +.image_mobile{ + display: none !important; +} + +/*logo barra navegacion*/ +.navbar-brand img{ +width: 15em; +height: auto; +margin-top: 100px; +transition: all 1.3s ease; + +} + +/* textos menú*/ + +.navbar a { + font-size: 18px; + padding-bottom: 40px !important; + padding-top: 40px !important; + transition: all 0.3s ease; + } + + +.navbar.shrink { + min-height: 35px; +} + + +.navbar.shrink a { + font-size: 18px; + padding-bottom: 18px !important; + padding-top: 20px !important; + } + + .navbar.shrink img { + width: 5em; + height: auto; + transition: all 1.3s ease; + margin: 0px; + } + +.navbar.shrink .navbar-toggle { + margin: 8px 15px 8px 0; + padding: 7px 8px; + } + +.navbar-toggle { + margin: 13px 15px 13px 0; + padding: 4px 5px; + +} .btn-botonera-admin { margin-left: 20px; @@ -387,3 +463,21 @@ RESPONSIVE */ display: table !important; } } + +@media (min-width: 767px){ +#slogan_cabecera{ + font-size: 2em; + 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; +} +} From d21b44bd771e0332a5a42f931db0fb1a8c400227 Mon Sep 17 00:00:00 2001 From: h4ckypurpl3 Date: Wed, 10 Oct 2018 22:10:21 -0500 Subject: [PATCH 2/3] =?UTF-8?q?implementaci=C3=B3n=20navbar=20landingpage?= =?UTF-8?q?=20en=20index=20milfs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/style.css | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/css/style.css b/css/style.css index e314166..a3b2ed0 100644 --- a/css/style.css +++ b/css/style.css @@ -17,7 +17,16 @@ h1, h2, h3, h4, h5, h6 { .top { opacity: 1; } - +.navbar-inverse { + background-color: #222; + 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{ color: lightgrey !important; From 5302f2953805250a63eecc727c155a10f16fe584 Mon Sep 17 00:00:00 2001 From: h4ckypurpl3 Date: Fri, 12 Oct 2018 11:28:26 -0500 Subject: [PATCH 3/3] cambios imagen --- css/style.css | 27 ++++++++++++++++++++------- funciones/funciones.php | 28 +++++++++++++--------------- 2 files changed, 33 insertions(+), 22 deletions(-) diff --git a/css/style.css b/css/style.css index a3b2ed0..17b16dc 100644 --- a/css/style.css +++ b/css/style.css @@ -12,7 +12,13 @@ h1, h2, h3, h4, h5, h6 { font-weight: 500; line-height: 1.1; } +#toc{ + font-size: 1em; + padding-top: 50px; + max-height:95% !important; + overflow:auto !important; +} .top { opacity: 1; @@ -32,8 +38,10 @@ h1, h2, h3, h4, h5, h6 { color: lightgrey !important; text-transform: uppercase; } - - +#menu_tupale { + height: 500px; + overflow: auto; +} #cabecera-botonera-admin { background-color: #777677; @@ -45,6 +53,7 @@ h1, h2, h3, h4, h5, h6 { white-space:normal !important; word-wrap: break-word; } + /*NAVBAR BRAND*/ .navbar-brand { transform: translateX(-50%); @@ -174,21 +183,25 @@ transition: all 1.3s ease; margin: 10px; float: left; background-color: grey; - height: 200px; - width: 200px; + height: 14em; + width: 14em; } .img-gris{ + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); -webkit-filter: grayscale(100%) blur(3px) ; - height: 200px; - width: 200px; + max-height: 14em; + max-width: 14em; z-index:10; transition:filter 0.2s; -webkit-transition:-webkit-filter 1s; } .img-gris:hover{ filter: grayscale(0); - z-index: 500; + z-index: 11; -webkit-filter: grayscale(0); } diff --git a/funciones/funciones.php b/funciones/funciones.php index c4e440b..d6d5fa8 100644 --- a/funciones/funciones.php +++ b/funciones/funciones.php @@ -5584,14 +5584,12 @@ while( $row = mysqli_fetch_array( $sql ) ) { } $i++; if($row['imagen'] !="") { - $logo="$row[razon_social]"; + $logo="$row[razon_social]"; } else { $logo_empresa = remplacetas('empresa','id',"1",'imagen',''); //$logo="$row[razon_social]"; - $logo="$row[razon_social]"; + $logo="$row[razon_social]"; } // $slogan= substr($row[slogan],0, $length = 100).""; $slogan = $row['slogan']; @@ -8938,12 +8936,12 @@ if($tipo =="") { return $formulario; }else { -/* - * +/* + * * //// social login * - * + * * //////// * if($_SERVER['HTTP_HOST'] !="tupale.co" ) { $social_login=""; @@ -8958,7 +8956,7 @@ if($tipo =="") {
Administrador Usuario - +
@@ -13313,7 +13311,7 @@ if(!isset($_REQUEST['print'])) { $src ="data-src";}else{ $src =" print src"; } $privado = explode(":",$privado[0]); if(isset($privado[1]) and $_SESSION['id_empresa'] != $empresa[0] ) { $autorizado = '0';}else{$autorizado='1';} - + /// PRIVACIDAD del campo $campo_area =$row['campo_area']; if($row['id_campo'] == $campo_interaccion){$interaccion = $interaccion_campo; $col_checkeo_td ="$interaccion_form $interaccion"; $clase_interaccion="warning";}else{ $interaccion=""; $clase_interaccion="";} @@ -13342,7 +13340,7 @@ if(!isset($_REQUEST['print'])) { $src ="data-src";}else{ $src =" print src"; } $campo_nombre[0] =" $campo_nombre[0]"; //// inicio de los tipos -// inicio autorizacion +// inicio autorizacion if ($autorizado != '0'){ if($tipo=="titulos") { @@ -13466,7 +13464,7 @@ if ($autorizado != '0'){ if ($autorizado != '0'){ if($tipo=="titulos" ) { - + if($campo_tipo=='18'){ $contenido = "";} if($row['id_campo'] == $campo_interaccion){$clase_interaccion="warning";}else{ $clase_interaccion="";} @@ -13476,8 +13474,8 @@ $td .= "$contenido $col_checkeo_td"; } - - + + } if($campo_tipo=='18'){ $td .= "";} @@ -17580,11 +17578,11 @@ $equipo="
$equipo
"; - + $listado_usuarios = usuarios_listado($tabla_autenticacion,""); $mailer = mailer('','','',''); - + }else{$equipo=""; $div="div_login";} $form = "