diff options
| author | Hakaba Hitoyo <example@example.com> | 2018-04-22 00:48:06 +0900 |
|---|---|---|
| committer | Hakaba Hitoyo <example@example.com> | 2018-04-22 00:48:06 +0900 |
| commit | 033170212f59ee2e0757fcc0264f64a15e638f64 (patch) | |
| tree | bc592c1d90070e2d6b8854556bdc2f710b670fae /src/components/delete_button | |
| parent | ef67bd693e9ee0cb42b4ebd0b10f68e63ba04750 (diff) | |
| parent | b6eb1b1d98c839f5340edd3d3c4764952f2cb189 (diff) | |
merge
Diffstat (limited to 'src/components/delete_button')
| -rw-r--r-- | src/components/delete_button/delete_button.js | 2 | ||||
| -rw-r--r-- | src/components/delete_button/delete_button.vue | 17 |
2 files changed, 10 insertions, 9 deletions
diff --git a/src/components/delete_button/delete_button.js b/src/components/delete_button/delete_button.js index 77da1b87..f2920666 100644 --- a/src/components/delete_button/delete_button.js +++ b/src/components/delete_button/delete_button.js @@ -10,7 +10,7 @@ const DeleteButton = { }, computed: { currentUser () { return this.$store.state.users.currentUser }, - canDelete () { return this.currentUser.rights.delete_others_notice || this.status.user.id === this.currentUser.id } + canDelete () { return this.currentUser && this.currentUser.rights.delete_others_notice || this.status.user.id === this.currentUser.id } } } diff --git a/src/components/delete_button/delete_button.vue b/src/components/delete_button/delete_button.vue index 845ac777..d13547e2 100644 --- a/src/components/delete_button/delete_button.vue +++ b/src/components/delete_button/delete_button.vue @@ -1,20 +1,21 @@ <template> <div v-if="canDelete"> <a href="#" v-on:click.prevent="deleteStatus()"> - <i class='base09 icon-cancel delete-status'></i> + <i class='icon-cancel delete-status'></i> </a> </div> </template> <script src="./delete_button.js" ></script> -<style lang='scss'> - @import '../../_variables.scss'; +<style lang="scss"> +@import '../../_variables.scss'; - .icon-cancel,.delete-status { - cursor: pointer; - &:hover { - color: $red; - } +.icon-cancel,.delete-status { + cursor: pointer; + &:hover { + color: var(--cRed, $fallback--cRed); + color: $fallback--cRed; } +} </style> |