moon
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes

This commit is contained in:
Henry Jameson 2018-11-21 18:22:05 +03:00
parent acf414e451
commit dc3df7bc4e
5 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/notifications/notifications.scss
View File

@ -35,6 +35,7 @@
right: 0; right: 0;
left: 0; left: 0;
bottom: 0; bottom: 0;
pointer-events: none;
} }
&.unseen { &.unseen {

4
src/components/post_status_form/post_status_form.vue
View File

@ -154,7 +154,7 @@
margin-left: $fallback--attachmentRadius; margin-left: $fallback--attachmentRadius;
margin-left: var(--attachmentRadius, $fallback--attachmentRadius); margin-left: var(--attachmentRadius, $fallback--attachmentRadius);
background-color: $fallback--fg; background-color: $fallback--fg;
background-color: var(--fg, $fallback--fg); background-color: var(--btn, $fallback--fg);
border-bottom-left-radius: 0; border-bottom-left-radius: 0;
border-bottom-right-radius: 0; border-bottom-right-radius: 0;
} }
@ -292,7 +292,7 @@
&.highlighted { &.highlighted {
background-color: $fallback--fg; background-color: $fallback--fg;
background-color: var(--fg, $fallback--fg); background-color: var(--lightBg, $fallback--fg);
} }
} }
} }

2
src/components/timeline/timeline.vue
View File

@ -75,6 +75,6 @@
padding: 10px; padding: 10px;
z-index: 1; z-index: 1;
background-color: $fallback--fg; background-color: $fallback--fg;
background-color: var(--fg, $fallback--fg); background-color: var(--panel, $fallback--fg);
} }
</style> </style>

6
src/components/user_card_content/user_card_content.js
View File

@ -1,11 +1,13 @@
import StillImage from '../still-image/still-image.vue' import StillImage from '../still-image/still-image.vue'
import { hex2rgb } from '../../services/color_convert/color_convert.js'
export default { export default {
props: [ 'user', 'switcher', 'selected', 'hideBio' ], props: [ 'user', 'switcher', 'selected', 'hideBio' ],
computed: { computed: {
headingStyle () { headingStyle () {
const rgb = this.$store.state.config.customTheme.colors.bg const color = this.$store.state.config.customTheme.colors.bg
if (rgb) { if (color) {
const rgb = (typeof color === 'string') ? hex2rgb(color) : color
const tintColor = `rgba(${Math.floor(rgb.r)}, ${Math.floor(rgb.g)}, ${Math.floor(rgb.b)}, .5)` const tintColor = `rgba(${Math.floor(rgb.r)}, ${Math.floor(rgb.g)}, ${Math.floor(rgb.b)}, .5)`
return { return {
backgroundColor: `rgb(${Math.floor(rgb.r * 0.53)}, ${Math.floor(rgb.g * 0.56)}, ${Math.floor(rgb.b * 0.59)})`, backgroundColor: `rgb(${Math.floor(rgb.r * 0.53)}, ${Math.floor(rgb.g * 0.56)}, ${Math.floor(rgb.b * 0.59)})`,

3
src/services/style_setter/style_setter.js
View File

@ -202,6 +202,9 @@ const generateColors = (input) => {
colors[k + 'Link'].a = v colors[k + 'Link'].a = v
colors['panelFaint'].a = v colors['panelFaint'].a = v
} }
if (k === 'bg') {
colors['lightBg'].a = v
}
if (colors[k]) { if (colors[k]) {
colors[k].a = v colors[k].a = v
} else { } else {