aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorJérémy Benoist <j0k3r@users.noreply.github.com>2018-07-12 11:31:30 +0000
committerGitHub <noreply@github.com>2018-07-12 11:31:30 +0000
commit0f36a88e16c843827be1074df1c36ea534b31394 (patch)
treef854920c09cde437e9562d3f35ec57bb2109f7d3 /src
parent9b12f822e1ab1b9363a3b32c17590eca078ffa67 (diff)
parente93f37206a82ce575f857e073feee437bb579fbb (diff)
downloadwallabag-0f36a88e16c843827be1074df1c36ea534b31394.tar.gz
wallabag-0f36a88e16c843827be1074df1c36ea534b31394.tar.zst
wallabag-0f36a88e16c843827be1074df1c36ea534b31394.zip
Merge pull request #3692 from Simounet/feature/svg-logo
Feature/svg logo
Diffstat (limited to 'src')
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig2
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Exception/error.html.twig2
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig2
-rw-r--r--src/Wallabag/UserBundle/Resources/views/layout.html.twig2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig
index 9b0503d6..b9fcc005 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig
@@ -7,7 +7,7 @@
7 <meta property="og:title" content="{{ entry.title|e|raw }}" /> 7 <meta property="og:title" content="{{ entry.title|e|raw }}" />
8 <meta property="og:type" content="article" /> 8 <meta property="og:type" content="article" />
9 <meta property="og:url" content="{{ app.request.uri }}" /> 9 <meta property="og:url" content="{{ app.request.uri }}" />
10 {% set picturePath = app.request.schemeAndHttpHost ~ asset('wallassets/themes/_global/img/logo-other_themes.png') %} 10 {% set picturePath = app.request.schemeAndHttpHost ~ asset('wallassets/themes/_global/img/logo-wallabag.svg') %}
11 {% if entry.previewPicture is not null %} 11 {% if entry.previewPicture is not null %}
12 {% set picturePath = entry.previewPicture %} 12 {% set picturePath = entry.previewPicture %}
13 {% endif %} 13 {% endif %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Exception/error.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Exception/error.html.twig
index b5db40f5..741795aa 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Exception/error.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Exception/error.html.twig
@@ -11,7 +11,7 @@
11<main class="valign-wrapper"> 11<main class="valign-wrapper">
12 <div class="valign row"> 12 <div class="valign row">
13 <div class="card sw"> 13 <div class="card sw">
14 <div class="center"><img src="{{ asset('wallassets/themes/_global/img/logo-other_themes.png') }}" alt="wallabag logo" /></div> 14 <div class="center"><img src="{{ asset('wallassets/themes/_global/img/logo-wallabag.svg') }}" alt="wallabag logo" class="typo-logo" /></div>
15 <div class="card-content"> 15 <div class="card-content">
16 <div class="row"> 16 <div class="row">
17 <h5>{{ status_code }}: {{ status_text }}</h5> 17 <h5>{{ status_code }}: {{ status_text }}</h5>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
index 6472d182..f0012ad9 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
@@ -29,7 +29,7 @@
29 {% block logo %} 29 {% block logo %}
30 <li class="logo border-bottom"> 30 <li class="logo border-bottom">
31 <a title="{{ 'menu.left.back_to_unread'|trans }}" href="{{ path('unread') }}"> 31 <a title="{{ 'menu.left.back_to_unread'|trans }}" href="{{ path('unread') }}">
32 <img src="{{ asset('wallassets/themes/_global/img/logo-square.png') }}" alt="wallabag logo" /> 32 <img src="{{ asset('wallassets/themes/_global/img/logo-square.svg') }}" alt="wallabag logo" />
33 </a> 33 </a>
34 </li> 34 </li>
35 {% endblock %} 35 {% endblock %}
diff --git a/src/Wallabag/UserBundle/Resources/views/layout.html.twig b/src/Wallabag/UserBundle/Resources/views/layout.html.twig
index eada1829..99bf7dfd 100644
--- a/src/Wallabag/UserBundle/Resources/views/layout.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/layout.html.twig
@@ -11,7 +11,7 @@
11<main class="valign-wrapper"> 11<main class="valign-wrapper">
12 <div class="valign row"> 12 <div class="valign row">
13 <div class="card sw"> 13 <div class="card sw">
14 <div class="center"><img src="{{ asset('wallassets/themes/_global/img/logo-other_themes.png') }}" alt="wallabag logo" /></div> 14 <div class="center"><img src="{{ asset('wallassets/themes/_global/img/logo-wallabag.svg') }}" alt="wallabag logo" class="typo-logo" /></div>
15 {% block fos_user_content %} 15 {% block fos_user_content %}
16 {% endblock fos_user_content %} 16 {% endblock fos_user_content %}
17 </div> 17 </div>