Troplo/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix shadow and opacity

Browse source
This commit is contained in:
Henry Jameson 2020-01-13 02:08:39 +02:00
parent 9af0042452
commit 29a0b4a593
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/components/shadow_control/shadow_control.js
View file

@ -1,6 +1,7 @@
import ColorInput from '../color_input/color_input.vue' import ColorInput from '../color_input/color_input.vue'
import OpacityInput from '../opacity_input/opacity_input.vue' import OpacityInput from '../opacity_input/opacity_input.vue'
import { hex2rgb, getCssShadow } from '../../services/color_convert/color_convert.js' import { getCssShadow } from '../../services/style_setter/style_setter.js'
import { hex2rgb } from '../../services/color_convert/color_convert.js'
export default { export default {
// 'Value' and 'Fallback' can be undefined, but if they are // 'Value' and 'Fallback' can be undefined, but if they are

2
src/components/style_switcher/style_switcher.js
View file

@ -117,7 +117,7 @@ export default {
currentOpacity () { currentOpacity () {
return Object.keys(DEFAULT_OPACITY) return Object.keys(DEFAULT_OPACITY)
.map(key => [key, this[key + 'OpacityLocal']]) .map(key => [key, this[key + 'OpacityLocal']])
.reduce((acc, [key, val]) => ({ ...acc, [ key + 'OpacityLocal' ]: val }), {}) .reduce((acc, [key, val]) => ({ ...acc, [ key ]: val }), {})
}, },
currentRadii () { currentRadii () {
return { return {

2
src/services/style_setter/style_setter.js
View file

@ -76,7 +76,7 @@ export const applyTheme = (input, commit) => {
commit('setOption', { name: 'colors', value: theme.colors }) commit('setOption', { name: 'colors', value: theme.colors })
} }
const getCssShadow = (input, usesDropShadow) => { export const getCssShadow = (input, usesDropShadow) => {
if (input.length === 0) { if (input.length === 0) {
return 'none' return 'none'
} }