Mastodon/Whalebird-desktop-client-mac-linux-windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1780 from h3poteto/iss-1351

Browse Source 
closes #1351 Add theme color in new toot window
This commit is contained in:
AkiraFukushima 2020-09-17 23:39:58 +09:00 committed by GitHub
commit 88bd71dc16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/renderer/components/TimelineSpace/Modals/NewToot.vue
View File

@ -460,7 +460,7 @@ export default {
<style lang="scss" scoped>
.new-toot-modal /deep/ {
.el-dialog {
background-color: #f2f6fc;
background-color: var(--theme-selected-background-color);
overflow: hidden;
resize: both;
padding-bottom: 20px;
@ -479,6 +479,12 @@ export default {
.el-dialog__body {
padding: 0;
.el-input__inner {
background-color: var(--theme-background-color);
color: var(--theme-primary-color);
border: 1px solid var(--theme-border-color);
}
.spoiler {
box-sizing: border-box;
padding: 4px 0;
@ -556,7 +562,7 @@ export default {
}
.el-dialog__footer {
background-color: #f2f6fc;
background-color: var(--theme-selected-background-color);
font-size: var(--base-font-size);
padding-bottom: 0;

17
src/renderer/components/TimelineSpace/Modals/NewToot/Status.vue
View File

@ -19,7 +19,7 @@
autofocus
>
</textarea>
<el-popover placement="bottom-start" width="300" trigger="manual" :value="openSuggest">
<el-popover placement="bottom-start" width="300" trigger="manual" :value="openSuggest" popper-class="suggest-popper">
<ul class="suggest-list">
<li
v-for="(item, index) in filteredSuggestion"
@ -277,11 +277,19 @@ export default {
}
</script>
<style lang="scss">
.suggest-popper {
background-color: var(--theme-background-color);
border: 1px solid var(--theme-header-menu-color);
}
</style>
<style lang="scss" scoped>
.status {
position: relative;
z-index: 1;
font-size: var(--base-font-size);
background-color: var(--theme-background-color);
textarea {
position: relative;
@ -291,7 +299,7 @@ export default {
box-sizing: border-box;
width: 100%;
font-size: inherit;
color: #606266;
color: var(--theme-primary-color);
background-image: none;
border: 0;
border-radius: 4px;
@ -299,6 +307,7 @@ export default {
height: 120px;
transition: border-color 0.2s cubic-bezier(0.645, 0.045, 9.355, 1);
word-break: normal;
background-color: var(--theme-background-color);
&::placeholder {
color: #c0c4cc;
@ -321,11 +330,11 @@ export default {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
color: #606266;
height: 34px;
line-height: 34px;
box-sizing: border-box;
cursor: pointer;
color: var(--theme-regular-color);
.icon {
display: inline-block;
@ -336,7 +345,7 @@ export default {
}
.highlighted {
background-color: #f5f7fa;
background-color: var(--theme-selected-background-color);
}
}