commit: f9fb5fac18d70fccc1c7581e5460cb970536ec69
parent 507e57183e17958b05108454012666167f69c825
Author: Rekka <rekkabell@gmail.com>
Date: Wed, 25 Jul 2018 12:58:24 +1200
Merge branch 'master' of https://github.com/hundredrabbits/Grimgrains
Diffstat:
4 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/index.html b/index.html
@@ -1,8 +1,10 @@
<!DOCTYPE html>
<html lang="en">
<head>
- <meta name="description" content="Grim Grains is an illustrated food blog, it features plant-based (vegan) recipes with a strong attention to colour and form.">
<meta charset="utf-8">
+ <meta name="viewport" content="width=800, initial-scale=1.0">
+ <meta name="description" content="Grim Grains is an illustrated food blog, it features plant-based (vegan) recipes with a strong attention to colour and form.">
+
<script src="scripts/lib/riven.js"></script>
<script src="scripts/graph.js"></script>
<script src="scripts/lib/runic.js"></script>
@@ -28,7 +30,7 @@
<link rel="stylesheet" type="text/css" href="links/reset.css"/>
<link rel="stylesheet" type="text/css" href="links/main.css"/>
<link rel="stylesheet" type="text/css" href="links/fonts.css"/>
- <title>Riven</title>
+ <title>GrimGrains</title>
</head>
<body>
<script>
diff --git a/links/main.css b/links/main.css
@@ -9,6 +9,11 @@ h1,h2,h3,h4 { font-weight: normal; font-family: 'alte_haas_grotesk_bold'; margin
#view { max-width: 900px; margin:0px auto; padding:90px 30px; }
+#view.loading { opacity: 0 }
+#view.loading #header #photo { opacity: 0 }
+#view.ready { opacity: 1; transition: opacity 250ms }
+#view.ready #header #photo { opacity: 1 }
+
#view #header { }
#view #header #logo a { cursor: pointer; transition: all 250ms; }
#view #header #logo a:hover { opacity: 0.7 }
diff --git a/scripts/nodes/query.js b/scripts/nodes/query.js
@@ -9,7 +9,7 @@ function QueryNode(id,rect)
{
var target = input.to_url() === '' ? 'home' : input.to_url()
- Ø("view").el.className = target.to_path()
+ Ø("view").el.className = `${target.to_path()} loading`
this.label = `${this.id}|${target}`
this.send(target)
diff --git a/scripts/nodes/template.js b/scripts/nodes/template.js
@@ -16,5 +16,7 @@ function TemplateNode(id,rect)
// Install Dom
document.body.appendChild(this.signal("view").answer())
+
+ setTimeout(()=>{ Ø("view").el.className = `${q.name} ready` },250)
}
}
\ No newline at end of file
