Merge branch 'master' into 2019/kw15/Access_Settings_from_Profile_as_Owner

This commit is contained in:
Ulf Gebhardt 2019-04-10 10:07:06 +02:00 committed by GitHub
commit c8d01d80cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -8,9 +8,7 @@
v-router-link v-router-link
class="post-link" class="post-link"
:href="href(post)" :href="href(post)"
> >{{ post.title }}</a>
{{ post.title }}
</a>
<!-- eslint-disable vue/no-v-html --> <!-- eslint-disable vue/no-v-html -->
<!-- TODO: replace editor content with tiptap render view --> <!-- TODO: replace editor content with tiptap render view -->
<ds-space margin-bottom="large"> <ds-space margin-bottom="large">
@ -32,7 +30,7 @@
</ds-space> </ds-space>
<ds-space <ds-space
margin="small" margin="small"
style="position: absolute; bottom: 44px; z-index: 1;" style="position: absolute; bottom: 44px;"
> >
<!-- TODO: find better solution for rendering errors --> <!-- TODO: find better solution for rendering errors -->
<no-ssr> <no-ssr>
@ -53,11 +51,13 @@
</div> </div>
<div style="display: inline-block; float: right"> <div style="display: inline-block; float: right">
<span :style="{ opacity: post.shoutedCount ? 1 : .5 }"> <span :style="{ opacity: post.shoutedCount ? 1 : .5 }">
<ds-icon name="bullhorn" /> <small>{{ post.shoutedCount }}</small> <ds-icon name="bullhorn" />
<small>{{ post.shoutedCount }}</small>
</span> </span>
&nbsp; &nbsp;
<span :style="{ opacity: post.commentsCount ? 1 : .5 }"> <span :style="{ opacity: post.commentsCount ? 1 : .5 }">
<ds-icon name="comments" /> <small>{{ post.commentsCount }}</small> <ds-icon name="comments" />
<small>{{ post.commentsCount }}</small>
</span> </span>
<no-ssr> <no-ssr>
<content-menu <content-menu
@ -118,27 +118,25 @@ export default {
.post-card { .post-card {
cursor: pointer; cursor: pointer;
position: relative; position: relative;
z-index: 1;
.ds-card-footer { /*.ds-card-footer {
z-index: 1; }*/
}
.content-menu { .content-menu {
display: inline-block; display: inline-block;
margin-left: $space-xx-small; margin-left: $space-xx-small;
margin-right: -$space-x-small; margin-right: -$space-x-small;
z-index: 1; }
.post-link {
display: block;
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
text-indent: -999999px;
} }
} }
.post-link {
display: block;
position: absolute;
z-index: 1;
top: 0;
left: 0;
width: 100%;
height: 100%;
text-indent: -999999px;
}
</style> </style>