Merge branch 'with-demo-site'
This commit is contained in:
commit
636e6466c0
24
index.html
Normal file
24
index.html
Normal 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>
|
|
@ -26,7 +26,7 @@ html, body {
|
|||
letter-spacing: 0.002em;
|
||||
height: 100%;
|
||||
margin: 0px;
|
||||
padding: 0px;
|
||||
padding: 0px 5%;
|
||||
}
|
||||
|
||||
/*----------------------------------------------------------------------------------------
|
||||
|
|
BIN
resources/public/favicon.ico
Normal file
BIN
resources/public/favicon.ico
Normal file
Binary file not shown.
After Width: | Height: | Size: 3.8 KiB |
|
@ -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>
|
||||
|
|
Loading…
Reference in a new issue