1
0

Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	src/bootstrap.php
This commit is contained in:
JelmerHinssen
2017-02-23 15:35:10 +01:00
7 changed files with 162 additions and 28 deletions

View File

@ -4,26 +4,7 @@
<meta charset="utf-8"/>
<title>Slim 3</title>
<link href='//fonts.googleapis.com/css?family=Lato:300' rel='stylesheet' type='text/css'>
<style>
body {
margin: 50px 0 0 0;
padding: 0;
width: 100%;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
text-align: center;
color: #aaa;
font-size: 18px;
}
h1 {
color: #719e40;
letter-spacing: -3px;
font-family: 'Lato', sans-serif;
font-size: 100px;
font-weight: 200;
margin-bottom: 0;
}
</style>
<link href='assets/css/demo.css' rel='stylesheet' type='text/css'>
</head>
<body>
<h1>Slim</h1>