diff options
| -rw-r--r-- | package.json | 3 | ||||
| -rw-r--r-- | src/components/user_card_content/user_card_content.vue | 34 | ||||
| -rw-r--r-- | src/services/api/api.service.js | 1 | ||||
| -rw-r--r-- | yarn.lock | 4 |
4 files changed, 27 insertions, 15 deletions
diff --git a/package.json b/package.json index d04c3e22..63fd490d 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,8 @@ "vue-router": "^2.5.3", "vue-template-compiler": "^2.3.4", "vue-timeago": "^3.1.2", - "vuex": "^2.3.1" + "vuex": "^2.3.1", + "whatwg-fetch": "^2.0.3" }, "devDependencies": { "autoprefixer": "^6.4.0", 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 { diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js index e848d076..9b51f19d 100644 --- a/src/services/api/api.service.js +++ b/src/services/api/api.service.js @@ -24,6 +24,7 @@ const QVITTER_USER_TIMELINE_URL = '/api/qvitter/statuses/user_timeline.json' // const USER_URL = '/api/users/show.json' import { each, map } from 'lodash' +import 'whatwg-fetch' const oldfetch = window.fetch @@ -5816,6 +5816,10 @@ webpack@^1.13.2: watchpack "^0.2.1" webpack-core "~0.6.9" +whatwg-fetch@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz#9c84ec2dcf68187ff00bc64e1274b442176e1c84" + whet.extend@~0.9.9: version "0.9.9" resolved "https://registry.yarnpkg.com/whet.extend/-/whet.extend-0.9.9.tgz#f877d5bf648c97e5aa542fadc16d6a259b9c11a1" |