Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
MetaGer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
open-source
MetaGer
Commits
c76c7c35
Commit
c76c7c35
authored
Dec 12, 2016
by
Dominik Hebeler
Browse files
Options
Downloads
Plain Diff
Merge branch '399-spendenaufruf-aus-der-englischen-version-entfernen' into 'development'
Spendenaufruf ist nur noch in der deutschen Version sichtbar Closes
#399
See merge request
!636
parents
ebe302dc
2086fbd2
Branches
Branches containing commit
No related tags found
2 merge requests
!637
Development
,
!636
Spendenaufruf ist nur noch in der deutschen Version sichtbar
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
resources/views/layouts/staticPages.blade.php
+2
-0
2 additions, 0 deletions
resources/views/layouts/staticPages.blade.php
resources/views/quicktip.blade.php
+2
-0
2 additions, 0 deletions
resources/views/quicktip.blade.php
with
4 additions
and
0 deletions
resources/views/layouts/staticPages.blade.php
+
2
−
0
View file @
c76c7c35
...
...
@@ -112,9 +112,11 @@
</nav>
</header>
<div
class=
"wrapper"
>
@if(App::isLocale("de"))
<div
class=
"mg-panel container aufruf-winter hidden-xs"
><a
href=
"/spendenaufruf"
><h1
class=
"aufruf-winter"
>
@lang('staticPages.spendenaufruf.title')
</h1></a>
<p
class=
"lead"
style=
"margin-bottom: 5px"
>
{!! trans('staticPages.spendenaufruf.text') !!}
</p>
</div>
@endif
<main
class=
"mg-panel container"
>
@if (isset($success))
<div
class=
"alert alert-success"
role=
"alert"
>
{{ $success }}
</div>
...
...
This diff is collapsed.
Click to expand it.
resources/views/quicktip.blade.php
+
2
−
0
View file @
c76c7c35
...
...
@@ -6,6 +6,7 @@
<link
type=
"text/css"
rel=
"stylesheet"
href=
"{{ elixir('css/themes/default.css') }}"
/>
</head>
<body
class=
"quicktips"
>
@if(App::isLocale("de"))
<div
class=
"quicktip aufruf-winter"
>
<div
class=
"media"
>
<div
class=
"media-body"
>
...
...
@@ -16,6 +17,7 @@
</div>
</div>
</div>
@endif
@if( $spruch !== "" )
<blockquote
id=
"spruch"
>
{!! $spruch !!}
</blockquote>
@endif
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
sign in
to comment