qwerty/tupali
4
1
Fork 1
Code Issues 25 Pull Requests Releases Wiki Activity

Cambios en css #146

Merged
kleper merged 9 commits from h4ckypurpl3/tupali_fork:master into master 2018-07-18 21:37:07 +00:00
Conversation 0 Commits 9 Files Changed 4 +120 -48
7 changed files with 120 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 17fd890e30 - Show all commits

4
index.php
View File

@ -191,7 +191,7 @@ if ($variable !=''){
} }
$acceso = 1; $acceso = 1;
$menu =" $menu ="
<div class='col-sm-2 hidden-xs hidden-sm' id='caja_lateral_derecha'> <div class='col-sm-3 col-lg-2 hidden-xs hidden-sm' id='caja_lateral_derecha'>
<div class='container'> <div class='container'>
<nav style=' max-height:95% !important ; overflow:auto !important; ' id='toc' data-spy='affix' data-toggle='toc'></nav> <nav style=' max-height:95% !important ; overflow:auto !important; ' id='toc' data-spy='affix' data-toggle='toc'></nav>
</div> </div>
@ -1464,7 +1464,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; ?>">
<?php echo $menu_lateral ; ?> <?php echo $menu_lateral ; ?>
<!-- END #fh5co-offcanvas --> <!-- END #fh5co-offcanvas -->
<header id="fh5co-header"> <header id="fh5co-header">

2
landingpage.php
View File

@ -516,7 +516,7 @@ else{}
<?php echo @$onload; ?> <?php echo @$onload; ?>
<?php <?php
if ( isset ( $_SESSION['id'] ) ) { ?> if ( isset ( $_SESSION['id'] ) ) { ?>
<div class="navbar navbar-inverse nav-bar-fixed-top " role="navigation"> <div class="navbar navbar-inverse navbar-fixed-top " role="navigation">
<div class="container-fluid"> <div class="container-fluid">
<!-- Brand and toggle get grouped for better mobile display --> <!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header"> <div class="navbar-header">

59
librerias/bootstrap-toc/bootstrap-toc.min.css vendored
View File

@ -1,4 +1,61 @@
/*! /*!
* Bootstrap Table of Contents v0.4.1 (http://afeld.github.io/bootstrap-toc/) * Bootstrap Table of Contents v0.4.1 (http://afeld.github.io/bootstrap-toc/)
* Copyright 2015 Aidan Feldman * 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
}

11
milfs/css/milfs.css Normal file
View File

@ -0,0 +1,11 @@
/*Este archivo tiene los estilos de milfs,
el otro archivo css style.css que está en la carpeta milfs
no está referenciado en index.php de milfs*/
#contenedor_principal{
padding-top: 100px;
}
#menu_milfs{
padding-left: 100px;
}

55
milfs/css/style.css
View File

