Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Links in badge summary were not clickable. (#7303)

This commit is contained in:
Bianca Nenciu 2019-04-03 12:35:27 +03:00 committed by Régis Hanol
parent c5b76cd138
commit 1e1adb1afa
2 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/discourse/templates/components/badge-card.hbs
View File

@ -5,15 +5,13 @@
<span class='check-display status-checked'>{{d-icon "check"}}</span>
{{/if}}
<div class='badge-contents'>
<a href={{url}} class="badge-link">
<div class='badge-icon {{badge.badgeTypeClassName}}'>
{{icon-or-image badge}}
<a href={{url}}>{{icon-or-image badge}}</a>
</div>
<div class='badge-info'>
<div class='badge-info-item'>
<h3>{{badge.name}}</h3>
<h3><a href={{url}} class='badge-link'>{{badge.name}}</a></h3>
<div class='badge-summary'>{{{summary}}}</div>
</div>
</div>
</a>
</div>

11
app/assets/stylesheets/common/base/user-badges.scss
View File

@ -147,14 +147,10 @@
display: flex;
min-height: 128px;
height: 100%;
padding: 0 10%;
.badge-link {
display: flex;
flex: 1 1 auto;
padding: 0 10%;
@include breakpoint(mobile) {
padding: 0 5%;
}
color: $primary;
}
.badge-icon {
@ -237,16 +233,13 @@
margin-right: 1.5em;
}
.badge-contents {
.badge-link {
padding: 0 5%;
width: 90%;
h3 {
font-size: $font-up-3;
}
}
}
}
}
.badges-granted {
display: flex;