Skip to content

Commit

Permalink
Fixed #775: Stylesheet include paths and CSP MIME types.
Browse files Browse the repository at this point in the history
  • Loading branch information
root committed May 20, 2018
1 parent 505fa26 commit 91be209
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 30 deletions.
30 changes: 15 additions & 15 deletions themes/bootstrap3/twig/layout.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,28 @@
<meta charset="UTF-8" />
<title>{% block title %}Welcome!{% endblock %}</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" type="text/css" href="{{ global.request.basepath }}/themes/{{ theme }}/css/style.css">
<link rel="stylesheet" type="text/css" href="{{ global.request.basepath }}/themes/{{ theme }}/css/fontawesome.css">
<link rel="stylesheet" type="text/css" href="{{ global.request.basepath }}/themes/{{ theme }}/css/gitgraph.css">
<link rel="shortcut icon" type="image/png" href="{{ global.request.basepath }}/themes/{{ theme }}/img/favicon.png" />
<link rel="stylesheet" type="text/css" href="{{ app.request.basepath }}/themes/{{ theme }}/css/style.css">
<link rel="stylesheet" type="text/css" href="{{ app.request.basepath }}/themes/{{ theme }}/css/fontawesome.css">
<link rel="stylesheet" type="text/css" href="{{ app.request.basepath }}/themes/{{ theme }}/css/gitgraph.css">
<link rel="shortcut icon" type="image/png" href="{{ app.request.basepath }}/themes/{{ theme }}/img/favicon.png" />
<!--[if lt IE 9]>
<script src="{{ global.request.basepath }}/themes/{{ theme }}/js/html5.js"></script>
<script type="application/javascript" src="{{ app.request.basepath }}/themes/{{ theme }}/js/html5.js"></script>
<![endif]-->
</head>

<body>
{% block body %}{% endblock %}
{% block javascripts %}
<script src="{{ global.request.basepath }}/themes/{{ theme }}/js/jquery.js"></script>
<script src="{{ global.request.basepath }}/themes/{{ theme }}/js/raphael.js"></script>
<script src="{{ global.request.basepath }}/themes/{{ theme }}/js/bootstrap.js"></script>
<script src="{{ global.request.basepath }}/themes/{{ theme }}/js/codemirror.js"></script>
<script src="{{ global.request.basepath }}/themes/{{ theme }}/js/showdown.js"></script>
<script src="{{ global.request.basepath }}/themes/{{ theme }}/js/table.js"></script>
<script src="{{ global.request.basepath }}/themes/{{ theme }}/js/main.js"></script>
<script src="{{ global.request.basepath }}/themes/{{ theme }}/js/networkGraph.js"></script>
<script src="{{ global.request.basepath }}/themes/{{ theme }}/js/gitgraph.js"></script>
<script src="{{ global.request.basepath }}/themes/{{ theme }}/js/draw.js"></script>
<script type="application/javascript" src="{{ app.request.basepath }}/themes/{{ theme }}/js/jquery.js"></script>
<script type="application/javascript" src="{{ app.request.basepath }}/themes/{{ theme }}/js/raphael.js"></script>
<script type="application/javascript" src="{{ app.request.basepath }}/themes/{{ theme }}/js/bootstrap.js"></script>
<script type="application/javascript" src="{{ app.request.basepath }}/themes/{{ theme }}/js/codemirror.js"></script>
<script type="application/javascript" src="{{ app.request.basepath }}/themes/{{ theme }}/js/showdown.js"></script>
<script type="application/javascript" src="{{ app.request.basepath }}/themes/{{ theme }}/js/table.js"></script>
<script type="application/javascript" src="{{ app.request.basepath }}/themes/{{ theme }}/js/main.js"></script>
<script type="application/javascript" src="{{ app.request.basepath }}/themes/{{ theme }}/js/networkGraph.js"></script>
<script type="application/javascript" src="{{ app.request.basepath }}/themes/{{ theme }}/js/gitgraph.js"></script>
<script type="application/javascript" src="{{ app.request.basepath }}/themes/{{ theme }}/js/draw.js"></script>
{% endblock %}
</body>
</html>
30 changes: 15 additions & 15 deletions themes/default/twig/layout.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,28 @@
<head>
<meta charset="UTF-8" />
<title>{{ title }}{% if title %} - {% endif %}{% block title %}Welcome!{% endblock %}</title>
<link rel="stylesheet" type="text/css" href="{{ global.request.basepath }}/themes/{{ theme }}/css/style.css">
<link rel="stylesheet" type="text/css" href="{{ global.request.basepath }}/themes/{{ theme }}/css/gitgraph.css">
<link rel="shortcut icon" type="image/png" href="{{ global.request.basepath }}/themes/{{ theme }}/img/favicon.png" />
<link rel="stylesheet" type="text/css" href="{{ app.request.basepath }}/themes/{{ theme }}/css/style.css">
<link rel="stylesheet" type="text/css" href="{{ app.request.basepath }}/themes/{{ theme }}/css/gitgraph.css">
<link rel="shortcut icon" type="image/png" href="{{ app.request.basepath }}/themes/{{ theme }}/img/favicon.png" />
<!--[if lt IE 9]>
<script src="{{ global.request.basepath }}/themes/{{ theme }}/js/html5.js"></script>
<script type="application/javascript" src="{{ app.request.basepath }}/themes/{{ theme }}/js/html5.js"></script>
<![endif]-->
</head>

