Merge branch 'master' of kleper/milfskleper into master

css/style.css

@@ -1,10 +1,12 @@
 body {
+
   overflow-x: hidden !important;
   font-family: "Roboto", "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-size: 14px;
   line-height: 1.42857143;
   color: #333;
   font-weight: 400;
+  width: 100% !important;
 }
 
 h1, h2, h3, h4, h5, h6 {
@@ -12,49 +14,78 @@ h1, h2, h3, h4, h5, h6 {
   font-weight: 500;
   line-height: 1.1;
 }
+
 #toc {
   font-size: 1em;
   padding-top: 50px;
   max-height: 95% !important;
   overflow: auto !important;
-
 }
 
 .top {
   opacity: 1;
 }
+
 .navbar-inverse {
   background-color: #222;
   border-color: #090909;
 }
+
 .navbar-inverse .navbar-nav>li>a {
   color: #9d9d9d;
 }
+
 .navbar-inverse .navbar-nav>li>a:hover, .navbar-inverse .navbar-nav>li>a:focus {
   background: #fb4f59;
 }
 
+.navbar-inverse .navbar-collapse, .navbar-inverse .navbar-form {
+  border-color: transparent;
+}
+
+#contenedor_cabecera {
+  padding-top: 0em;
+}
+
+#logo_cabecera {
+  max-width: 80% !important;
+  margin: 0 auto;
+}
+
 #titulo_cabecera a {
   color: lightgrey !important;
   text-transform: uppercase;
 }
-#menu_tupale {
+
-    height: 500px;
+#slogan_cabecera {
+  font-size: 2em;
+  text-shadow: 0px 2px 3px rgba(0, 0, 0, 0.4);
+  margin-left: 5em;
+  margin-right: 5em;
+}
+
+.menu_tupale {
+  height: 50vh;
   overflow: auto;
 }
 
-#cabecera-botonera-admin {
+#div_panel_aplicaciones {
-    background-color: #777677;
+  padding-top: 21em;
-}
-#ingreso_usuario{
-  color: white !important;
-  padding-top: 10px;
-  padding-bottom: 10px;
-  white-space:normal !important;
-  word-wrap: break-word;
 }
 
 /*NAVBAR BRAND*/
+#menu_mobil{
+  display: grid !important;
+}
+#menu_social{
+  text-align: right;
+  float: right;
+}
+
+#menu_hamburguesa{
+  color: white;
+  background-color: none !important;
+}
 .navbar-brand {
   transform: translateX(-50%);
   left: 50%;
@@ -70,33 +101,30 @@ h1, h2, h3, h4, h5, h6 {
 }
 
 /*logo barra navegacion*/
+
 .navbar-brand img {
   width: 15em;
   height: auto;
-margin-top: 100px;
+  transition: all 1s ease;
-transition: all 1.3s ease;
-
 }
 
 /* textos menú*/
 
-.navbar a {
+#navbar-principal {
   font-size: 18px;
-    padding-bottom: 40px !important;
+  padding-bottom: 2em !important;
-    padding-top: 40px !important;
+  padding-top: 2em !important;
   transition: all 0.3s ease;
 }
 
-
 .navbar.shrink {
   min-height: 35px;
 }
 
-
+#navbar-principal.shrink {
-.navbar.shrink  a {
   font-size: 18px;
-    padding-bottom: 18px !important;
+  padding-bottom: 1em !important;
-    padding-top: 20px !important;
+  padding-top: 1em !important;
 }
 
 .navbar.shrink img {
@@ -114,21 +142,23 @@ transition: all 1.3s ease;
 .navbar-toggle {
   margin: 13px 15px 13px 0;
   padding: 4px 5px;
-
 }
 
 .btn-botonera-admin {
   margin-left: 20px;
   margin-right: 20px;
-    border-left: 1px solid white;
 }
 
-
+#botonera-admin, #botonera-admin>a {
-#botonera-admin,
-#botonera-admin>a {
   color: white !important;
 }
 
+.btn-botonera-admin {
+  /* margin-left: 20px; */
+  /* margin-right: 20px; */
+  float: left;
+}
+
 .btn-botonera-admin:hover {
   background-color: black;
 }
@@ -154,16 +184,12 @@ transition: all 1.3s ease;
   padding-left: 80px !important;
 }
 
