Mastodon
/
Whalebird-desktop-client-mac-linux-windows
mirror of https://github.com/h3poteto/whalebird-desktop
1
0
Fork 0
Code Issues Releases Wiki Activity

refs #874 [stylelint] Fix selector order

This commit is contained in:
AkiraFukushima 2019-07-15 15:45:38 +09:00
parent 06598c1b67
commit 473bc139ea
3 changed files with 293 additions and 245 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/renderer/components/organisms/Notification/Favourite.vue
View File

@ -42,21 +42,44 @@
<div class="content-wrapper">
<div class="spoiler" v-show="spoilered(message.status)">
<span v-html="spoilerText(message.status)"></span>
<el-button v-if="!isShowContent(message.status)" plain type="primary" size="medium" class="spoil-button" @click="showContent = true">
<el-button
v-if="!isShowContent(message.status)"
plain
type="primary"
size="medium"
class="spoil-button"
@click="showContent = true"
>
{{ $t('cards.toot.show_more') }}
</el-button>
<el-button v-else plain type="primary" size="medium" class="spoil-button" @click="showContent = false">
{{ $t('cards.toot.hide') }}
</el-button>
</div>
<div class="content" v-show="isShowContent(message.status)" v-html="status(message.status)" @click.capture.prevent="tootClick"></div>
<div
class="content"
v-show="isShowContent(message.status)"
v-html="status(message.status)"
@click.capture.prevent="tootClick"
></div>
</div>
<div class="attachments">
<el-button v-show="sensitive(message.status) && !isShowAttachments(message.status)" class="show-sensitive" type="info" @click="showAttachments = true">
<el-button
v-show="sensitive(message.status) && !isShowAttachments(message.status)"
class="show-sensitive"
type="info"
@click="showAttachments = true"
>
{{ $t('cards.toot.sensitive') }}
</el-button>
<div v-show="isShowAttachments(message.status)">
<el-button v-show="sensitive(message.status) && isShowAttachments(message.status)" class="hide-sensitive" type="text" @click="showAttachments = false" :title="$t('cards.toot.hide')">
<el-button
v-show="sensitive(message.status) && isShowAttachments(message.status)"
class="hide-sensitive"
type="text"
@click="showAttachments = false"
:title="$t('cards.toot.hide')"
>
<icon name="eye" class="hide"></icon>
</el-button>
<div class="media" v-bind:key="media.preview_url" v-for="media in mediaAttachments(message.status)">
@ -168,12 +191,13 @@ export default {
const parsedAccount = findAccount(e.target, 'favourite')
if (parsedAccount !== null) {
this.$store.commit('TimelineSpace/Contents/SideBar/changeOpenSideBar', true)
this.$store.dispatch('TimelineSpace/Contents/SideBar/AccountProfile/searchAccount', parsedAccount)
.then((account) => {
this.$store
.dispatch('TimelineSpace/Contents/SideBar/AccountProfile/searchAccount', parsedAccount)
.then(account => {
this.$store.dispatch('TimelineSpace/Contents/SideBar/openAccountComponent')
this.$store.dispatch('TimelineSpace/Contents/SideBar/AccountProfile/changeAccount', account)
})
.catch((err) => {
.catch(err => {
console.error(err)
this.openLink(e)
this.$store.commit('TimelineSpace/Contents/SideBar/changeOpenSideBar', false)
@ -319,6 +343,21 @@ export default {
margin: 8px 8px 0 42px;
color: #909399;
.content-wrapper /deep/ {
font-size: var(--base-font-size);
margin: 0;
.content {
font-size: var(--base-font-size);
word-wrap: break-word;
}
.emojione {
width: 20px;
height: 20px;
}
}
.toot-header {
height: 22px;
@ -342,21 +381,6 @@ export default {
}
}
.content-wrapper /deep/ {
font-size: var(--base-font-size);
margin: 0;
.content {
font-size: var(--base-font-size);
word-wrap: break-word;
}
.emojione {
width: 20px;
height: 20px;
}
}
.spoiler {
margin: 8px 0;

66
src/renderer/components/organisms/Notification/Reblog.vue
View File

@ -44,21 +44,44 @@
<div class="content-wrapper">
<div class="spoiler" v-show="spoilered(message.status)">
<span v-html="spoilerText(message.status)"></span>
<el-button v-if="!isShowContent(message.status)" plain type="primary" size="medium" class="spoil-button" @click="showContent = true">
<el-button
v-if="!isShowContent(message.status)"
plain
type="primary"
size="medium"
class="spoil-button"
@click="showContent = true"
>
{{ $t('cards.toot.show_more') }}
</el-button>
<el-button v-else plain type="primary" size="medium" class="spoil-button" @click="showContent = false">
{{ $t('cards.toot.hide') }}
</el-button>
</div>
<div class="content" v-show="isShowContent(message.status)" v-html="status(message.status)" @click.capture.prevent="tootClick"></div>
<div
class="content"
v-show="isShowContent(message.status)"
v-html="status(message.status)"
@click.capture.prevent="tootClick"
></div>
</div>
<div class="attachments">
<el-button v-show="sensitive(message.status) && !isShowAttachments(message.status)" class="show-sensitive" type="info" @click="showAttachments = true">
<el-button
v-show="sensitive(message.status) && !isShowAttachments(message.status)"
class="show-sensitive"
type="info"
@click="showAttachments = true"
>
{{ $t('cards.toot.sensitive') }}
</el-button>
<div v-show="isShowAttachments(message.status)">
<el-button v-show="sensitive(message.status) && isShowAttachments(message.status)" class="hide-sensitive" type="text" @click="showAttachments = false" :title="$t('cards.toot.hide')">
<el-button
v-show="sensitive(message.status) && isShowAttachments(message.status)"
class="hide-sensitive"
type="text"
@click="showAttachments = false"
:title="$t('cards.toot.hide')"
>
<icon name="eye" class="hide"></icon>
</el-button>
<div class="media" v-bind:key="media.preview_url" v-for="media in mediaAttachments(message.status)">
@ -169,8 +192,9 @@ export default {
const parsedAccount = findAccount(e.target, 'reblog')
if (parsedAccount !== null) {
this.$store.commit('TimelineSpace/Contents/SideBar/changeOpenSideBar', true)
this.$store.dispatch('TimelineSpace/Contents/SideBar/AccountProfile/searchAccount', parsedAccount)
.then((account) => {
this.$store
.dispatch('TimelineSpace/Contents/SideBar/AccountProfile/searchAccount', parsedAccount)
.then(account => {
this.$store.dispatch('TimelineSpace/Contents/SideBar/openAccountComponent')
this.$store.dispatch('TimelineSpace/Contents/SideBar/AccountProfile/changeAccount', account)
})
@ -319,6 +343,21 @@ export default {
margin: 8px 8px 0 42px;
color: #909399;
.content-wrapper /deep/ {
font-size: var(--base-font-size);
margin: 0;
.content {
font-size: var(--base-font-size);
word-wrap: break-word;
}
.emojione {
width: 20px;
height: 20px;
}
}
.toot-header {
height: 24px;
@ -341,21 +380,6 @@ export default {
}
}
.content-wrapper /deep/ {
font-size: var(--base-font-size);
margin: 0;
.content {
font-size: var(--base-font-size);
word-wrap: break-word;
}
.emojione {
width: 20px;
height: 20px;
}
}
.spoiler {
margin: 8px 0;

76
src/renderer/components/organisms/Toot.vue
View File

@ -604,6 +604,44 @@ export default {
float: left;
width: calc(100% - 52px);
.content-wrapper /deep/ {
font-size: var(--base-font-size);
color: var(--theme-primary-color);
.content {
margin: var(--toot-padding) 0;
word-wrap: break-word;
}
.emojione {
width: 20px;
height: 20px;
}
}
.reblogger {
color: #909399;
.reblogger-icon {
img {
width: 16px;
height: 16px;
border-radius: 2px;
cursor: pointer;
}
}
.reblogger-name /deep/ {
font-size: calc(var(--base-font-size) * 0.86);
cursor: pointer;
.emojione {
max-width: 10px;
max-height: 10px;
}
}
}
.toot-header {
.user {
float: left;
@ -639,21 +677,6 @@ export default {
}
}
.content-wrapper /deep/ {
font-size: var(--base-font-size);
color: var(--theme-primary-color);
.content {
margin: var(--toot-padding) 0;
word-wrap: break-word;
}
.emojione {
width: 20px;
height: 20px;
}
}
.spoiler {
margin: 8px 0;
@ -712,29 +735,6 @@ export default {
}
}
.reblogger {
color: #909399;
.reblogger-icon {
img {
width: 16px;
height: 16px;
border-radius: 2px;
cursor: pointer;
}
}
.reblogger-name /deep/ {
font-size: calc(var(--base-font-size) * 0.86);
cursor: pointer;
.emojione {
max-width: 10px;
max-height: 10px;
}
}
}
.tool-box {
float: left;