Merge branch 'master' of h4ckypurpl3/tupali_fork into master

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "milfs"]
 	path = milfs
-	url = https://code.tupale.co/qwerty/milfs.git
+	url = https://code.tupale.co/kleper/milfskleper.git

index.php

@@ -1469,7 +1469,7 @@ echo $css_adicional;
 
 
 
-<div class="col-sm-<?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) ;

librerias/bootstrap-toc/bootstrap-toc.min.css

@@ -1,4 +1,61 @@
 /*!
  * Bootstrap Table of Contents v0.4.1 (http://afeld.github.io/bootstrap-toc/)
  * Copyright 2015 Aidan Feldman
- * Licensed under MIT (https://github.com/afeld/bootstrap-toc/blob/gh-pages/LICENSE.md) */nav[data-toggle=toc] .nav>li>a{display:block;padding:4px 20px;font-size:13px;font-weight:500;color:#767676}nav[data-toggle=toc] .nav>li>a:focus,nav[data-toggle=toc] .nav>li>a:hover{padding-left:19px;color:#563d7c;text-decoration:none;background-color:transparent;border-left:1px solid #563d7c}nav[data-toggle=toc] .nav>.active:focus>a,nav[data-toggle=toc] .nav>.active:hover>a,nav[data-toggle=toc] .nav>.active>a{padding-left:18px;font-weight:700;color:#563d7c;background-color:transparent;border-left:2px solid #563d7c}nav[data-toggle=toc] .nav .nav{display:none;padding-bottom:10px}nav[data-toggle=toc] .nav .nav>li>a{padding-top:1px;padding-bottom:1px;padding-left:30px;font-size:12px;font-weight:400}nav[data-toggle=toc] .nav .nav>li>a:focus,nav[data-toggle=toc] .nav .nav>li>a:hover{padding-left:29px}nav[data-toggle=toc] .nav .nav>.active:focus>a,nav[data-toggle=toc] .nav .nav>.active:hover>a,nav[data-toggle=toc] .nav .nav>.active>a{padding-left:28px;font-weight:500}nav[data-toggle=toc] .nav>.active>ul{display:block}
+ * Licensed under MIT (https://github.com/afeld/bootstrap-toc/blob/gh-pages/LICENSE.md) */
+
+nav[data-toggle=toc] .nav>li>a {
+    display: block;
+    padding: 4px 20px;
+    font-size: 13px;
+    font-weight: 500;
+    color: #767676
+}
+
+nav[data-toggle=toc] .nav>li>a:focus,
+nav[data-toggle=toc] .nav>li>a:hover {
+    padding-left: 19px;
+    color: #563d7c;
+    text-decoration: none;
+    background-color: transparent;
+    border-left: 1px solid #563d7c
+}
+
+nav[data-toggle=toc] .nav>.active:focus>a,
+nav[data-toggle=toc] .nav>.active:hover>a,
+nav[data-toggle=toc] .nav>.active>a {
+    padding-left: 18px;
+    font-weight: 700;
+    color: #563d7c;
+    background-color: transparent;
+    border-left: 2px solid #563d7c
+}
+
+nav[data-toggle=toc] .nav .nav {
+    display: none;
+    padding-bottom: 10px
+}
+
+nav[data-toggle=toc] .nav .nav>li>a {
+    padding-top: 1px;
+    padding-bottom: 1px;
+    padding-left: 30px;
+    font-size: 12px;
+    font-weight: 400
+}
+
+nav[data-toggle=toc] .nav .nav>li>a:focus,
+nav[data-toggle=toc] .nav .nav>li>a:hover {
+	padding-top: 100px;
+    padding-left: 29px
+}
+
+nav[data-toggle=toc] .nav .nav>.active:focus>a,
+nav[data-toggle=toc] .nav .nav>.active:hover>a,
+nav[data-toggle=toc] .nav .nav>.active>a {
+    padding-left: 28px;
+    font-weight: 500
+}
+
+nav[data-toggle=toc] .nav>.active>ul {
+    display: block
+}

temas/magazine/css/style.css

@@ -774,6 +774,8 @@ figure figcaption {
     width: 100%;
     float: none;
   }
+
+
 }
 
 /*# sourceMappingURL=style.css.map */