IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

remove hard-coded avatar url

Browse Source
This commit is contained in:
Neil Lalonde 2016-08-17 16:57:31 -04:00
parent 2654060c14
commit 36f0bd36f4
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/admin/controllers/admin-group.js.es6
View File

@ -36,6 +36,10 @@ export default Ember.Controller.extend({
]; ];
}.property(), }.property(),
demoAvatarUrl: function() {
return Discourse.getURL('/images/avatar.png');
}.property(),
flairPreviewStyle: function() { flairPreviewStyle: function() {
var style = ''; var style = '';
if (this.get('model.flair_url')) { if (this.get('model.flair_url')) {

2
app/assets/javascripts/admin/templates/group.hbs
View File

@ -121,7 +121,7 @@
<label>{{i18n 'admin.groups.flair_preview'}}</label> <label>{{i18n 'admin.groups.flair_preview'}}</label>
<div class="avatar-flair-preview"> <div class="avatar-flair-preview">
<div class="avatar-wrapper"> <div class="avatar-wrapper">
<img alt width="45" height="45" src="https://avatars.discourse.org/v3/letter/a/a3d4f5/45.png" class="avatar actor" title="demo"> <img alt width="45" height="45" src="{{demoAvatarUrl}}" class="avatar actor">
</div> </div>
<div class="avatar-flair demo {{flairPreviewClasses}}" style={{flairPreviewStyle}}></div> <div class="avatar-flair demo {{flairPreviewClasses}}" style={{flairPreviewStyle}}></div>
</div> </div>

4
app/assets/stylesheets/common/admin/admin_base.scss
View File

@ -688,6 +688,10 @@ section.details {
position: relative; position: relative;
width: 45px; width: 45px;
.avatar-wrapper {
background-color: #f4f4f4;
}
.avatar-flair.demo { .avatar-flair.demo {
top: 25px; top: 25px;
&.rounded { &.rounded {