diff options
| author | Nicolas Lœuillet <nicolas@loeuillet.org> | 2014-03-30 21:17:28 +0200 |
|---|---|---|
| committer | Nicolas Lœuillet <nicolas@loeuillet.org> | 2014-03-30 21:17:28 +0200 |
| commit | 22db488d21bc23dc28fc2d60574803525fe53b53 (patch) | |
| tree | f5397cb0c8444d8d0a3fbec858529338bf83e116 /themes/courgette | |
| parent | 1be13ba1fc6466f94ae4416dcd9eece9b5b4f9a0 (diff) | |
| parent | d6d8a045e6a16525807453f0d1229f5bdc307dd0 (diff) | |
| download | wallabag-22db488d21bc23dc28fc2d60574803525fe53b53.tar.gz wallabag-22db488d21bc23dc28fc2d60574803525fe53b53.tar.zst wallabag-22db488d21bc23dc28fc2d60574803525fe53b53.zip | |
Merge branch 'dev' of https://github.com/wallabag/wallabag into dev
Diffstat (limited to 'themes/courgette')
| -rwxr-xr-x | themes/courgette/_top.twig | 2 | ||||
| -rwxr-xr-x | themes/courgette/_view.twig | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/themes/courgette/_top.twig b/themes/courgette/_top.twig index 4d2dbb21..2d41db17 100755 --- a/themes/courgette/_top.twig +++ b/themes/courgette/_top.twig | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | <header> | 1 | <header> |
| 2 | <h1> | 2 | <h1> |
| 3 | {% if view == 'home' %}{% block logo %}<img src="{{ poche_url }}themes/{{ constant('DEFAULT_THEME') }}/img/logo.svg" alt="wallabag logo" />{% endblock %} | 3 | {% if view == 'home' %}{% block logo %}<img src="{{ poche_url }}themes/{{theme}}/img/logo.svg" alt="wallabag logo" />{% endblock %} |
| 4 | {% elseif view == 'fav' %}<a href="./" title="{% trans "back to home" %}" >{{ block('logo') }} <span>Favoris</span></a> | 4 | {% elseif view == 'fav' %}<a href="./" title="{% trans "back to home" %}" >{{ block('logo') }} <span>Favoris</span></a> |
| 5 | {% elseif view == 'archive' %}<a href="./" title="{% trans "back to home" %}" >{{ block('logo') }} <span>Archive</span></a> | 5 | {% elseif view == 'archive' %}<a href="./" title="{% trans "back to home" %}" >{{ block('logo') }} <span>Archive</span></a> |
| 6 | {% else %}<a href="./" title="{% trans "back to home" %}" >{{ block('logo') }}</a> | 6 | {% else %}<a href="./" title="{% trans "back to home" %}" >{{ block('logo') }}</a> |
diff --git a/themes/courgette/_view.twig b/themes/courgette/_view.twig index 5aa201d4..9f9ea4f6 100755 --- a/themes/courgette/_view.twig +++ b/themes/courgette/_view.twig | |||
| @@ -23,7 +23,7 @@ | |||
| 23 | {{ content | raw }} | 23 | {{ content | raw }} |
| 24 | </article> | 24 | </article> |
| 25 | </div> | 25 | </div> |
| 26 | <script src="{{ poche_url }}themes/{{ constant('DEFAULT_THEME') }}/js/restoreScroll.js"></script> | 26 | <script src="{{ poche_url }}themes/{{theme}}/js/restoreScroll.js"></script> |
| 27 | <script type="text/javascript"> | 27 | <script type="text/javascript"> |
| 28 | $(document).ready(function() { | 28 | $(document).ready(function() { |
| 29 | 29 | ||