summaryrefslogtreecommitdiff
path: root/frontend/views/page/components
diff options
context:
space:
mode:
Diffstat (limited to 'frontend/views/page/components')
-rw-r--r--frontend/views/page/components/page.editor.js7
-rw-r--r--frontend/views/page/components/tile.form.js2
2 files changed, 5 insertions, 4 deletions
diff --git a/frontend/views/page/components/page.editor.js b/frontend/views/page/components/page.editor.js
index 297f7e7..3878208 100644
--- a/frontend/views/page/components/page.editor.js
+++ b/frontend/views/page/components/page.editor.js
@@ -158,7 +158,7 @@ class PageEditor extends Component {
}
render(){
- if (!this.state.bounds) {
+ if (!this.state.bounds || !this.props.page.show.res) {
return (
<div className='page' ref={this.pageRef} />
)
@@ -167,8 +167,9 @@ class PageEditor extends Component {
const currentTile = this.state.tile
const currentBox = this.state.box
const { res } = this.props.page.show
- return (
- <div className='page' ref={this.pageRef}>
+ const pageStyle = { backgroundColor: res.settings.background_color || '#000000' }
+ return (
+ <div className='page' ref={this.pageRef} style={pageStyle}>
{res.tiles.map(tile => {
if (temporaryTile && temporaryTile.id === tile.id) {
tile = temporaryTile
diff --git a/frontend/views/page/components/tile.form.js b/frontend/views/page/components/tile.form.js
index d570019..bfc5c0b 100644
--- a/frontend/views/page/components/tile.form.js
+++ b/frontend/views/page/components/tile.form.js
@@ -71,7 +71,7 @@ const newImage = (data) => ({
const newText = (data) => ({
settings: {
...newPosition(),
- content: "What is up... I have no idea actually",
+ content: "",
font_family: 'sans-serif',
font_size: 16,
font_style: 'normal',