Merging from master

This commit is contained in:
James Barnsley
2018-07-27 19:49:15 +12:00
37 changed files with 21650 additions and 10646 deletions

View File

@ -5,28 +5,28 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<meta content="width=device-width, initial-scale=1" name="viewport" />
<meta name="mobile-web-app-capable" content="yes" >
<meta name="viewport" content="width=device-width" />
<link rel="manifest" href="/iris/manifest.json" />
<!-- App setup -->
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="theme-color" content="#222222" />
<meta name="viewport" content="width=device-width">
<link rel="shortcut icon" type="image/ico" href="/iris/assets/favicon.ico" />
<link rel="shortcut icon" type="image/x-icon" href="/iris/assets/favicon.ico" />
<link rel="shortcut-icon" href="/iris/assets/favicon.ico" />
<!-- Chrome app -->
<link rel="manifest" href="/iris/manifest.json">
<!-- Apple app -->
<meta name="apple-mobile-web-app-title" content="Iris" />
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="#121212">
<link rel="apple-touch-startup-image" href="/iris/assets/logo-full-512.png" />
<link rel="apple-touch-icon" sizes="192x192" href="/iris/assets/logo-app-192.png" />
<link rel="apple-touch-icon" sizes="512x512" href="/iris/assets/logo-app-512.png" />
<link rel="mask-icon" href="/iris/assets/icon_coloured.svg" color="#08d58f" />
<meta name="apple-mobile-web-app-status-bar-style" content="#121212" />
<meta name="mobile-web-app-capable" content="yes" />
<meta name="theme-color" content="#222222" />
<!-- Icons -->
<link rel="apple-touch-startup-image" href="/iris/assets/app-icon_512.png" />
<link rel="apple-touch-icon" sizes="192x192" href="/iris/assets/logo-app_192.png" />
<link rel="apple-touch-icon" sizes="512x512" href="/iris/assets/logo-app_512.png" />
<link rel="shortcut icon" type="image/ico" href="/iris/assets/app-icon_64.png" />
<link rel="shortcut icon" type="image/x-icon" href="/iris/assets/app-icon_64.png" />
<link rel="shortcut-icon" href="/iris/assets/app-icon_64.png" />
<link rel="mask-icon" href="/iris/assets/app-icon.svg" color="#08d58f" />
<!-- Loading screen -->
<!-- Loading screen styles -->
<style>
html {
background-color: #121212;