From 4c78612eb47b235bc75a90d0aa7df51d654be0c7 Mon Sep 17 00:00:00 2001
From: Simounet <contact@simounet.net>
Date: Wed, 11 Jul 2018 21:51:52 +0200
Subject: wallabag logo with typo replaced by an SVG one

---
 .../CoreBundle/Resources/views/themes/common/Entry/share.html.twig      | 2 +-
 .../Resources/views/themes/material/Exception/error.html.twig           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/Wallabag/CoreBundle/Resources')

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 @@
         <meta property="og:title" content="{{ entry.title|e|raw }}" />
         <meta property="og:type" content="article" />
         <meta property="og:url" content="{{ app.request.uri }}" />
-        {% set picturePath = app.request.schemeAndHttpHost ~ asset('wallassets/themes/_global/img/logo-other_themes.png') %}
+        {% set picturePath = app.request.schemeAndHttpHost ~ asset('wallassets/themes/_global/img/logo-wallabag.svg') %}
         {% if entry.previewPicture is not null %}
             {% set picturePath = entry.previewPicture %}
         {% 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 @@
 <main class="valign-wrapper">
     <div class="valign row">
         <div class="card sw">
-            <div class="center"><img src="{{ asset('wallassets/themes/_global/img/logo-other_themes.png') }}" alt="wallabag logo" /></div>
+            <div class="center"><img src="{{ asset('wallassets/themes/_global/img/logo-wallabag.svg') }}" alt="wallabag logo" class="typo-logo" /></div>
             <div class="card-content">
                 <div class="row">
                     <h5>{{ status_code }}: {{ status_text }}</h5>
-- 
cgit v1.2.3


From e93f37206a82ce575f857e073feee437bb579fbb Mon Sep 17 00:00:00 2001
From: Simounet <contact@simounet.net>
Date: Wed, 11 Jul 2018 21:57:53 +0200
Subject: wallabag logo (side-nav) replaced by an SVG one

---
 .../CoreBundle/Resources/views/themes/material/layout.html.twig         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Wallabag/CoreBundle/Resources')

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 @@
             {% block logo %}
                 <li class="logo border-bottom">
                     <a title="{{ 'menu.left.back_to_unread'|trans }}" href="{{ path('unread') }}">
-                        <img src="{{ asset('wallassets/themes/_global/img/logo-square.png') }}" alt="wallabag logo" />
+                        <img src="{{ asset('wallassets/themes/_global/img/logo-square.svg') }}" alt="wallabag logo" />
                     </a>
                 </li>
             {% endblock %}
-- 
cgit v1.2.3


From 7fd4ad6564cd606ccbf0370f1f9287586db49a2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aleksandar=20Todorovi=C4=87=20=28r3bl=29?=
 <aleksandar@r3bl.me>
Date: Fri, 10 Aug 2018 20:15:46 +0200
Subject: Fixes a typo

---
 src/Wallabag/CoreBundle/Resources/translations/messages.en.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Wallabag/CoreBundle/Resources')

diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index 88517c82..bd81c72f 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -116,7 +116,7 @@ config:
         archived: Remove ALL archived entries
         confirm: Are you really sure? (THIS CAN'T BE UNDONE)
     form_password:
-        description: "You can change your password here. Your new password should by at least 8 characters long."
+        description: "You can change your password here. Your new password should be at least 8 characters long."
         old_password_label: 'Current password'
         new_password_label: 'New password'
         repeat_new_password_label: 'Repeat new password'
-- 
cgit v1.2.3