Merge branch 'themes-fixes' into 'develop'

Several small fixes

Closes #866 and #864

See merge request pleroma/pleroma-fe!1145
This commit is contained in:
HJ 2020-06-14 13:38:24 +00:00
commit 8a15900c81
10 changed files with 37 additions and 18 deletions

View file

@ -4,6 +4,7 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
## [Unreleased] ## [Unreleased]
### Changed ### Changed
- Greentext now has separate color slot for it
- Removed the use of with_move parameters when fetching notifications - Removed the use of with_move parameters when fetching notifications
### Fixed ### Fixed

View file

@ -54,13 +54,13 @@
flex-wrap: nowrap; flex-wrap: nowrap;
padding: 0.6em; padding: 0.6em;
min-width: 0; min-width: 0;
.avatar-container { .avatar-container {
width: 32px; width: 32px;
height: 32px; height: 32px;
} }
.status-el {
.status { .status-body {
padding: 0.25em 0;
color: $fallback--faint; color: $fallback--faint;
color: var(--faint, $fallback--faint); color: var(--faint, $fallback--faint);
a { a {
@ -70,11 +70,6 @@
color: var(--postFaintLink); color: var(--postFaintLink);
} }
} }
padding: 0;
.media-body {
margin: 0;
}
}
} }
.follow-request-accept { .follow-request-accept {

View file

@ -13,6 +13,9 @@ const PostStatusModal = {
} }
}, },
computed: { computed: {
isLoggedIn () {
return !!this.$store.state.users.currentUser
},
modalActivated () { modalActivated () {
return this.$store.state.postStatus.modalActivated return this.$store.state.postStatus.modalActivated
}, },

View file

@ -1,5 +1,6 @@
<template> <template>
<Modal <Modal
v-if="isLoggedIn && !resettingForm"
:is-open="modalActivated" :is-open="modalActivated"
class="post-form-modal-view" class="post-form-modal-view"
@backdropClicked="closeModal" @backdropClicked="closeModal"

View file

@ -256,6 +256,13 @@
:label="$t('settings.links')" :label="$t('settings.links')"
/> />
<ContrastRatio :contrast="previewContrast.postLink" /> <ContrastRatio :contrast="previewContrast.postLink" />
<ColorInput
v-model="postGreentextColorLocal"
name="postGreentextColor"
:fallback="previewTheme.colors.cGreen"
:label="$t('settings.greentext')"
/>
<ContrastRatio :contrast="previewContrast.postGreentext" />
<h4>{{ $t('settings.style.advanced_colors.alert') }}</h4> <h4>{{ $t('settings.style.advanced_colors.alert') }}</h4>
<ColorInput <ColorInput
v-model="alertErrorColorLocal" v-model="alertErrorColorLocal"

View file

@ -226,7 +226,7 @@ $status-margin: 0.75em;
.greentext { .greentext {
color: $fallback--cGreen; color: $fallback--cGreen;
color: var(--cGreen, $fallback--cGreen); color: var(--postGreentext, $fallback--cGreen);
} }
.timeline :not(.panel-disabled) > { .timeline :not(.panel-disabled) > {

View file

@ -356,6 +356,12 @@ export const SLOT_INHERITANCE = {
textColor: 'preserve' textColor: 'preserve'
}, },
postGreentext: {
depends: ['cGreen'],
layer: 'bg',
textColor: 'preserve'
},
border: { border: {
depends: ['fg'], depends: ['fg'],
opacity: 'border', opacity: 'border',

View file

@ -286,7 +286,9 @@
"cGreen": "#008000", "cGreen": "#008000",
"cOrange": "#808000", "cOrange": "#808000",
"highlight": "--accent", "highlight": "--accent",
"selectedPost": "--bg,-10" "selectedPost": "--bg,-10",
"selectedMenu": "--accent",
"selectedMenuPopover": "--accent"
}, },
"radii": { "radii": {
"btn": "0", "btn": "0",

View file

@ -277,7 +277,9 @@
"cGreen": "#008000", "cGreen": "#008000",
"cOrange": "#808000", "cOrange": "#808000",
"highlight": "--accent", "highlight": "--accent",
"selectedPost": "--bg,-10" "selectedPost": "--bg,-10",
"selectedMenu": "--accent",
"selectedMenuPopover": "--accent"
}, },
"radii": { "radii": {
"btn": "0", "btn": "0",

View file

@ -259,7 +259,9 @@
"cGreen": "#669966", "cGreen": "#669966",
"cOrange": "#cc6633", "cOrange": "#cc6633",
"highlight": "--accent", "highlight": "--accent",
"selectedPost": "--bg,-10" "selectedPost": "--bg,-10",
"selectedMenu": "--accent",
"selectedMenuPopover": "--accent"
}, },
"radii": { "radii": {
"btn": "0", "btn": "0",