Skip to content
Snippets Groups Projects
Commit f12abb76 authored by Dominik Hebeler's avatar Dominik Hebeler
Browse files

Merge branch '550-aufblitzen-des-orangenen-themes-beseitigen' into 'development' 

Resolve "Aufblitzen des orangenen Themes beseitigen"

Closes #550

See merge request !1030
parents 64466a18 47d3f78c
No related branches found
No related tags found
2 merge requests!1040Development,!1030Resolve "Aufblitzen des orangenen Themes beseitigen"
Hide whitespace changes
Inline Side-by-side
public/js/scriptSubPages.js
+ 2
− 3
View file @ f12abb76
$(document).ready(function () {
if (localStorage) {
var theme = localStorage.getItem('theme');
if (theme != null) {
......@@ -6,8 +6,7 @@ $(document).ready(function () {
localStorage.removeItem('theme');
} else {
theme = theme.split(',');
$('#theme').attr('href', '/css/theme.css.php?r=' + theme[0] + '&g=' + theme[1] + '&b=' + theme[2] + '&a=' + theme[3]);
document.getElementById('theme').setAttribute('href', '/css/theme.css.php?r=' + theme[0] + '&g=' + theme[1] + '&b=' + theme[2] + '&a=' + theme[3]);
}
}
}
});
\ No newline at end of file
resources/views/layouts/staticPages.blade.php
+ 2
− 2
View file @ f12abb76
<!DOCTYPE html>
<html lang="{!! trans('staticPages.meta.language') !!}">
<head>
<script src="{{ elixir('js/lib.js') }}"></script>
<meta charset="utf-8" />
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>@yield('title')</title>
......@@ -18,6 +17,8 @@
<link type="text/css" rel="stylesheet" href="/font-awesome/css/font-awesome.min.css" />
<link type="text/css" rel="stylesheet" href="{{ elixir('css/themes/default.css') }}" />
<link id="theme" type="text/css" rel="stylesheet" href="/css/theme.css.php" />
<script src="{{ elixir('js/scriptSubPages.js') }}"></script>
<script src="{{ elixir('js/lib.js') }}"></script>
@if (isset($css))
@if(is_array($css))
@foreach($css as $el)
......@@ -220,5 +221,4 @@
<img src="{{ action('ImageController@generateImage')}}?site={{ urlencode(url()->current()) }}" class="hidden" />
</div>
</body>
<script src="{{ elixir('js/scriptSubPages.js') }}"></script>
</html>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment