diff options
author | Nicolas LÅ“uillet <nicolas.loeuillet@gmail.com> | 2013-08-12 05:14:04 -0700 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas.loeuillet@gmail.com> | 2013-08-12 05:14:04 -0700 |
commit | 667009727a38890eb651815843c1bc02869a4119 (patch) | |
tree | fc3cdb9f2c7659c2d6a1bfe04a34d2430629612c /tpl/layout.twig | |
parent | 82757801b9e9cdc8806c0005c290f05124f91ba6 (diff) | |
parent | 15493df62db830a0834a74c240bbb9d8889ae1de (diff) | |
download | wallabag-667009727a38890eb651815843c1bc02869a4119.tar.gz wallabag-667009727a38890eb651815843c1bc02869a4119.tar.zst wallabag-667009727a38890eb651815843c1bc02869a4119.zip |
Merge pull request #132 from inthepoche/dev
merge with beta2
Diffstat (limited to 'tpl/layout.twig')
-rw-r--r-- | tpl/layout.twig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tpl/layout.twig b/tpl/layout.twig index c4bbe779..b86983da 100644 --- a/tpl/layout.twig +++ b/tpl/layout.twig | |||
@@ -5,12 +5,12 @@ | |||
5 | <!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]--> | 5 | <!--[if gt IE 8]><!--> <html class="no-js" lang="en"> <!--<![endif]--> |
6 | <html> | 6 | <html> |
7 | <head> | 7 | <head> |
8 | <meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0"> | 8 | <meta name="viewport" content="initial-scale=1.0"> |
9 | <meta charset="utf-8"> | 9 | <meta charset="utf-8"> |
10 | <meta http-equiv="X-UA-Compatible" content="IE=10"> | 10 | <meta http-equiv="X-UA-Compatible" content="IE=10"> |
11 | <title>{% block title %}{% endblock %} - poche</title> | 11 | <title>{% block title %}{% endblock %} - poche</title> |
12 | {% include '_head.twig' %} | 12 | {% include '_head.twig' %} |
13 | {% include '_bookmarklet.twig' %} | 13 | {% include '_bookmarklet.twig' %} |
14 | </head> | 14 | </head> |
15 | <body> | 15 | <body> |
16 | {% include '_top.twig' %} | 16 | {% include '_top.twig' %} |
@@ -24,6 +24,6 @@ | |||
24 | {% block content %}{% endblock %} | 24 | {% block content %}{% endblock %} |
25 | </div> | 25 | </div> |
26 | </div> | 26 | </div> |
27 | {% include '_footer.twig' %} | 27 | {% include '_footer.twig' %} |
28 | </body> | 28 | </body> |
29 | </html> \ No newline at end of file | 29 | </html> \ No newline at end of file |