Merge branch 'with-demo-site'

This commit is contained in:
Simon Brooke 2020-10-20 14:35:02 +01:00
commit 636e6466c0
4 changed files with 26 additions and 4 deletions

24
index.html Normal file
View file

@ -0,0 +1,24 @@
<!doctype html>
<html lang="en">
<head>
<meta charset='utf-8'>
<meta http-equiv="refresh" content="0; URL='resources/public/index.html'" />
<link rel="stylesheet" href="http://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.5/css/bootstrap.min.css">
<link rel="stylesheet" href="resources/public/css/re-com.css">
<link rel="stylesheet" href="resources/public/css/swinging-needle-meter.css">
<link href="http://fonts.googleapis.com/css?family=Roboto:300,400,500,700,400italic" rel="stylesheet" type="text/css">
<link href="http://fonts.googleapis.com/css?family=Roboto+Condensed:400,300" rel="stylesheet" type="text/css">
<title>Example swinging needle meter following re-com conventions.</title>
</head>
<body>
<div id="app">
<h1>
This isn't actually where you want to be.
</h1>
<p>
If you're seeing this, you probably want to <a href="resources/public/index.html">go here.</a>
</p>
</div>
</body>
</html>

View file

@ -14,7 +14,7 @@
/* The following style addresses: http://stackoverflow.com/questions/28636832/firefox-overflow-y-not-working-with-nested-flexbox */
* {
min-height: 0px;
min-height: 0px;
min-width: 0px;
}
@ -26,7 +26,7 @@ html, body {
letter-spacing: 0.002em;
height: 100%;
margin: 0px;
padding: 0px;
padding: 0px 5%;
}
/*----------------------------------------------------------------------------------------

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.8 KiB

View file

@ -3,13 +3,11 @@
<head>
<meta charset='utf-8'>
<link rel="stylesheet" href="http://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.5/css/bootstrap.min.css">
<link rel="stylesheet" href="vendor/css/material-design-iconic-font.min.css">
<link rel="stylesheet" href="css/re-com.css">
<link rel="stylesheet" href="css/swinging-needle-meter.css">
<link href="http://fonts.googleapis.com/css?family=Roboto:300,400,500,700,400italic" rel="stylesheet" type="text/css">
<link href="http://fonts.googleapis.com/css?family=Roboto+Condensed:400,300" rel="stylesheet" type="text/css">
<title>Example swinging needle meter following re-com conventions.</title>
</head>
<body>