diff options
author | Thomas Citharel <tcit@tcit.fr> | 2014-11-24 22:56:10 +0100 |
---|---|---|
committer | Thomas Citharel <tcit@tcit.fr> | 2014-11-24 22:56:10 +0100 |
commit | b9c026ce32abed7295d2775640edc0ef89017723 (patch) | |
tree | 3492511dde4bb1b3ad5e95ef918a68d5f5418d64 /themes/courgette/layout.twig | |
parent | 485d57972ee3c3219652454ff6d7d82a3602bd34 (diff) | |
parent | 85c5a1ff8d919d3d36a8125c9bbd0d9220025729 (diff) | |
download | wallabag-b9c026ce32abed7295d2775640edc0ef89017723.tar.gz wallabag-b9c026ce32abed7295d2775640edc0ef89017723.tar.zst wallabag-b9c026ce32abed7295d2775640edc0ef89017723.zip |
Merge branch 'remove-courgette' into dev
Conflicts:
themes/courgette/_view.twig
Diffstat (limited to 'themes/courgette/layout.twig')
-rwxr-xr-x | themes/courgette/layout.twig | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/themes/courgette/layout.twig b/themes/courgette/layout.twig deleted file mode 100755 index 57c2cc98..00000000 --- a/themes/courgette/layout.twig +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | <!DOCTYPE html> | ||
2 | <!--[if lte IE 6]><html class="no-js ie6 ie67 ie678" lang="{{ lang }}"><![endif]--> | ||
3 | <!--[if lte IE 7]><html class="no-js ie7 ie67 ie678" lang="{{ lang }}"><![endif]--> | ||
4 | <!--[if IE 8]><html class="no-js ie8 ie678" lang="{{ lang }}"><![endif]--> | ||
5 | <!--[if gt IE 8]><html class="no-js" lang="{{ lang }}"><![endif]--> | ||
6 | <html lang="{{ lang }}"> | ||
7 | <head> | ||
8 | <meta name="viewport" content="initial-scale=1.0"> | ||
9 | <meta charset="utf-8"> | ||
10 | <!--[if IE]> | ||
11 | <meta http-equiv="X-UA-Compatible" content="IE=10"> | ||
12 | <![endif]--> | ||
13 | <title>{% block title %}{% endblock %} - wallabag</title> | ||
14 | {% include '_head.twig' %} | ||
15 | {% include '_bookmarklet.twig' %} | ||
16 | </head> | ||
17 | <body> | ||
18 | {% include '_top.twig' %} | ||
19 | <div id="main"> | ||
20 | <button id="menu"><span>Menu</span></button> | ||
21 | {% block menu %}{% endblock %} | ||
22 | {% block precontent %}{% endblock %} | ||
23 | {% block messages %} | ||
24 | {% include '_messages.twig' %} | ||
25 | {% endblock %} | ||
26 | <div id="content" class="w600p center"> | ||
27 | {% block content %}{% endblock %} | ||
28 | </div> | ||
29 | </div> | ||
30 | {% include '_footer.twig' %} | ||
31 | </body> | ||
32 | </html> \ No newline at end of file | ||