@ -1,4 +1,7 @@
body {overflow-x:hidden!important;} body {
overflow-x: hidden!important;
}
#cabecera-botonera-admin { #cabecera-botonera-admin {
background-color: #777677; background-color: #777677;
@ -55,12 +58,13 @@ body {overflow-x:hidden!important;}
height: 100% !important; height: 100% !important;
overflow-y: auto; overflow-y: auto;
overflow-x: hidden; overflow-x: hidden;
padding: 0px 0px 70px 0px;; padding: 0px 0px 70px 0px;
border:none; ;
border: none;
} }
.box-secciones { .box-secciones {
/* box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24); /* box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24);
transition: all 0.3s cubic-bezier(.25, .8, .25, 1);*/ transition: all 0.3s cubic-bezier(.25, .8, .25, 1);*/
border-radius: 0px !important; border-radius: 0px !important;
padding: 50px; padding: 50px;
@ -83,13 +87,14 @@ body {overflow-x:hidden!important;}
display: inline-flex !important; display: inline-flex !important;
} }
#fh5co-footer{ #fh5co-footer {
display: inline-block; display: inline-block;
} }
/* nube de etiquetas */ /* nube de etiquetas */
div.etiquetas { div.etiquetas {
@ -151,6 +156,7 @@ span.etiquetatam10 {
/* nube de etiquetas */ /* nube de etiquetas */
.drop-up { .drop-up {
@ -177,8 +183,7 @@ span.etiquetatam10 {
margin-top: -13px; margin-top: -13px;
} }
.navbar-principal>li>a, .navbar-principal>li>a{
{
padding-top: 0px !important; padding-top: 0px !important;
padding-bottom: 0 !important; padding-bottom: 0 !important;
height: 30px; height: 30px;
@ -196,7 +201,6 @@ span.etiquetatam10 {
width: 100px !important; width: 100px !important;
display: inline; display: inline;
height: 30px; height: 30px;
padding-top: -10px !important;
padding-bottom: 0 !important; padding-bottom: 0 !important;
height: 30px; height: 30px;
background: none; background: none;
@ -213,6 +217,7 @@ span.etiquetatam10 {
/*width:80px; background: none; border:0px; -webkit-box-shadow: none; /*width:80px; background: none; border:0px; -webkit-box-shadow: none;
-moz-box-shadow: none; -moz-box-shadow: none;
box-shadow: none; box-shadow: none;
@ -234,7 +239,9 @@ box-shadow: none;
} }
} }
<!-- ESTILOS PRIORITARIOS -->.modal-dialog { /*ESTILOS PRIORITARIOS*/
.modal-dialog {
width: 95% !important; width: 95% !important;
height: auto; height: auto;
padding: 0; padding: 0;
@ -243,14 +250,12 @@ box-shadow: none;
.modal-lg { .modal-lg {
width: 98% !important; width: 98% !important;
height: auto; height: auto;
padding: 0; padding: 0;
} }
.modal-xs { .modal-xs {
width: 40% !important; width: 40% !important;
height: auto; height: auto;
padding: 0; padding: 0;
} }
@ -283,8 +288,7 @@ legend.legend-area {
} }
.fh5co-post-entry article h2 { .fh5co-post-entry article h2 {
font-size: 28px; font-size: 28px !important;
!important;
} }
#fh5co-offcanvas .fh5co-bio img { #fh5co-offcanvas .fh5co-bio img {
@ -314,12 +318,10 @@ legend.legend-area {
/*RESPONSIVE*/ /*RESPONSIVE*/
@media only screen and (min-width: 1200px) { @media only screen and (min-width: 1200px) {}
}
@media (max-width: 991px) { @media (max-width: 991px) {
#encabezado_proyecto { #encabezado_proyecto {
@ -333,7 +335,8 @@ legend.legend-area {
padding-top: 0px !important; padding-top: 0px !important;
} }
#buscador_blog { #buscador_blog {
padding: 0px;; padding: 0px;
;
} }
} }
@ -343,13 +346,13 @@ legend.legend-area {
min-height: calc(100vh - 100px) !important; min-height: calc(100vh - 100px) !important;
} }
#texto_articulo{ #texto_articulo {
padding: 0px !important; padding: 0px !important;
} }
.box-secciones { .box-secciones {
padding: 5px !important; padding: 5px !important;
} }
#menu_tupale { #menu_tupale {
background-color: #dfdfdf; background-color: #dfdfdf;
@ -376,10 +379,9 @@ padding: 0px !important;
margin-bottom: 3px; margin-bottom: 3px;
} }
#btn_filtro{ #btn_filtro {
margin-bottom: 3px; margin-bottom: 3px;
} }
} }
@ -401,4 +403,5 @@ padding: 0px !important;
/*FIN responsive*/ /*FIN responsive*/

31
milfs/funciones/funciones.php
View File

