Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
julien balaka
co2
Commits
97e2b5cb
Commit
97e2b5cb
authored
Jan 23, 2019
by
Raph El
Browse files
merge
parent
9745ffc3
Changes
1
Hide whitespace changes
Inline
Side-by-side
views/element/about.php
View file @
97e2b5cb
...
...
@@ -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 */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment