From: Nicolas Lœuillet <nicolas@loeuillet.org>
Date: Fri, 26 Aug 2016 12:26:47 +0000 (+0200)
Subject: Fix print / article views
X-Git-Tag: 2.1.0~48^2~2
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=52ef49709918809d6fbe40bc68e4ff090b84e6c8;p=github%2Fwallabag%2Fwallabag.git

Fix print / article views
---

diff --git a/app/Resources/static/themes/material/css/print.css b/app/Resources/static/themes/material/css/print.css
index a16be71e..37228cff 100755
--- a/app/Resources/static/themes/material/css/print.css
+++ b/app/Resources/static/themes/material/css/print.css
@@ -26,10 +26,23 @@
   div.tools,
   header div,
   .messages,
-  .entry + .results {
+  .entry + .results,
+  #slide-out,
+  .progress, .hide-on-large-only,
+  #article > aside,
+  #article .mbm a
+  {
     display: none !important;
   }
 
+  main {
+      padding-left: 0 !important;
+  }
+
+  #article {
+      margin: inherit !important;
+  }
+
   article {
     border: none !important;
   }
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
index eb5d88e3..9b587c34 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
@@ -206,17 +206,18 @@
         </header>
         <aside>
             {% set readingTime = entry.readingTime / app.user.config.readingSpeed %}
-            <span class="link mdi-action-query-builder">
+            <span class="mdi-action-query-builder"></span>
+            <span class="link">
                 {% if readingTime > 0 %}
                     {{ 'entry.list.reading_time_minutes_short'|trans({'%readingTime%': readingTime|round}) }}
                 {% else %}
                     {{ 'entry.list.reading_time_less_one_minute_short'|trans|raw }}
                 {% endif %}
             </span>
-            <span class="link mdi-action-today" title="{{ 'entry.view.created_at'|trans }}"> {{ entry.createdAt|date('Y-m-d') }}</span>
+            <span class="mdi-action-today" title="{{ 'entry.view.created_at'|trans }}"> </span> <span class="link">{{ entry.createdAt|date('Y-m-d') }}</span>
             <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool">
-            <span class="link"><i class="material-icons link">link</i> {{ entry.domainName|removeWww }}</span></a>
-            <span class="tool link"><i class="material-icons link">comment</i> {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span>
+            <i class="material-icons link">link</i> <span class="link">{{ entry.domainName|removeWww }}</span></a>
+            <span class="tool"><i class="material-icons link">comment</i> <span class="link">{{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span>
             <div id="list">
                 {% for tag in entry.tags %}
                     <div class="chip">