From e4c03db662172e7f2c5a0c6acf236370b4280d87 Mon Sep 17 00:00:00 2001
From: h4ckypurpl3 <h4ckypurpl3@gmail.com>
Date: Sat, 21 Jul 2018 17:12:58 -0500
Subject: [PATCH 1/4] =?UTF-8?q?actualizaci=C3=B3n=20upstream?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 milfs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/milfs b/milfs
index 36e7dbd..a685dd1 160000
--- a/milfs
+++ b/milfs
@@ -1 +1 @@
-Subproject commit 36e7dbd351f900d6b1ebb3bce9ce51c0a024ab29
+Subproject commit a685dd1c66741eb2518ee3f813dfea4ea718d07c
-- 
2.30.2


From d1330834d0fab97e9174b85753fb35537ae15550 Mon Sep 17 00:00:00 2001
From: h4ckypurpl3 <h4ckypurpl3@gmail.com>
Date: Thu, 6 Sep 2018 19:38:33 -0500
Subject: [PATCH 2/4] que estoy subiendo?

---
 milfs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/milfs b/milfs
index a685dd1..4605c56 160000
--- a/milfs
+++ b/milfs
@@ -1 +1 @@
-Subproject commit a685dd1c66741eb2518ee3f813dfea4ea718d07c
+Subproject commit 4605c56f68b6ba17528df7dedbf69837d1190e9e
-- 
2.30.2


From 02bb9cc4d36978e3a3d3e3f219663a2f40d22ba4 Mon Sep 17 00:00:00 2001
From: h4ckypurpl3 <h4ckypurpl3@gmail.com>
Date: Sat, 22 Sep 2018 09:39:51 -0500
Subject: [PATCH 3/4] =?UTF-8?q?actualizaci=C3=B3n=20submodulo=20milf?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 milfs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/milfs b/milfs
index 4605c56..d2d0f7a 160000
--- a/milfs
+++ b/milfs
@@ -1 +1 @@
-Subproject commit 4605c56f68b6ba17528df7dedbf69837d1190e9e
+Subproject commit d2d0f7a3a98fbcf77322ae767c9105a5e48bff65
-- 
2.30.2


From 6e3070d90ab2d3c7938fd155da503943cf5f8f17 Mon Sep 17 00:00:00 2001
From: h4ckypurpl3 <h4ckypurpl3@gmail.com>
Date: Tue, 25 Sep 2018 21:10:55 -0500
Subject: [PATCH 4/4] modificaciones en el landing page de tupale archivo de
 funciones y archivo de style.css

---
 index.php                             |  6 +++---
 temas/landingpage/css/landingpage.css | 28 +++++++++++++--------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/index.php b/index.php
index 26f72a5..63f925a 100644
--- a/index.php
+++ b/index.php
@@ -1476,8 +1476,8 @@ echo $css_adicional;
 
 
 
- 			<div class="row">
- 				<div class='pull-right'>
+ 			<div class="row" id="cabecera">
+ 				<div class='pull-right redes_index'>
  				<a href="#" class="js-fh5co-nav-toggle fh5co-nav-toggle"><i></i></a>
 				<ul class="fh5co-social list-inline intro-social-buttons ">
 					<?php echo $soporte; ?>
@@ -1488,7 +1488,7 @@ echo $css_adicional;
 				</ul>
 
 			</div>
-				 <div id='meta_cabecera' class="col-sm-push-1 col-lg-12 col-md-12 ">
+				 <div id='meta_cabecera'>
 
 					  <div class="container-fluid" id='principal_superior'>
 
diff --git a/temas/landingpage/css/landingpage.css b/temas/landingpage/css/landingpage.css
index 99047de..24e9962 100644
--- a/temas/landingpage/css/landingpage.css
+++ b/temas/landingpage/css/landingpage.css
@@ -1,6 +1,6 @@
 html,body {
     height:100%;
-    background-size: cover; 
+    background-size: cover;
     padding-top:130px;
     background-color: black !important;
 }
@@ -142,8 +142,8 @@ transition: all 1.3s ease;
 
 
 section {
-    padding-top:110px;  
-    padding-bottom:70px; 
+    padding-top:110px;
+    padding-bottom:70px;
     position: relative;
     height: 100%;
     background-color: white;
@@ -183,7 +183,7 @@ section {
   background-color: grey;
   height: 200px;
   width: 200px;
- 
+
 }
 
 /*container titulo*/
@@ -199,10 +199,10 @@ section {
 
 
 .img-gris{
-  -webkit-filter: grayscale(100%) blur(3px) ; 
-  height: 200px;  
-  width: 200px; 
-  z-index:10; 
+  -webkit-filter: grayscale(100%) blur(3px) ;
+  height: 200px;
+  width: 200px;
+  z-index:10;
   transition:filter 0.2s;
    -webkit-transition:-webkit-filter 1s;
 }
@@ -250,8 +250,8 @@ padding-bottom: 5px;
     -moz-transition: padding 0.5s; /* Firefox 4 */
     -webkit-transition: padding 0.5s; /* Safari and Chrome */
     -o-transition: padding 0.5s; /* Opera */
-    -ms-transition:padding 0.5s; /* IE9 (maybe) */     
-  
+    -ms-transition:padding 0.5s; /* IE9 (maybe) */
+
 }
 
 .panel:hover {
@@ -330,7 +330,7 @@ padding-bottom: 5px;
 
     background-color: white;
     color: black;
-    
+
 
 }
 
@@ -439,7 +439,7 @@ padding-bottom: 5px;
   transition: all 1.3s ease;
 }
 #home {
-    padding-top:20px !important;  
+    padding-top:20px !important;
 }
 .embed-responsive-16by9 {
     padding-bottom: 49.25% !important;
@@ -488,7 +488,7 @@ padding-bottom: 5px;
 
   /*secciones*/
   #home {
-    padding-top:0px !important;  
+    padding-top:0px !important;
 }
 
 .embed-responsive-16by9 {
@@ -584,7 +584,7 @@ margin-top: 50px;
 
 /*seccion*/
 #home {
-    padding-top:0px !important;  
+    padding-top:0px !important;
 }
 
 .embed-responsive-16by9 {
-- 
2.30.2