aboutsummaryrefslogtreecommitdiff
path: root/src/components
diff options
context:
space:
mode:
Diffstat (limited to 'src/components')
-rw-r--r--src/components/chat_panel/chat_panel.vue17
-rw-r--r--src/components/notifications/notifications.scss5
-rw-r--r--src/components/status/status.vue20
-rw-r--r--src/components/user_card_content/user_card_content.js2
-rw-r--r--src/components/user_card_content/user_card_content.vue5
-rw-r--r--src/components/user_panel/user_panel.vue2
6 files changed, 42 insertions, 9 deletions
diff --git a/src/components/chat_panel/chat_panel.vue b/src/components/chat_panel/chat_panel.vue
index dea9b703..30070d3e 100644
--- a/src/components/chat_panel/chat_panel.vue
+++ b/src/components/chat_panel/chat_panel.vue
@@ -32,8 +32,8 @@
<div class="panel panel-default">
<div class="panel-heading stub timeline-heading chat-heading" @click.stop.prevent="togglePanel">
<div class="title">
+ <i class="icon-comment-empty"></i>
{{$t('chat.title')}}
- <i class="icon-plus-squared" style="float: right;"></i>
</div>
</div>
</div>
@@ -44,12 +44,25 @@
<style lang="scss">
@import '../../_variables.scss';
+
+.floating-chat {
+ position: fixed;
+ right: 0px;
+ bottom: 0px;
+ z-index: 1000;
+}
+
.chat-heading {
cursor: pointer;
+ .icon-comment-empty {
+ color: $fallback--fg;
+ color: var(--fg, $fallback--fg);
+ }
}
.chat-window {
- max-height: 200px;
+ width: 345px;
+ max-height: 40vh;
overflow-y: auto;
overflow-x: hidden;
}
diff --git a/src/components/notifications/notifications.scss b/src/components/notifications/notifications.scss
index 69ddda00..9cbb1226 100644
--- a/src/components/notifications/notifications.scss
+++ b/src/components/notifications/notifications.scss
@@ -138,10 +138,15 @@
.name-and-action {
flex: 1;
+ overflow: hidden;
+ text-overflow: ellipsis;
}
.username {
font-weight: bolder;
+ max-width: 100%;
+ text-overflow: ellipsis;
+ white-space: nowrap;
}
.timeago {
float: right;
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 483abb3e..59dfc351 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -54,7 +54,7 @@
<router-link class="timeago" :to="{ name: 'conversation', params: { id: status.id } }">
<timeago :since="status.created_at" :auto-update="60"></timeago>
</router-link>
- <a :href="status.external_url" target="_blank" v-if="!status.is_local" class="source_url"><i class="icon-binoculars"></i></a>
+ <a :href="status.external_url" target="_blank" v-if="!status.is_local" class="source_url"><i class="icon-link-ext"></i></a>
<template v-if="expandable">
<a href="#" @click.prevent="toggleExpanded"><i class="icon-plus-squared"></i></a>
</template>
@@ -201,8 +201,11 @@
font-weight: lighter;
}
h4 {
+ white-space: nowrap;
font-size: 14px;
margin-right: 0.25em;
+ overflow: hidden;
+ text-overflow: ellipsis;
}
.name-and-links {
padding: 0;
@@ -210,11 +213,18 @@
display: flex;
flex-wrap: wrap;
}
- .links a {
+ .links {
padding-top: 1px;
font-size: 12px;
color: $fallback--link;
color: var(--link, $fallback--link);
+ max-width: 100%;
+ a {
+ max-width: 100%;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ white-space: nowrap;
+ }
}
.replies {
line-height: 16px;
@@ -307,6 +317,12 @@
.media-body {
font-size: 1em;
line-height: 22px;
+ a {
+ max-width: 100%;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ }
}
}
}
diff --git a/src/components/user_card_content/user_card_content.js b/src/components/user_card_content/user_card_content.js
index 2e448f1c..1e8c91de 100644
--- a/src/components/user_card_content/user_card_content.js
+++ b/src/components/user_card_content/user_card_content.js
@@ -2,7 +2,7 @@ import StillImage from '../still-image/still-image.vue'
import { hex2rgb } from '../../services/color_convert/color_convert.js'
export default {
- props: [ 'user', 'switcher' ],
+ props: [ 'user', 'switcher', 'hideBio' ],
computed: {
headingStyle () {
const color = this.$store.state.config.colors.bg
diff --git a/src/components/user_card_content/user_card_content.vue b/src/components/user_card_content/user_card_content.vue
index 627a0976..ca8428ca 100644
--- a/src/components/user_card_content/user_card_content.vue
+++ b/src/components/user_card_content/user_card_content.vue
@@ -6,7 +6,7 @@
<i class="icon-cog usersettings"></i>
</router-link>
<a :href="user.statusnet_profile_url" target="_blank" style="float: right; margin-top:16px;" v-if="isOtherUser">
- <i class="icon-binoculars usersettings"></i>
+ <i class="icon-link-ext usersettings"></i>
</a>
<div class='container'>
<router-link :to="{ name: 'user-profile', params: { id: user.id } }">
@@ -90,7 +90,7 @@
<span>{{user.followers_count}}</span>
</div>
</div>
- <p>{{user.description}}</p>
+ <p v-if="!hideBio">{{user.description}}</p>
</div>
</div>
</template>
@@ -246,7 +246,6 @@
flex: 1;
h5 {
- color: white;
font-size:1em;
font-weight: bolder;
margin: 0 0 0.25em;
diff --git a/src/components/user_panel/user_panel.vue b/src/components/user_panel/user_panel.vue
index 05af7bc3..3d4f873d 100644
--- a/src/components/user_panel/user_panel.vue
+++ b/src/components/user_panel/user_panel.vue
@@ -1,7 +1,7 @@
<template>
<div class="user-panel">
<div v-if='user' class="panel panel-default" style="overflow: visible;">
- <user-card-content :user="user" :switcher="false"></user-card-content>
+ <user-card-content :user="user" :switcher="false" :hideBio="true"></user-card-content>
<div class="panel-footer">
<post-status-form v-if='user'></post-status-form>
</div>