Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
open-source
MetaGer
Commits
72575afa
Commit
72575afa
authored
May 10, 2016
by
karl
Browse files
Merge branch 'master' into 2-datenschutz-seite
Conflicts: app/Http/routes.php
parents
963f3e3d
87ba6fa6
Changes
3
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
app/Http/routes.php
View file @
72575afa
...
@@ -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'
);
});
});
});
});
...
...
public/css/help.css
0 → 100644
View file @
72575afa
*
{
}
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
resources/views/hilfe.blade.php
View file @
72575afa
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment