From 6effd0dad2e8e4e1a20af88ac38f4fb09438120d Mon Sep 17 00:00:00 2001
From: h4ckypurpl3 <h4ckypurpl3@gmail.com>
Date: Mon, 9 Jul 2018 14:32:09 -0500
Subject: [PATCH] seguimiento commits

---
 index.php                    | 14 +++++++-------
 milfs                        |  2 +-
 temas/magazine/css/style.css |  2 ++
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/index.php b/index.php
index 528c2c9..4b0f2a6 100644
--- a/index.php
+++ b/index.php
@@ -1469,7 +1469,7 @@ echo $css_adicional;
 
 
 
-<div class="col-sm-<?php echo $cols_interior; ?> col-lg-<?php echo $cols_interior; ?>">
+<div class="col-sm-<?php echo $cols_interior; ?> col-lg-<?php echo $cols_interior; ?>" id='principal_general'>
 <?php echo $menu_lateral ; ?>
 		<!-- END #fh5co-offcanvas -->
 	<header id="fh5co-header">
@@ -1488,19 +1488,19 @@ echo $css_adicional;
 				</ul>
 
 			</div>
-				 <div id='meta_cabecera' class="col-lg-12 col-md-12 ">
+				 <div id='meta_cabecera' class="col-sm-push-1 col-lg-12 col-md-12 ">
 
-					  <div class="container">
+					  <div class="container-fluid" id='principal_superior'>
 
                    <div class="col-md-9">
                     <div id='formulario_login' class='' ></div>
                     <div class='container' id='contenedor_cabecera'>
-						<div class='col-md-3' id='logo_cabecera'>
+						<div class='col-sm-3 col-md-3' id='logo_cabecera'>
 							<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-6 col-md-9'>
 							<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>
@@ -1519,7 +1519,7 @@ echo $css_adicional;
 
 	                 </div>
 
-	                  <div class="col-md-12">
+	                  <div class="col-md-11" id='resaltado'>
 	                 	       <div class='center-block'>
 
 	                          <?php
@@ -1541,7 +1541,7 @@ echo $css_adicional;
 
 
 	</header>
-		<div class="container">
+		<div class="container-fluid" id='caja'>
 
 			<?php
 			$id_campo = campo_titulo($set) ;
diff --git a/milfs b/milfs
index 3a23561..8dbb483 160000
--- a/milfs
+++ b/milfs
@@ -1 +1 @@
-Subproject commit 3a235616c3f4bdeedf4f3e2370b2082b74ff80fd
+Subproject commit 8dbb4838f35ddeb48e05ee773ca50f0665de341e
diff --git a/temas/magazine/css/style.css b/temas/magazine/css/style.css
index ef1f0cd..e96e98a 100644
--- a/temas/magazine/css/style.css
+++ b/temas/magazine/css/style.css
@@ -774,6 +774,8 @@ figure figcaption {
     width: 100%;
     float: none;
   }
+
+
 }
 
 /*# sourceMappingURL=style.css.map */