logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe
commit: bebd5c3328422aacf65996776e282d032347c5c9
parent: e2ba7d9037a5f9e8cfba76f5e927b2ec4c8fbdda
Author: lambadalambda <gitgud@rogerbraun.net>
Date:   Sat, 25 Feb 2017 06:33:14 -0500

Merge branch 'fix/improved-profile-background-color' into 'develop'

Make the profile background use a new calculated color using the theme

See merge request !33

Diffstat:

Msrc/components/user_card_content/user_card_content.vue7+++++--
1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/components/user_card_content/user_card_content.vue b/src/components/user_card_content/user_card_content.vue @@ -61,8 +61,12 @@ props: [ 'user' ], computed: { headingStyle () { + let rgb = this.$store.state.config.colors['base00'].match(/\d+/g) return { - 'background-image': `url(${this.user.cover_photo})` + backgroundColor: 'rgb(' + Math.floor(rgb[0] * 0.53) + ', ' + + Math.floor(rgb[1] * 0.56) + ', ' + + Math.floor(rgb[2] * 0.59) + ')', + backgroundImage: `url(${this.user.cover_photo})` } }, bodyStyle () { @@ -100,7 +104,6 @@ <style lang="scss"> .profile-panel-background { - background-color: #121517; background-size: cover; border-radius: 10px; }