Merge branch 'master' of h4ckypurpl3/tupali_fork into master

This commit is contained in:
kleper 2018-04-22 11:12:46 -05:00 committed by Gogs
commit 0d47921874
3 changed files with 7 additions and 7 deletions

View File

@ -1369,14 +1369,14 @@ echo $css_adicional;
<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-sm-12 col-md-9' id="encabezado_proyecto">
<div class='col-sm-12 col-md-6 col-lg-9' id="encabezado_proyecto">
<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>
</div>
</div>
<div id="asistento" class="col-md-12 text-center">
<div id="asistento" class="col-md-push-1 col-md-10 col-lg-12 col-lg-pull-2 text-center">
<?php
if(isset($_REQUEST['asistento'])) {
echo asistente_aplicaciones("",'','','');
@ -1434,7 +1434,7 @@ echo $css_adicional;
</div>
<div class='col-md-9' id='texto_articulo'>"
;
}else{ echo "<div class='col-sm-push-1 col-sm-12 col-md-12' id='texto_articulo'>" ;} ?>
}else{ echo "<div class='col-sm-12 col-md-push-1 col-md-10 col-lg-12' id='texto_articulo'>" ;} ?>
<?php echo $eventos;
if($id_empresa=="") {

View File

@ -48,8 +48,8 @@
.box-secciones {
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);
border-radius: 0px;
border: none;
border-radius: 0px !important;
border: none !important;
}
.box-secciones:hover {

View File

@ -5910,7 +5910,7 @@ 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-6 col-md-4' id='b_articulo_formulario_$row[id]'>
<div style=' ' class=' articulo_cuadro col-xs-12 col-sm-6 col-md-6 col-lg-4' 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 '>
@ -5931,7 +5931,7 @@ if($publico[0] =='1') {
}else{
if($llenar[0] !="0"){
$linea .="
<div style=' ' class=' articulo_cuadro col-xs-12 col-sm-6 col-md-4' id='b_articulo_formulario_$row[id]'>
<div style=' ' class=' articulo_cuadro col-xs-12 col-sm-6 col-md-6 col-lg-4' 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 '>