Commit 72575afa authored by karl's avatar karl
Browse files

Merge branch 'master' into 2-datenschutz-seite

Conflicts:
	app/Http/routes.php
parents 963f3e3d 87ba6fa6
...@@ -59,6 +59,12 @@ ...@@ -59,6 +59,12 @@
return view('datenschutz') return view('datenschutz')
->with('title', 'Datenschutz und Privatsphäre') ->with('title', 'Datenschutz und Privatsphäre')
->with('css', 'privacy.css'); ->with('css', 'privacy.css');
Route::get('hilfe', function()
{
return view('hilfe')
->with('title', 'MetaGer - hilfe')
->with('css', 'help.css');
}); });
}); });
......
* {
}
h3 {
font-size: 21px;
margin-top: 7px;
}
p {
white-space: pre-wrap;
}
h1 {
margin-bottom: 25px;
}
p {
margin: 20px 0;
}
main {
text-align: left;
}
h2 {
font-size: 23px;
margin-top: 10px;
}
address {
white-space: pre;
}
main ul{
list-style-type: disc;
text-align: left;
}
\ No newline at end of file
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment