gitignore con .DS_Store

.gitignore_global

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

index.php

@@ -1361,13 +1361,18 @@ echo $css_adicional;
 						  
                    <div class="col-md-9">
                     <div id='formulario_login' class='' ></div>
+<<<<<<< HEAD
                     <div class='container' div='contenedor_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; ?>">
 								<img id='logo_cabecera' class='center-block img img-responsive' style='' src="milfs/images/secure/?file=300/<?php echo $logo[0]; ?>">
 							</a>
 						</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>    
 							<div id='slogan_cabecera'><p><?php echo "$slogan[0] "; ?> </p></div>
 						</div>

milfs/css/style.css

@@ -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 */
 
 
@@ -196,3 +199,53 @@ legend.legend-area {
         padding:0 10px;
         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*/ 

milfs/includes/datos.php

@@ -3,10 +3,10 @@ $usuario="root";
 $password="toor";//
 $servidor="p:localhost";
 $db="tupale";
-$path_instalacion ="/var/www/html/tupali/milfs";
+$path_instalacion ="/var/www/html/tupali_fork/milfs";
 $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 (\)
 $codigo_analizador = "  ";

temas/landingpage/css/landingpage.css

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