Merge branch 'master' of h4ckypurpl3/tupali_fork into master
This commit is contained in:
commit
3d1ebd0dab
@ -52,10 +52,10 @@ body {overflow-x:hidden!important;}
|
||||
}
|
||||
|
||||
.thumbnail {
|
||||
height: 100%;
|
||||
height: 100% !important;
|
||||
overflow-y: auto;
|
||||
overflow-x: hidden;
|
||||
padding: 10px;
|
||||
padding: 0px 0px 70px 0px;;
|
||||
border:none;
|
||||
}
|
||||
|
||||
|
@ -5983,14 +5983,14 @@ if($ver_data[0] !="0") {$boton_ver_data =" <a target='datos'class='boton_land bt
|
||||
if($publico[0] =='1') {
|
||||
$linea .= "
|
||||
|
||||
<div style=' ' class=' articulo_cuadro col-xs-12 col-sm-10 col-lg-12' id='b_articulo_formulario_$row[id]'>
|
||||
<div style=' ' class=' articulo_cuadro col-xs-12 col-sm-10 col-lg-10' id='b_articulo_formulario_$row[id]'>
|
||||
<div class=' thumbnail box-secciones' id='b_articulo_formulario_$row[id]'>
|
||||
<a name='formulario_$row[id]'></a>
|
||||
<div class='row rp-b '>
|
||||
<div class='articulo_contenido col-md-4'>
|
||||
$imagen
|
||||
</div>
|
||||
<div id='articulo_contenido_$row[id]' class='articulo_contenido col-md-6 animate-box'>
|
||||
<div id='articulo_contenido_$row[id]' class='articulo_contenido col-md-8 animate-box'>
|
||||
<p>$contenido</p>
|
||||
<div id='botonera_landing' class='btn-group.btn-group-justified btn-group-sm' role='group'>
|
||||
$boton_agregar $mapa $boton_ver_data
|
||||
@ -6004,14 +6004,14 @@ if($publico[0] =='1') {
|
||||
}else{
|
||||
if($llenar[0] !="0"){
|
||||
$linea .="
|
||||
<div style=' ' class=' articulo_cuadro col-xs-12 col-sm-10 col-lg-12' id='b_articulo_formulario_$row[id]'>
|
||||
<div style=' ' class=' articulo_cuadro col-xs-12 col-sm-10 col-lg-10' id='b_articulo_formulario_$row[id]'>
|
||||
<div class=' thumbnail box-secciones ' id='b_articulo_formulario_$row[id]'>
|
||||
<a name='formulario_$row[id]'></a>
|
||||
<div class='row rp-b '>
|
||||
<div class='articulo_contenido col-md-4'>
|
||||
$imagen
|
||||
</div>
|
||||
<div class='articulo_contenido col-md-6 animate-box'>
|
||||
<div class='articulo_contenido col-md-8 animate-box'>
|
||||
<h2 class='text-center titulo_formulario section-heading'>
|
||||
<a href='#' onclick=\"xajax_formulario_embebido_ajax('','$row[id]','','nuevo');\" >$row[nombre] <i class='glyphicon glyphicon-external-link-square'></i></a></h2>
|
||||
<p class='descripcion_formulario text-left'>$row[descripcion] </p>
|
||||
|
Loading…
Reference in New Issue
Block a user