Merge branch 'frontend-ui-refactor' into feat/double-tap-to-like

This commit is contained in:
daniel 2019-05-06 20:47:13 -06:00 committed by GitHub
commit 7ceaa25205
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
30 changed files with 748 additions and 237 deletions

View file

@ -294,7 +294,7 @@
</div>
<div v-if="profileLayout == 'moment'">
<div class="w-100 h-100 mt-n3 bg-pixelfed" style="width:100%;min-height:274px;">
<div :class="momentBackground()" style="width:100%;min-height:274px;">
</div>
<div class="bg-white border-bottom">
<div class="container">
@ -1045,6 +1045,16 @@ export default {
this.profile.following_count--;
}
})
},
momentBackground() {
let c = 'w-100 h-100 mt-n3 ';
if(this.profile.header_bg) {
c += this.profile.header_bg == 'default' ? 'bg-pixelfed' : 'bg-moment-' + this.profile.header_bg;
} else {
c += 'bg-pixelfed';
}
return c;
}
}
}