<body>
{% block body %}{% endblock %}
{% block javascripts %}
<script src="{{ global.request.basepath }}/themes/{{ theme }}/js/jquery.js"></script>
<script src="{{ global.request.basepath }}/themes/{{ theme }}/js/raphael.js"></script>
<script src="{{ global.request.basepath }}/themes/{{ theme }}/js/bootstrap.js"></script>
<script src="{{ global.request.basepath }}/themes/{{ theme }}/js/codemirror.js"></script>
<script src="{{ global.request.basepath }}/themes/{{ theme }}/js/showdown.js"></script>
<script src="{{ global.request.basepath }}/themes/{{ theme }}/js/table.js"></script>
<script src="{{ global.request.basepath }}/themes/{{ theme }}/js/list.min.js"></script>
<script src="{{ global.request.basepath }}/themes/{{ theme }}/js/main.js"></script>
<script src="{{ global.request.basepath }}/themes/{{ theme }}/js/networkGraph.js"></script>
<script src="{{ global.request.basepath }}/themes/{{ theme }}/js/gitgraph.js"></script>
<script src="{{ global.request.basepath }}/themes/{{ theme }}/js/draw.js"></script>
<script type="application/javascript" src="{{ app.request.basepath }}/themes/{{ theme }}/js/jquery.js"></script>
<script type="application/javascript" src="{{ app.request.basepath }}/themes/{{ theme }}/js/raphael.js"></script>
<script type="application/javascript" src="{{ app.request.basepath }}/themes/{{ theme }}/js/bootstrap.js"></script>
<script type="application/javascript" src="{{ app.request.basepath }}/themes/{{ theme }}/js/codemirror.js"></script>
<script type="application/javascript" src="{{ app.request.basepath }}/themes/{{ theme }}/js/showdown.js"></script>
<script type="application/javascript" src="{{ app.request.basepath }}/themes/{{ theme }}/js/table.js"></script>
<script type="application/javascript" src="{{ app.request.basepath }}/themes/{{ theme }}/js/list.min.js"></script>
<script type="application/javascript" src="{{ app.request.basepath }}/themes/{{ theme }}/js/main.js"></script>
<script type="application/javascript" src="{{ app.request.basepath }}/themes/{{ theme }}/js/networkGraph.js"></script>
<script type="application/javascript" src="{{ app.request.basepath }}/themes/{{ theme }}/js/gitgraph.js"></script>
<script type="application/javascript" src="{{ app.request.basepath }}/themes/{{ theme }}/js/draw.js"></script>
{% endblock %}
</body>
</html>

0 comments on commit 91be209

Please sign in to comment.