aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorshpuld <shp@cock.li>2018-04-14 10:19:09 +0300
committershpuld <shp@cock.li>2018-04-14 10:19:09 +0300
commit96692454a0692166971072da357e6ae077844bfe (patch)
tree80b3031876365de76567b0e9303fa7abaa64a4bf /src
parent1db9b1e1ad52f9f80305fcb71a306b3beb28a96a (diff)
change external link icon, move chat from side panel to floating, hide own bio, prevent body/app from scrolling horizontally.
Diffstat (limited to 'src')
-rw-r--r--src/App.scss4
-rw-r--r--src/App.vue2
-rw-r--r--src/components/chat_panel/chat_panel.vue17
-rw-r--r--src/components/status/status.vue2
-rw-r--r--src/components/user_card_content/user_card_content.js2
-rw-r--r--src/components/user_card_content/user_card_content.vue4
-rw-r--r--src/components/user_panel/user_panel.vue2
7 files changed, 25 insertions, 8 deletions
diff --git a/src/App.scss b/src/App.scss
index e081ad9b..a8601220 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -6,6 +6,8 @@
background-repeat: no-repeat;
background-position: 0 50px;
min-height: 100vh;
+ max-width: 100%;
+ overflow: hidden;
}
i {
@@ -36,6 +38,8 @@ body {
margin: 0;
color: $fallback--fg;
color: var(--fg, $fallback--fg);
+ max-width: 100vw;
+ overflow-x: hidden;
}
a {
diff --git a/src/App.vue b/src/App.vue
index 051c601d..a8d17fa7 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -24,7 +24,6 @@
<user-panel></user-panel>
<nav-panel></nav-panel>
<instance-specific-panel v-if="showInstanceSpecificPanel"></instance-specific-panel>
- <chat-panel v-if="currentUser && chat"></chat-panel>
<notifications v-if="currentUser"></notifications>
</div>
</div>
@@ -36,6 +35,7 @@
</transition>
</div>
</div>
+ <chat-panel v-if="currentUser && chat" class="floating-chat mobile-hidden"></chat-panel>
</div>
</template>
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/status/status.vue b/src/components/status/status.vue
index 6f767052..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>
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..5859a772 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>
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>