From 08298036e3a546f406912acea2cf866eab1f21e7 Mon Sep 17 00:00:00 2001
From: David McClure <dave@xerotrope.org>
Date: Mon, 18 Apr 2016 20:59:38 -0700
Subject: [PATCH] FIX: layout for location and website on user card when bio
not displayed.
---
.../discourse/controllers/user-card.js.es6 | 1 +
.../discourse/templates/user-card.hbs | 32 ++++++++++---------
app/assets/stylesheets/desktop/user-card.scss | 10 ++++--
3 files changed, 25 insertions(+), 18 deletions(-)
diff --git a/app/assets/javascripts/discourse/controllers/user-card.js.es6 b/app/assets/javascripts/discourse/controllers/user-card.js.es6
index bcb11c851..39d938b8c 100644
--- a/app/assets/javascripts/discourse/controllers/user-card.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-card.js.es6
@@ -27,6 +27,7 @@ export default Ember.Controller.extend({
showMoreBadges: Em.computed.gt('moreBadgesCount', 0),
showDelete: Em.computed.and("viewingAdmin", "showName", "user.canBeDeleted"),
linkWebsite: Em.computed.not('user.isBasic'),
+ hasLocationOrWebsite: Em.computed.or('user.location', 'user.website_name'),
@computed('user.user_fields.@each.value')
publicUserFields() {
diff --git a/app/assets/javascripts/discourse/templates/user-card.hbs b/app/assets/javascripts/discourse/templates/user-card.hbs
index 5c948b62b..5a348402d 100644
--- a/app/assets/javascripts/discourse/templates/user-card.hbs
+++ b/app/assets/javascripts/discourse/templates/user-card.hbs
@@ -55,22 +55,24 @@
{{/link-to}}
{{/if}}
- <div>
- {{#if user.location}}
- <span class='location'>{{fa-icon "map-marker"}} {{user.location}}</span>
- {{/if}}
+ {{#if hasLocationOrWebsite}}
+ <div class="location-and-website">
+ {{#if user.location}}
+ <span class='location'>{{fa-icon "map-marker"}} {{user.location}}</span>
+ {{/if}}
- {{#if user.website_name}}
- <span class='website-name'>
- {{fa-icon "globe"}}
- {{#if linkWebsite}}
- <a href={{user.website}} rel={{unless removeNoFollow 'nofollow'}} target="_blank">{{user.website_name}}</a>
- {{else}}
- <span title={{user.website}}>{{user.website_name}}</span>
- {{/if}}
- </span>
- {{/if}}
- </div>
+ {{#if user.website_name}}
+ <span class='website-name'>
+ {{fa-icon "globe"}}
+ {{#if linkWebsite}}
+ <a href={{user.website}} rel={{unless removeNoFollow 'nofollow'}} target="_blank">{{user.website_name}}</a>
+ {{else}}
+ <span title={{user.website}}>{{user.website_name}}</span>
+ {{/if}}
+ </span>
+ {{/if}}
+ </div>
+ {{/if}}
{{#if user}}
<div class="metadata">
diff --git a/app/assets/stylesheets/desktop/user-card.scss b/app/assets/stylesheets/desktop/user-card.scss
index 9181f02f2..2980ef2cf 100644
--- a/app/assets/stylesheets/desktop/user-card.scss
+++ b/app/assets/stylesheets/desktop/user-card.scss
@@ -159,9 +159,13 @@ $user_card_background: #222;
}
}
- .website-name {
- a {
- color: $user_card_primary;
+ .location-and-website {
+ clear: left;
+
+ .website-name {
+ a {
+ color: $user_card_primary;
+ }
}
}