@ -5986,7 +5986,7 @@ if($ver_data[0] !="0") {$boton_ver_data =" <a target='datos'class='boton_land bt
if($publico[0] =='1') { if($publico[0] =='1') {
$linea .= " $linea .= "
<div style=' ' class=' articulo_cuadro col-xs-12 col-sm-10 col-lg-10' id='b_articulo_formulario_$row[id]'> <div style=' ' class=' articulo_cuadro col-xs-12 col-sm-push-1 col-sm-9 col-lg-push-1 col-lg-10' id='b_articulo_formulario_$row[id]'>
<div class=' thumbnail box-secciones' id='b_articulo_formulario_$row[id]'> <div class=' thumbnail box-secciones' id='b_articulo_formulario_$row[id]'>
<a name='formulario_$row[id]'></a> <a name='formulario_$row[id]'></a>
<div class='row rp-b '> <div class='row rp-b '>
@ -6007,7 +6007,7 @@ if($publico[0] =='1') {
}else{ }else{
if($llenar[0] !="0"){ if($llenar[0] !="0"){
$linea .=" $linea .="
<div style=' ' class=' articulo_cuadro col-xs-12 col-sm-10 col-lg-10' id='b_articulo_formulario_$row[id]'> <div style=' ' class=' articulo_cuadro col-xs-12 col-sm-push-1 col-sm-9 col-lg-push-1 col-lg-10' id='b_articulo_formulario_$row[id]'>
<div class=' thumbnail box-secciones ' id='b_articulo_formulario_$row[id]'> <div class=' thumbnail box-secciones ' id='b_articulo_formulario_$row[id]'>
<a name='formulario_$row[id]'></a> <a name='formulario_$row[id]'></a>
<div class='row rp-b '> <div class='row rp-b '>
@ -6460,7 +6460,7 @@ $resultado .= "
</table> </table>
<legend>Agregar empresa</legend> <legend>Agregar empresa</legend>
<div class='row'> <div class='row'>
<form role='form' id='agregar' name='agregar'> <form role='form' id='agregar' class='agregar_area'name='agregar'>
<input type='hidden' name='estado' id='estado' value='1'> <input type='hidden' name='estado' id='estado' value='1'>
<div class='col-xs-4'> <div class='col-xs-4'>
@ -9681,7 +9681,7 @@ function tabla_areas($tabla,$value,$descripcion,$onchange,$where,$nombre,$div){
if($div =="") { if($div =="") {
$div="div_campos"; $div="div_campos";
$resultado = " $resultado = "
<div class='btn btn-default btn-block' onclick= \"xajax_tabla_areas('$tabla','$value','$descripcion','$onchange','$where','$nombre','$div') \">Modificar areas</a></div> <div class='btn btn-default btn-block btn-warning' onclick= \"xajax_tabla_areas('$tabla','$value','$descripcion','$onchange','$where','$nombre','$div') \">Crear / Modificar Áreas</a></div>
<!-- <div id='$div'></div> -->"; <!-- <div id='$div'></div> -->";
return $resultado; return $resultado;
} }
@ -9701,7 +9701,7 @@ $consulta = "SELECT * FROM $tabla WHERE 1 $w AND id_empresa='$_SESSION[id_empre
$sql=mysqli_query($link,$consulta); $sql=mysqli_query($link,$consulta);
if($nombre==''){$name=$tabla."_".$value;}else{$name = "$nombre";} if($nombre==''){$name=$tabla."_".$value;}else{$name = "$nombre";}
$resultado=" <table class='table table-striped table-responsive' > $resultado=" <table class='table table-striped table-responsive table-hover' >
<legend>$name</legend> <legend>$name</legend>
<tr ><th>Id</th><th>$campo1</th><th>$campo2</th><th>$campo3</th><th>$campo4</th><th></th></tr> <tr ><th>Id</th><th>$campo1</th><th>$campo2</th><th>$campo3</th><th>$campo4</th><th></th></tr>
" ; " ;
@ -9725,12 +9725,13 @@ $linea++;
} }
$resultado .= " $resultado .= "
<tr>
<tr class='warning'>
<td colspan='4' > <td colspan='4' >
<form role='form' id='agregar' name='agregar'> <form role='form' id='agregar' name='agregar'>
<input type='hidden' name='estado' id='estado' value='1'> <input type='hidden' name='estado' id='estado' value='1'>
<input type='hidden' name='orden' id='orden' value='$linea'> <input type='hidden' name='orden' id='orden' value='$linea'>
<div class='col-xs-2'>Agregar área</div> <div class='col-xs-2'>Crear Área</div>
<div class='col-xs-4'> <div class='col-xs-4'>
<input placeholder='$campo1' class='form-control' type='text' id='$campo1' name='$campo1' > <input placeholder='$campo1' class='form-control' type='text' id='$campo1' name='$campo1' >
</div> </div>
@ -12534,8 +12535,8 @@ if($contenido_original !="") {
}else {$metadatos='';} }else {$metadatos='';}
$resultado .= " $resultado .= "
<div id='contenedor_$row[id_campo]' class='contenedor_campo'> <div id='contenedor_$row[id_campo]' class='contenedor_campo'>
<pdata-toc-skip class='campo_contenido' id='contenido_$row[id_campo]'> <p data-toc-skip class='campo_contenido' id='contenido_$row[id_campo]'>
<span tiple= '$campo_tipo' class='campo_titulo campo_nombre' id='nombre_$row[id_campo]'>$campo_nombre[0]</span><span class='pull-right'> $metadatos </span><br> <span type= '$campo_tipo' class='campo_titulo campo_nombre' id='nombre_$row[id_campo]'>$campo_nombre[0]</span><span class='pull-right'> $metadatos </span><br>
$contenido</p> $contenido</p>
</div>"; </div>";
@ -14028,7 +14029,7 @@ $resultado .= "
</div>"; </div>";
$resultado = " $resultado = "
<br> <br>
<div class='alert alert-warning'> <div class='alert alert-info'>
<legend>Crear un nuevo campo</legend> <legend>Crear un nuevo campo</legend>
$resultado $resultado
</div> </div>
@ -14061,7 +14062,7 @@ $consulta_campos ="SELECT id, campo_nombre, campo_descripcion, tipo_campo_accion
if($campo ==''){ if($campo ==''){
$listado_campos = select('form_campos','id','campo_nombre',"xajax_formulario_crear_campo('',(this.value),'$div')","id_empresa = '$_SESSION[id_empresa]' AND activo = '1'",'campo_editar',''); $listado_campos = select('form_campos','id','campo_nombre',"xajax_formulario_crear_campo('',(this.value),'$div')","id_empresa = '$_SESSION[id_empresa]' AND activo = '1'",'campo_editar','');
$areas = tabla_areas('form_areas','id','nombre,descripcion,estado,orden','',"",'Areas',''); $areas = tabla_areas('form_areas','id','nombre,descripcion,estado,orden','',"",'Áreas o Grupos de campo','');
$tabla_campos = campos_tabla('id_especialista','','20','0',''); $tabla_campos = campos_tabla('id_especialista','','20','0','');
$buscador = campos_buscador("",""); $buscador = campos_buscador("","");
$campos_formulario = " $campos_formulario = "
@ -14077,7 +14078,7 @@ $campos_formulario = "
$areas $areas
</div> </div>
<div class='col-sm-6'> <div class='col-sm-6'>
<div class='btn btn-block btn-default' OnClick=\"xajax_crear_campos_formulario(xajax.getFormValues('nuevo_campo'),'');\"><i class='glyphicon glyphicon-plus-sign'></i> Crear un nuevo campo</div> <div class='btn btn-block btn-primary ' OnClick=\"xajax_crear_campos_formulario(xajax.getFormValues('nuevo_campo'),'');\"><i class='glyphicon glyphicon-plus-sign'></i> Crear un nuevo campo</div>
</div> </div>
<!-- <div class='col-sm-4'> <!-- <div class='col-sm-4'>
<div class='input-group'><span class='input-group-addon'>Modificar campo</span> $listado_campos</div> <div class='input-group'><span class='input-group-addon'>Modificar campo</span> $listado_campos</div>
@ -16948,8 +16949,8 @@ function milfs(){
</li>"; </li>";
$menu = $menu =
" <!-- Collect the nav links, forms, and other content for toggling --> " <!-- Collect the nav links, forms, and other content for toggling -->
<div class='collapse navbar-collapse' id='bs-example-navbar-collapse-1'> <div class='collapse navbar-collapse navbar-fixed-top' id='bs-example-navbar-collapse-1'>
<ul class='nav navbar-nav'> <ul class='nav navbar-nav navbar-fixed-top' id='menu_milfs'>
<li><a href='https://$url_home' target='web'><i class='glyphicon glyphicon-home'></i></a></li> <li><a href='https://$url_home' target='web'><i class='glyphicon glyphicon-home'></i></a></li>
<li>$crear_campos</li> <li>$crear_campos</li>
@ -16959,7 +16960,7 @@ function milfs(){
<li >$configuracion</li> <li >$configuracion</li>
</ul> </ul>
<ul class='nav navbar-nav navbar-right'> <ul class='nav navbar-nav navbar-right '>
$login $login

6
milfs/index.php
View File

@ -48,7 +48,7 @@ if (isset($_REQUEST['t'])) {$t = $_REQUEST['t'];} else {$t = "";}
<link rel="apple-touch-icon-precomposed" href="favicon-152.png"> <link rel="apple-touch-icon-precomposed" href="favicon-152.png">
<!-- <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css" rel="stylesheet" integrity="sha256-k2/8zcNbxVIh5mnQ52A0r3a6jAgMGxFJFE2707UxGCk= sha512-ZV9KawG2Legkwp3nAlxLIVFudTauWuBpC10uEafMHYL0Sarrz5A7G79kXh5+5+woxQ5HM559XX2UZjMJ36Wplg==" crossorigin="anonymous"> --> <!-- <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css" rel="stylesheet" integrity="sha256-k2/8zcNbxVIh5mnQ52A0r3a6jAgMGxFJFE2707UxGCk= sha512-ZV9KawG2Legkwp3nAlxLIVFudTauWuBpC10uEafMHYL0Sarrz5A7G79kXh5+5+woxQ5HM559XX2UZjMJ36Wplg==" crossorigin="anonymous"> -->
<?php if($form !='') { echo "<link href='css/embebidoXXX.css' rel='stylesheet'>";}else{ echo "<link href='css/estilos.php?dd' rel='stylesheet'>";} ?> <?php if($form !='') { echo "<link href='css/embebidoXXX.css' rel='stylesheet'>";}else{ echo "<link href='css/estilos.php?dd' rel='stylesheet'>";} ?>
<link rel="stylesheet" type="text/css" media="screen" href="css/milfs.css">
<link rel="stylesheet" type="text/css" media="screen" href="css/bootstrap.css"> <link rel="stylesheet" type="text/css" media="screen" href="css/bootstrap.css">
<link rel="stylesheet" type="text/css" media="screen" href="css/bootstrap-markdown.css"> <link rel="stylesheet" type="text/css" media="screen" href="css/bootstrap-markdown.css">
<link rel="stylesheet" type="text/css" media="screen" href="css/bootstrap-markdown.min.css"> <link rel="stylesheet" type="text/css" media="screen" href="css/bootstrap-markdown.min.css">
@ -194,7 +194,7 @@ else{}
<?php echo @$onload; ?> <?php echo @$onload; ?>
<?php <?php
if ( isset ( $_SESSION['id'] ) ) { ?> if ( isset ( $_SESSION['id'] ) ) { ?>
<div class="navbar navbar-inverse nav-bar-fixed-top " role="navigation"> <div class="navbar navbar-inverse navbar-fixed-top " role="navigation">
<div class="container-fluid"> <div class="container-fluid">
<!-- Brand and toggle get grouped for better mobile display --> <!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header"> <div class="navbar-header">
@ -216,7 +216,7 @@ else{}
<div id='debug'></div> <div id='debug'></div>
<div class='container'> <div class='container' id='contenedor_principal'>
<div id='contenido'> <div id='contenido'>