moon
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fix/overlapping-styles-user-card' into 'develop' 

Fix overlapping styles in timeline and notifications that screwed up user-card.

See merge request !44
This commit is contained in:
Shpuld Shpuldson 2017-03-06 16:55:48 -05:00
parent 990047725a a4ebf44f24
commit 34531de8c0
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/notifications/notifications.scss
View File

@ -6,7 +6,7 @@
// force the text to stay centered, while keeping // force the text to stay centered, while keeping
// the button in the right side of the panel heading // the button in the right side of the panel heading
position: relative; position: relative;
button { .read-button {
position: absolute; position: absolute;
padding: 0.1em 0.3em 0.25em 0.3em; padding: 0.1em 0.3em 0.25em 0.3em;
right: 0.7em; right: 0.7em;

2
src/components/notifications/notifications.vue
View File

@ -3,7 +3,7 @@
<div class="panel panel-default base00-background"> <div class="panel panel-default base00-background">
<div class="panel-heading base01-background base04"> <div class="panel-heading base01-background base04">
Notifications ({{unseenCount}}) Notifications ({{unseenCount}})
<button @click.prevent="markAsSeen" class="base06 base02-background">Read!</button> <button @click.prevent="markAsSeen" class="base06 base02-background read-button">Read!</button>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<div v-for="notification in visibleNotifications" class="notification" :class='{"unseen": !notification.seen}'> <div v-for="notification in visibleNotifications" class="notification" :class='{"unseen": !notification.seen}'>

13
src/components/timeline/timeline.vue
View File

@ -1,13 +1,13 @@
<template> <template>
<div class="timeline panel panel-default"> <div class="timeline panel panel-default">
<div class="panel-heading base01-background base04"> <div class="panel-heading timeline-heading base01-background base04">
<div class="title"> <div class="title">
{{title}} {{title}}
</div> </div>
<button @click.prevent="showNewStatuses" class="base06 base02-background" v-if="timeline.newStatusCount > 0"> <button @click.prevent="showNewStatuses" class="base06 base02-background loadmore-button" v-if="timeline.newStatusCount > 0">
Show new ({{timeline.newStatusCount}}) Show new ({{timeline.newStatusCount}})
</button> </button>
<button @click.prevent class="base04 base01-background no-press" v-if="!timeline.newStatusCount > 0"> <button @click.prevent class="base04 base01-background no-press loadmore-button" v-if="!timeline.newStatusCount > 0">
Up-to-date Up-to-date
</button> </button>
</div> </div>
@ -26,17 +26,18 @@
<style lang="scss"> <style lang="scss">
.timeline .panel-heading { .timeline {
.timeline-heading {
position: relative; position: relative;
display: flex; display: flex;
}
.title { .title {
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
max-width: 70%; max-width: 70%;
} }
button { .loadmore-button {
position: absolute; position: absolute;
right: 0.6em; right: 0.6em;
padding: 0.1em 0.3em 0.25em 0.3em; padding: 0.1em 0.3em 0.25em 0.3em;