-#logo_cabecera {
+
-    max-width: 80% !important;
-    margin: 0 auto;
-}
 
 #encabezado_proyecto {
   padding-top: 30px;
 }
 
-
 /*PROYECTOS*/
 
 /* @media (max-width: 767px){
@@ -176,13 +202,12 @@ transition: all 1.3s ease;
   background-color: #d4d4d4;
 }
 
-
 .div_proyecto {
   display: inline-block;
   position: relative;
   margin: 10px;
   float: left;
-  background-color: grey;
+  background-color: darkgray;
   height: 14em;
   width: 14em;
 }
@@ -199,6 +224,7 @@ transition: all 1.3s ease;
   transition: filter 0.2s;
   -webkit-transition: -webkit-filter 1s;
 }
+
 .img-gris:hover {
   filter: grayscale(0);
   z-index: 11;
@@ -212,18 +238,22 @@ filter: grayscale(0);
   background-color: #000;
   padding: 2px;
   opacity: 0.5;
-      font-weight:bold; width:190px; z-index:20; word-wrap: break-word;
+  font-weight: bold;
+  width: 190px;
+  z-index: 20;
+  word-wrap: break-word;
 }
 
 /*fin proyectos*/
 
-
+/*Panel Editor*/
 
 .thumbnail {
   height: 100% !important;
   overflow-y: auto;
   overflow-x: hidden;
-    padding: 0px 0px 70px 0px;;
+  padding: 0px 0px 70px 0px;
+  ;
   border: none;
 }
 
@@ -255,9 +285,6 @@ filter: grayscale(0);
   display: inline-block;
 }
 
-
-
-
 /* nube de etiquetas */
 
 div.etiquetas {
@@ -314,17 +341,11 @@ span.etiquetatam10 {
   font-size: 300%;
 }
 
-
-
-
-
-
 /* nube de etiquetas */
 
 .drop-up {
   top: auto;
   bottom: 100% !important;
-
   overflow: visible;
 }
 
@@ -345,8 +366,7 @@ span.etiquetatam10 {
   margin-top: -13px;
 }
 
-.navbar-principal>li>a,
+.navbar-principal>li>a, {
-{
   padding-top: 0px !important;
   padding-bottom: 0 !important;
   height: 30px;
@@ -357,14 +377,10 @@ span.etiquetatam10 {
   min-height: 30px !important;
 }
 
-
-
-
 .topnav {
   width: 100px !important;
   display: inline;
   height: 30px;
-    padding-top: -10px !important;
   padding-bottom: 0 !important;
   height: 30px;
   background: none;
@@ -374,13 +390,6 @@ span.etiquetatam10 {
   box-shadow: none;
 }
 
-
-
-
-
-
-
-
 /*width:80px; background: none; border:0px; -webkit-box-shadow: none;
 -moz-box-shadow: none;
 box-shadow: none;
@@ -402,8 +411,7 @@ box-shadow: none;
   }
 }
 
-<!-- ESTILOS PRIORITARIOS -->
+< !-- ESTILOS PRIORITARIOS -->.modal-dialog {
-.modal-dialog {
   width: 95% !important;
   height: auto;
   padding: 0;
@@ -412,14 +420,12 @@ box-shadow: none;
 .modal-lg {
   width: 98% !important;
   height: auto;
-
   padding: 0;
 }
 
 .modal-xs {
   width: 40% !important;
   height: auto;
-
   padding: 0;
 }
 
@@ -477,29 +483,95 @@ legend.legend-area {
   padding: 0 10px;
   border-bottom: none;
 }
+
 /*
 RESPONSIVE */
 
-@media (max-width: 767px){
+/*Se afectan todos hacia arriba*/
-.box {
-    display: table !important;
-}
-}
 
 @media (min-width: 767px) {
-#slogan_cabecera{
-  font-size: 2em;
-  text-shadow: 0px 2px 3px rgba(0,0,0,0.4);
-  margin-left: 5em;
-  margin-right: 5em;
-}
-#contenedor_cabecera{
-  padding-top: 15em;
-  padding-bottom: 3em;
-}
-
   #cabecera {
     margin-left: 20px;
     margin-right: 20px;
   }
 }
+
+@media only screen and (max-width: 1200px) {
+  #logo_cabecera {
+    padding-top: 3em;
+  }
+
+  #div_panel_aplicaciones{
+    padding-top: 23em;
+  }
+
+  .img-gris {
+    filter: grayscale(0);
+  }
+}
+
+@media only screen and (max-width: 992px) {
+#slogan_cabecera{
+  margin: 0em !important;
+}
+
+}
+
+@media only screen and (max-width: 767px) {
+  .navbar-header {
+    margin: 0px !important;
+    float: left;
+  }
+
+  #slogan_cabecera{
+    font-size: 1.5em;
+  }
+  #logo_cabecera {
+    padding-top: 0em;
+  }
+  #div_panel_aplicaciones {
+    padding-top: 21em;
+  }
+
+}
+
+@media only screen and (max-width: 586px) {
+  #contenedor_cabecera {
+    padding-top: 0em;
+  }
+  #div_panel_aplicaciones {
+    padding-top: 15em;
+  }
+  #logo_cabecera {
+    max-width: 65% !important;
+  }
+  #principal_general {
+    padding-left: 2em;
+  }
+  #texto_articulo{
+    padding: 0px !important
+  }
+}
+
+@media only screen and (max-width: 495px) {
+  #contenedor_cabecera {
+    padding-top: 0em;
+  }
+
+  #principal_general {
+    padding-left: 3em;
+}
+#proyectos{
+  display: grid !important;
+}
+
+}
+
+@media only screen and (max-width: 320px) {
+  #slogan_cabecera {
+    font-size: 1em;
+  }
+  #div_panel_aplicaciones {
+    padding-top: 10em;
+}
+}

