Commit 97e2b5cb authored by Raph El's avatar Raph El

merge

parent 9745ffc3
......@@ -417,7 +417,6 @@
// if( $badges = Badge::getBadgesByLinks($element["links"]) ){
// foreach ($badges as $key => $b) {
<<<<<<< HEAD
/* ?>
<div class="badgePH pull-left">
<span class="fa-stack tooltips" style="margin-bottom:5px" data-toggle="tooltip" data-placement="bottom" title='<?php echo $b["name"]?>'>
......@@ -426,16 +425,7 @@
<?php } else { ?>
<i class="fa fa-<?php echo Element::getFaIcon ( $b["type"] ) ?> main fa-2x fa-stack-1x text-red"></i>
<?php } ?>
=======
?>
<!-- <div class="badgePH pull-left">
<span class="fa-stack tooltips" style="margin-bottom:5px" data-toggle="tooltip" data-placement="bottom" title='<?php //echo $b["name"]?>'>
<?php //if(@$b["img"]){ ?>
<img src="<?php //echo $b["img"]?>" class="img-circle" style="height:40px" >
<?php //} else { ?>
<i class="fa fa-<?php //echo Element::getFaIcon ( $b["type"] ) ?> main fa-2x fa-stack-1x text-red"></i>
<?php //} ?>
>>>>>>> master
</span>
</div>
<?php */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment