Skip to content
GitLab
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
e6450665
Commit
e6450665
authored
Oct 19, 2016
by
Dominik Hebeler
Browse files
Merge branch '316-designauswahl-funktioniert-nicht-mehr' into 'development'
Farbwähler wieder eingebaut Closes
#316
See merge request
!503
parents
93bad789
73ee3a8c
Changes
2
Hide whitespace changes
Inline
Side-by-side
resources/views/layouts/resultPage.blade.php
View file @
e6450665
...
...
@@ -13,6 +13,7 @@
<link
type=
"text/css"
rel=
"stylesheet"
href=
"/css/themes/{{ app('request')->input('theme', 'default') }}.css"
/>
<link
href=
"/css/styleResultPage.css"
rel=
"stylesheet"
/>
<link
type=
"text/css"
rel=
"stylesheet"
href=
"/css/lightslider.css"
/>
<link
id=
"theme"
type=
"text/css"
rel=
"stylesheet"
href=
"/css/theme.css.php"
/>
@if( isset($mobile)
&&
$mobile )
<link
href=
"/css/styleResultPageMobile.css"
rel=
"stylesheet"
/>
@endif
...
...
resources/views/layouts/staticPages.blade.php
View file @
e6450665
...
...
@@ -19,6 +19,7 @@
-->
<link
type=
"text/css"
rel=
"stylesheet"
href=
"/css/themes/{{ app('request')->input('theme', 'default') }}.css"
/>
<!--<link href="/css/style.css" rel="stylesheet" />-->
<link
id=
"theme"
type=
"text/css"
rel=
"stylesheet"
href=
"/css/theme.css.php"
/>
@if (isset($css))
@if(is_array($css))
@foreach($css as $el)
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment