Merge branch 'fix-cursor-pointer-on-profile-names' into 'master'

Remove cursor: pointer on profile names

Closes #358

See merge request framasoft/mobilizon!493
This commit is contained in:
Thomas Citharel 2020-06-25 11:01:59 +02:00
commit 8f249f0f75
2 changed files with 13 additions and 7 deletions

View File

@ -1,5 +1,5 @@
<template> <template>
<div :class="{ clickable: popover }"> <div>
<div class="media" style="align-items: top;"> <div class="media" style="align-items: top;">
<div class="media-left"> <div class="media-left">
<figure class="image is-32x32" v-if="actor.avatar"> <figure class="image is-32x32" v-if="actor.avatar">
@ -36,10 +36,6 @@ export default class ActorCard extends Vue {
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.clickable {
cursor: pointer;
}
.summary.limit { .summary.limit {
max-width: 25rem; max-width: 25rem;
display: -webkit-box; display: -webkit-box;

View File

@ -1,5 +1,10 @@
<template> <template>
<v-popover offset="16" trigger="hover" :class="{ inline }" class="clickable"> <v-popover
offset="16"
trigger="hover"
class="popover"
:class="{ inline, clickable: actor && actor.type === ActorType.GROUP }"
>
<slot></slot> <slot></slot>
<template slot="popover" class="popover"> <template slot="popover" class="popover">
<actor-card :full="true" :actor="actor" :popover="true" /> <actor-card :full="true" :actor="actor" :popover="true" />
@ -8,7 +13,7 @@
</template> </template>
<script lang="ts"> <script lang="ts">
import { Component, Vue, Prop } from "vue-property-decorator"; import { Component, Vue, Prop } from "vue-property-decorator";
import { IActor } from "../../types/actor"; import { IActor, ActorType } from "../../types/actor";
import ActorCard from "./ActorCard.vue"; import ActorCard from "./ActorCard.vue";
@Component({ @Component({
@ -20,6 +25,8 @@ export default class PopoverActorCard extends Vue {
@Prop({ required: true, type: Object }) actor!: IActor; @Prop({ required: true, type: Object }) actor!: IActor;
@Prop({ required: false, type: Boolean, default: false }) inline!: boolean; @Prop({ required: false, type: Boolean, default: false }) inline!: boolean;
ActorType = ActorType;
} }
</script> </script>
@ -27,6 +34,9 @@ export default class PopoverActorCard extends Vue {
.inline { .inline {
display: inline; display: inline;
} }
.popover {
cursor: default;
}
.clickable { .clickable {
cursor: pointer; cursor: pointer;
} }