diff options
| author | lambadalambda <gitgud@rogerbraun.net> | 2017-08-10 12:29:05 -0400 |
|---|---|---|
| committer | lambadalambda <gitgud@rogerbraun.net> | 2017-08-10 12:29:05 -0400 |
| commit | 3c2073bc8ec36e45e0b8236081ca0c2b40ef958a (patch) | |
| tree | e19884f72a83445eee28924569668bcf7cbf9b00 | |
| parent | b1d9cbaebdbdd27e521989d9eaef0f6a49426280 (diff) | |
| parent | f81d1b0eea497e392b81f5217d023a66e01ea9b3 (diff) | |
Merge branch 'fix/user-card-visual-buggery' into 'develop'
User card content visual bugfixes
See merge request !91
| -rw-r--r-- | src/components/user_card_content/user_card_content.vue | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/src/components/user_card_content/user_card_content.vue b/src/components/user_card_content/user_card_content.vue index 2d361600..8dcff3c5 100644 --- a/src/components/user_card_content/user_card_content.vue +++ b/src/components/user_card_content/user_card_content.vue @@ -5,8 +5,10 @@ <div class='container'> <img :src="user.profile_image_url"> <span class="glyphicon glyphicon-user"></span> - <div class='user-name'>{{user.name}}</div> - <div class='user-screen-name'>@{{user.screen_name}}</div> + <div class="name-and-screen-name"> + <div class='user-name'>{{user.name}}</div> + <div class='user-screen-name'>@{{user.screen_name}}</div> + </div> </div> <div v-if="isOtherUser" class="user-interactions"> <div v-if="user.follows_you && loggedIn" class="following base06"> @@ -137,33 +139,37 @@ align-content: flex-start; justify-content: center; max-height: 60px; + overflow: hidden; } img { - border: 2px solid; - border-radius: 5px; - flex: 1 0 100%; - max-width: 48px; - max-height: 48px; + border: 2px solid; + border-radius: 5px; + flex: 1 0 100%; + width: 48px; + height: 48px; + object-fit: cover; } text-shadow: 0px 1px 1.5px rgba(0, 0, 0, 1.0); - .user-name{ - margin-top: 0.0em; + .name-and-screen-name { + display: block; + margin-top: 0.0em; margin-left: 0.6em; - flex: 0 0 auto; - align-self: flex-start; + text-align: left; + text-overflow: ellipsis; + white-space: nowrap; + } + + .user-name{ } .user-screen-name { - margin-top: 0.0em; - margin-left: 0.6em; font-weight: lighter; font-size: 15px; padding-right: 0.1em; flex: 0 0 auto; - align-self: flex-start; } .user-interactions { |