gitignore con .DS_Store

This commit is contained in:
Hacky Purple 2018-04-21 00:28:09 -05:00
commit 790bcf86f4
9 changed files with 77 additions and 10 deletions

BIN
.DS_Store vendored

Binary file not shown.

8
.gitignore_global Normal file
View File

@ -0,0 +1,8 @@
.DS_Store
.DS_Store?
._*
.Spotlight-V100
.Trashes
ehthumbs.db
Thumbs.db
milfs/includes/datos.php

View File

@ -1361,13 +1361,18 @@ echo $css_adicional;
<div class="col-md-9"> <div class="col-md-9">
<div id='formulario_login' class='' ></div> <div id='formulario_login' class='' ></div>
<<<<<<< HEAD
<div class='container' div='contenedor_cabecera'> <div class='container' div='contenedor_cabecera'>
<div class='col-md-3' id='logo_cabecera'> <div class='col-md-3' id='logo_cabecera'>
=======
<div class='container' id='contenedor_cabecera'>
<div class='col-sm-12 col-md-3' id='logo_cabecera'>
>>>>>>> 8eca1b220dbaecbb61b41974573b70a4d8ee8bea
<a href="./e<?php echo $id_empresa; ?>"> <a href="./e<?php echo $id_empresa; ?>">
<img id='logo_cabecera' class='center-block img img-responsive' style='' src="milfs/images/secure/?file=300/<?php echo $logo[0]; ?>"> <img id='logo_cabecera' class='center-block img img-responsive' style='' src="milfs/images/secure/?file=300/<?php echo $logo[0]; ?>">
</a> </a>
</div> </div>
<div class='col-md-9'> <div class='col-sm-12 col-md-9' id="encabezado_proyecto">
<h1 id="titulo_cabecera" data-toc-skip ><a href="<?php if($id_form !=""){echo "s".$id_form;} ?>"><?php echo $titulo[0]; ?></a></h1> <h1 id="titulo_cabecera" data-toc-skip ><a href="<?php if($id_form !=""){echo "s".$id_form;} ?>"><?php echo $titulo[0]; ?></a></h1>
<div id='slogan_cabecera'><p><?php echo "$slogan[0] "; ?> </p></div> <div id='slogan_cabecera'><p><?php echo "$slogan[0] "; ?> </p></div>
</div> </div>

View File

@ -1,12 +1,15 @@
@media (max-width: 768px) {
.modal-body {
max-height: calc(100vh - 100px) !important;
min-height: calc(100vh - 100px) !important; }
#logo_cabecera{
max-width: 80% !important;
} }
#encabezado_proyecto{
padding-top: 30px;
}
/* nube de etiquetas */ /* nube de etiquetas */
@ -195,4 +198,54 @@ legend.legend-area {
width:auto; width:auto;
padding:0 10px; padding:0 10px;
border-bottom:none; border-bottom:none;
} }
/*RESPONSIVE*/
@media (max-width: 991px) {
#encabezado_proyecto{
text-align: center;
}
#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;
}
}
@media (max-width: 600px) {
#logo_cabecera{
margin-left: 5em !important;
}
}
@media (max-width: 480px) {
#logo_cabecera{
margin-left: 3em !important;
}
}
/*FIN responsive*/

View File

@ -3,10 +3,10 @@ $usuario="root";
$password="toor";// $password="toor";//
$servidor="p:localhost"; $servidor="p:localhost";
$db="tupale"; $db="tupale";
$path_instalacion ="/var/www/html/tupali/milfs"; $path_instalacion ="/var/www/html/tupali_fork/milfs";
$path_images_secure ="/home/images_secure"; $path_images_secure ="/home/images_secure";
$url = "http://localhost//tupali/milfs/"; $url = "http://localhost//tupali_fork/milfs/";
$site = "http://localhost/tupali/"; $site = "http://localhost/tupali_fork/";
/// ESCAPAR LAS COMILLAS CON (\) /// ESCAPAR LAS COMILLAS CON (\)
$codigo_analizador = " "; $codigo_analizador = " ";

Binary file not shown.

View File

@ -2,6 +2,7 @@ html,body {
height:100%; height:100%;
background-size: cover; background-size: cover;
padding-top:130px; padding-top:130px;
background-color: black !important;
} }
body { body {

Binary file not shown.

Binary file not shown.