Merge branch 'master' of kleper/milfskleper into master

This commit is contained in:
Fredy Rivera 2018-10-12 12:02:54 -05:00 committed by Gitea
commit b4dbb0ded1
2 changed files with 137 additions and 23 deletions

View File

@ -12,16 +12,110 @@ 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;
#cabecera{
margin-left: 20px;
margin-right: 20px;
}
.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;
text-transform: uppercase;
}
#menu_tupale {
height: 500px;
overflow: auto;
}
#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;
@ -89,21 +183,25 @@ h1, h2, h3, h4, h5, h6 {
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);
}
@ -387,3 +485,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;
}
}

View File

@ -5799,14 +5799,12 @@ while( $row = mysqli_fetch_array( $sql ) ) {
}
$i++;
if($row['imagen'] !="") {
$logo="<img class='lazy img-gris img-responsive img-rounded' alt='$row[razon_social]' src='milfs/images/loading.gif' data-src='milfs/images/secure/?file=300/$row[imagen]' style='width:300px; display:block; background-image: url(\"\");
background-repeat: no-repeat;
background-position: 50% 50%;' >";
$logo="<img class='lazy img-gris img-responsive ' alt='$row[razon_social]' src='milfs/images/loading.gif' data-src='milfs/images/secure/?file=300/$row[imagen]' >";
}
else {
$logo_empresa = remplacetas('empresa','id',"1",'imagen','');
//$logo="<img class=' lazy img img-responsive' data-src='milfs/images/sinimagen.jpg' alt='$row[razon_social]'>";
$logo="<img class=' lazy img img-responsive' style='width:300px; display:block;' data-src='milfs/images/sinimagen.jpg' alt='$row[razon_social]'>";
$logo="<img class=' lazy img img-responsive' data-src='milfs/images/sinimagen.jpg' alt='$row[razon_social]'>";
}
// $slogan= substr($row[slogan],0, $length = 100)."";
$slogan = $row['slogan'];
@ -9153,12 +9151,12 @@ if($tipo =="") {
return $formulario;
}else {
/*
*
/*
*
* //// social login
* <!-- <a class=' list-group-item btn btn-default ' href='./sociallogin.php?provider=twitter'><i class='fa fa-twitter'></i> Twitter</a>
<a class=' list-group-item btn btn-default ' href='./sociallogin.php?provider=facebook'><i class='fa fa-facebook'></i> Facebook</a> -->
*
*
* ////////
* if($_SERVER['HTTP_HOST'] !="tupale.co" ) {
$social_login="";
@ -9173,7 +9171,7 @@ if($tipo =="") {
<div class='list-group'>
<a class=' list-group-item btn btn-default ' href='./milfs'>Administrador</a>
<a class=' list-group-item btn btn-default ' href='#' onclick=\"javascript: document.getElementById('div_formulario_session').className= 'visible col-md-12'; \">Usuario</a>
</div>
</div>
@ -13528,7 +13526,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 ="<td class=' col_$row[id_campo] planilla_contenido_$row[id_campo] $clase_interaccion $class_area'>$interaccion_form $interaccion</td>"; $clase_interaccion="warning";}else{ $interaccion=""; $clase_interaccion="";}
@ -13557,7 +13555,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") {
@ -13681,7 +13679,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="";}
@ -13691,8 +13689,8 @@ $td .= "<th class='col_$row[id_campo] plantilla_titulo_$row[id_campo] $clase_int
$td .= "<td class='col_$row[id_campo] planilla_contenido_$row[id_campo] $class_area $clase_interaccion '>$contenido </td>$col_checkeo_td";
}
}
if($campo_tipo=='18'){ $td .= "";}
@ -17795,11 +17793,11 @@ $equipo=" <div class='input-group' id='equipo_grupo'>
$equipo
</div>";
$listado_usuarios = usuarios_listado($tabla_autenticacion,"");
$mailer = mailer('','','','');
}else{$equipo=""; $div="div_login";}
$form = "