funciones/funciones.php

@@ -2691,7 +2691,7 @@ $listado .= "<li > <a class='btn btn-link'  onclick=\"xajax_portal_filtro_cadena
 				Filtro $campo_nombre[0] <i class='glyphicon glyphicon-filter'></i>
 				 <span class='caret'></span>
 				 </button>
-				 <ul class='dropdown-menu' aria-labelledby='drown_$tabla'>
+				 <ul class='menu_tupale dropdown-menu' aria-labelledby='drown_$tabla'>
 				 $listado
 				 </ul>
 		 	</div>
@@ -4148,13 +4148,12 @@ $boton="
 	$cambiar_empresa
 	<div class='btn-group btn form-inline' role='group' aria-label='botonera-administracion' id='botonera-admin'>
 		<div onclick=\"xajax_panel_aplicaciones('$tipo','$empresa','div_panel_aplicaciones'); \" class='btn btn-botonera-admin'>Editor</div>
-		$desadministrador
+		<a href='milfs/' class='btn btn-botonera-admin'>Des-administrador</a>
-		<a class='btn btn-botonera-admin hidden-xs' onclick=\"xajax_cerrar_sesion(); \">$_SESSION[username] $_SESSION[equipo] Salir <i class='glyphicon glyphicon-log-out '></i></a>
 	</div>
 </div>
 
-		<a class='btn btn-botonera-admin visible-xs' onclick=\"xajax_cerrar_sesion(); \">$_SESSION[username] $_SESSION[equipo] Salir <i class='glyphicon glyphicon-log-out '></i></a>
+
-			<div class='container-fluid' id='div_panel_aplicaciones' style='max-height:500px; overflow:auto;'></div>";
+			<div class='container-fluid' id='div_panel_aplicacionesX' style='max-height:500px; overflow:auto;'></div>";
 $resultado="$boton";
 return $resultado;
 }else {
@@ -5813,7 +5812,7 @@ while( $row = mysqli_fetch_array( $sql ) ) {
 	              <div class='proyecto col-md-$cols col-sm-$cols ' title=''>
 	              <div class='div_proyecto'>
                     <a href='http://$dominio[0]/e$row[id_empresa]' target ='empresa'>
-                    <div class='proyecto_titulo ' style=''>$row[razon_social]</div>
+                    <div href='http://$dominio[0]/e$row[id_empresa]' target ='empresa' class='proyecto_titulo ' style=''>$row[razon_social]</div>
                     $logo