summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJules Laplace <julescarbon@gmail.com>2021-03-17 20:43:54 +0100
committerJules Laplace <julescarbon@gmail.com>2021-03-17 20:43:54 +0100
commit66563242eebaa92cf3b0c7dfdc70d0d1051be9ab (patch)
treee6913b86e4b6f509ee2fe365b9c75272fa46bf62
parent96aa72052df5a7be56063496c8386e49681e047f (diff)
pointr vnts non
-rw-r--r--frontend/app/views/page/components/tile.form.js1
-rw-r--r--frontend/app/views/page/components/tile.handle.js5
-rw-r--r--frontend/app/views/page/cursors.css4
-rw-r--r--frontend/site/audio/audio.player.js2
-rw-r--r--frontend/site/site/site.reducer.js2
-rw-r--r--static/site.css44
6 files changed, 34 insertions, 24 deletions
diff --git a/frontend/app/views/page/components/tile.form.js b/frontend/app/views/page/components/tile.form.js
index 4fb00a3..aefecf1 100644
--- a/frontend/app/views/page/components/tile.form.js
+++ b/frontend/app/views/page/components/tile.form.js
@@ -60,6 +60,7 @@ const CURSORS = [
{ name: 'hand_down', label: 'Down', },
{ name: 'hand_left', label: 'Left', },
{ name: 'hand_right', label: 'Right', },
+ { name: 'unclickable', label: 'Unclickable', },
]
const NO_LINK = 0
diff --git a/frontend/app/views/page/components/tile.handle.js b/frontend/app/views/page/components/tile.handle.js
index 917be74..d8184d3 100644
--- a/frontend/app/views/page/components/tile.handle.js
+++ b/frontend/app/views/page/components/tile.handle.js
@@ -1,12 +1,9 @@
import React, { Component } from 'react'
-import { Link } from 'react-router-dom'
export default class TileHandle extends Component {
constructor(props) {
super(props)
- if (props.tile.type === 'video') {
- this.videoRef = React.createRef()
- }
+ this.videoRef = React.createRef()
this.handleEnded = this.handleEnded.bind(this)
}
componentDidMount() {
diff --git a/frontend/app/views/page/cursors.css b/frontend/app/views/page/cursors.css
index 778b614..6cc37a9 100644
--- a/frontend/app/views/page/cursors.css
+++ b/frontend/app/views/page/cursors.css
@@ -13,6 +13,10 @@
.tile.hand_left {
cursor: url(/static/img/hand_left.png) 10 60, pointer;
}
+.tile.unclickable {
+ cursor: default;
+ pointer-events: none;
+}
.tile.none {
cursor: default;
}
diff --git a/frontend/site/audio/audio.player.js b/frontend/site/audio/audio.player.js
index eea0acf..d6bc807 100644
--- a/frontend/site/audio/audio.player.js
+++ b/frontend/site/audio/audio.player.js
@@ -32,7 +32,7 @@ export default class AudioPlayer {
playPage(page) {
const { background_audio_id, restart_audio } = page.settings
- console.log('playPage', background_audio_id)
+ console.log('playPage', page)
if (
this.current_background_id
&& this.current_background_id !== background_audio_id
diff --git a/frontend/site/site/site.reducer.js b/frontend/site/site/site.reducer.js
index e0b53fb..9763e48 100644
--- a/frontend/site/site/site.reducer.js
+++ b/frontend/site/site/site.reducer.js
@@ -9,7 +9,7 @@ const initialState = {
}
export default function siteReducer(state = initialState, action) {
- console.log(action.type, action)
+ // console.log(action.type, action)
switch (action.type) {
case types.site.set_site_title:
return {
diff --git a/static/site.css b/static/site.css
index 08135de..a42f15a 100644
--- a/static/site.css
+++ b/static/site.css
@@ -1,6 +1,8 @@
-
-* { box-sizing: border-box; }
-html, body {
+* {
+ box-sizing: border-box;
+}
+html,
+body {
margin: 0;
padding: 0;
width: 100%;
@@ -10,7 +12,7 @@ body {
background: #000;
color: #ddd;
overflow: hidden;
- font-family: 'Roboto', sans-serif;
+ font-family: "Roboto", sans-serif;
font-size: 0.875rem;
height: 100%;
width: 100%;
@@ -59,13 +61,13 @@ body {
}
@font-face {
- font-family: 'Roboto';
- src: url('SITE_PATH/static/fonts/Roboto-Bold.ttf') format('truetype');
+ font-family: "Roboto";
+ src: url("SITE_PATH/static/fonts/Roboto-Bold.ttf") format("truetype");
font-weight: bold;
}
@font-face {
- font-family: 'Roboto';
- src: url('SITE_PATH/static/fonts/Roboto-BoldItalic.ttf') format('truetype');
+ font-family: "Roboto";
+ src: url("SITE_PATH/static/fonts/Roboto-BoldItalic.ttf") format("truetype");
font-weight: bold;
font-style: italic;
}
@@ -82,23 +84,23 @@ body {
}
*/
@font-face {
- font-family: 'Roboto';
- src: url('SITE_PATH/static/fonts/Roboto-Medium.ttf') format('truetype');
+ font-family: "Roboto";
+ src: url("SITE_PATH/static/fonts/Roboto-Medium.ttf") format("truetype");
font-weight: 300;
}
@font-face {
- font-family: 'Roboto';
- src: url('SITE_PATH/static/fonts/Roboto-MediumItalic.ttf') format('truetype');
+ font-family: "Roboto";
+ src: url("SITE_PATH/static/fonts/Roboto-MediumItalic.ttf") format("truetype");
font-style: italic;
font-weight: 300;
}
@font-face {
- font-family: 'Roboto';
- src: url('SITE_PATH/static/fonts/Roboto-Regular.ttf') format('truetype');
+ font-family: "Roboto";
+ src: url("SITE_PATH/static/fonts/Roboto-Regular.ttf") format("truetype");
}
@font-face {
- font-family: 'Roboto';
- src: url('SITE_PATH/static/fonts/Roboto-Italic.ttf') format('truetype');
+ font-family: "Roboto";
+ src: url("SITE_PATH/static/fonts/Roboto-Italic.ttf") format("truetype");
font-style: italic;
}
/*
@@ -114,7 +116,6 @@ body {
}
*/
-
.tile.hand_up {
cursor: url(SITE_PATH/static/img/hand_up.png) 40 10, pointer;
}
@@ -127,8 +128,15 @@ body {
.tile.hand_left {
cursor: url(SITE_PATH/static/img/hand_left.png) 10 60, pointer;
}
+.tile.unclickable {
+ cursor: default;
+ pointer-events: none;
+}
+.tile.none {
+ cursor: default;
+}
.tile.link {
border: 0 !important;
background: transparent !important;
-} \ No newline at end of file
+}