refs #1318 Apply font-size settings in New toot
This commit is contained in:
parent
a8ba8fca6d
commit
4aed8a9065
|
@ -2,5 +2,7 @@
|
||||||
"tabWidth": 2,
|
"tabWidth": 2,
|
||||||
"semi": false,
|
"semi": false,
|
||||||
"singleQuote": true,
|
"singleQuote": true,
|
||||||
"printWidth": 140
|
"printWidth": 140,
|
||||||
}
|
"trailingComma": "none",
|
||||||
|
"arrowParens": "avoid"
|
||||||
|
}
|
||||||
|
|
|
@ -217,7 +217,7 @@ export default {
|
||||||
this.$store.dispatch('TimelineSpace/Modals/NewToot/setupLoading')
|
this.$store.dispatch('TimelineSpace/Modals/NewToot/setupLoading')
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
newTootModal: function(newState, oldState) {
|
newTootModal: function (newState, oldState) {
|
||||||
if (!oldState && newState) {
|
if (!oldState && newState) {
|
||||||
this.showContentWarning = this.initialSpoiler
|
this.showContentWarning = this.initialSpoiler
|
||||||
this.status = this.initialStatus
|
this.status = this.initialStatus
|
||||||
|
@ -456,7 +456,7 @@ export default {
|
||||||
font-size: 1.5rem;
|
font-size: 1.5rem;
|
||||||
|
|
||||||
.fa-icon {
|
.fa-icon {
|
||||||
font-size: 0.9em;
|
font-size: 0.9rem;
|
||||||
width: auto;
|
width: auto;
|
||||||
height: 1em;
|
height: 1em;
|
||||||
max-width: 100%;
|
max-width: 100%;
|
||||||
|
@ -469,6 +469,7 @@ export default {
|
||||||
|
|
||||||
.el-dialog__footer {
|
.el-dialog__footer {
|
||||||
background-color: #f2f6fc;
|
background-color: #f2f6fc;
|
||||||
|
font-size: var(--base-font-size);
|
||||||
|
|
||||||
.upload-image {
|
.upload-image {
|
||||||
text-align: left;
|
text-align: left;
|
||||||
|
|
|
@ -93,10 +93,10 @@ export default {
|
||||||
}),
|
}),
|
||||||
...mapGetters('TimelineSpace/Modals/NewToot/Status', ['pickerEmojis']),
|
...mapGetters('TimelineSpace/Modals/NewToot/Status', ['pickerEmojis']),
|
||||||
status: {
|
status: {
|
||||||
get: function() {
|
get: function () {
|
||||||
return this.value
|
return this.value
|
||||||
},
|
},
|
||||||
set: function(value) {
|
set: function (value) {
|
||||||
this.$emit('input', value)
|
this.$emit('input', value)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -110,9 +110,9 @@ export default {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
opened: function(newState, oldState) {
|
opened: function (newState, oldState) {
|
||||||
if (!oldState && newState) {
|
if (!oldState && newState) {
|
||||||
this.$nextTick(function() {
|
this.$nextTick(function () {
|
||||||
this.$refs.status.focus()
|
this.$refs.status.focus()
|
||||||
if (this.fixCursorPos) {
|
if (this.fixCursorPos) {
|
||||||
this.$refs.status.setSelectionRange(0, 0)
|
this.$refs.status.setSelectionRange(0, 0)
|
||||||
|
@ -268,6 +268,7 @@ export default {
|
||||||
.status {
|
.status {
|
||||||
position: relative;
|
position: relative;
|
||||||
z-index: 1;
|
z-index: 1;
|
||||||
|
font-size: var(--base-font-size);
|
||||||
|
|
||||||
textarea {
|
textarea {
|
||||||
display: block;
|
display: block;
|
||||||
|
@ -300,7 +301,7 @@ export default {
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
|
|
||||||
li {
|
li {
|
||||||
font-size: 14px;
|
font-size: var(--base-font-size);
|
||||||
padding: 0 20px;
|
padding: 0 20px;
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
|
|
@ -1,28 +1,28 @@
|
||||||
<template>
|
<template>
|
||||||
<div
|
<div
|
||||||
class="follow"
|
class="follow"
|
||||||
tabIndex="0"
|
tabIndex="0"
|
||||||
v-shortkey="shortcutEnabled ? {next: ['j'], prev: ['k'], right: ['l'], profile: ['p']} : {}"
|
v-shortkey="shortcutEnabled ? { next: ['j'], prev: ['k'], right: ['l'], profile: ['p'] } : {}"
|
||||||
@shortkey="handleStatusControl"
|
@shortkey="handleStatusControl"
|
||||||
ref="status"
|
ref="status"
|
||||||
@click="$emit('select')"
|
@click="$emit('select')"
|
||||||
role="article"
|
role="article"
|
||||||
aria-label="follow event"
|
aria-label="follow event"
|
||||||
>
|
>
|
||||||
<div class="action">
|
<div class="action">
|
||||||
<div class="action-mark">
|
<div class="action-mark">
|
||||||
<icon name="user-plus" scale="0.7"></icon>
|
<icon name="user-plus" scale="0.7"></icon>
|
||||||
</div>
|
</div>
|
||||||
<div class="action-detail">
|
<div class="action-detail">
|
||||||
<span class="bold" @click="openUser(message.account)"><bdi v-html="username(message.account)"></bdi></span> is now following you
|
<span class="bold" @click="openUser(message.account)"><bdi v-html="username(message.account)"></bdi></span> is now following you
|
||||||
</div>
|
</div>
|
||||||
<div class="action-icon" role="presentation">
|
<div class="action-icon" role="presentation">
|
||||||
<FailoverImg :src="message.account.avatar" />
|
<FailoverImg :src="message.account.avatar" />
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="clearfix"></div>
|
||||||
|
<div class="fill-line"></div>
|
||||||
</div>
|
</div>
|
||||||
<div class="clearfix"></div>
|
|
||||||
<div class="fill-line"></div>
|
|
||||||
</div>
|
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
@ -53,7 +53,7 @@ export default {
|
||||||
return this.focused && !this.overlaid
|
return this.focused && !this.overlaid
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
mounted () {
|
mounted() {
|
||||||
if (this.focused) {
|
if (this.focused) {
|
||||||
this.$refs.status.focus()
|
this.$refs.status.focus()
|
||||||
}
|
}
|
||||||
|
@ -72,19 +72,19 @@ export default {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
username (account) {
|
username(account) {
|
||||||
if (account.display_name !== '') {
|
if (account.display_name !== '') {
|
||||||
return emojify(account.display_name, account.emojis)
|
return emojify(account.display_name, account.emojis)
|
||||||
} else {
|
} else {
|
||||||
return account.username
|
return account.username
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
openUser (account) {
|
openUser(account) {
|
||||||
this.$store.dispatch('TimelineSpace/Contents/SideBar/openAccountComponent')
|
this.$store.dispatch('TimelineSpace/Contents/SideBar/openAccountComponent')
|
||||||
this.$store.dispatch('TimelineSpace/Contents/SideBar/AccountProfile/changeAccount', account)
|
this.$store.dispatch('TimelineSpace/Contents/SideBar/AccountProfile/changeAccount', account)
|
||||||
this.$store.commit('TimelineSpace/Contents/SideBar/changeOpenSideBar', true)
|
this.$store.commit('TimelineSpace/Contents/SideBar/changeOpenSideBar', true)
|
||||||
},
|
},
|
||||||
handleStatusControl (event) {
|
handleStatusControl(event) {
|
||||||
switch (event.srcKey) {
|
switch (event.srcKey) {
|
||||||
case 'next':
|
case 'next':
|
||||||
this.$emit('focusNext')
|
this.$emit('focusNext')
|
||||||
|
|
Loading…
Reference in New Issue