diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2016-08-26 14:26:47 +0200 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2016-08-26 14:35:43 +0200 |
commit | 52ef49709918809d6fbe40bc68e4ff090b84e6c8 (patch) | |
tree | fef9d004ebd64e03020ad68eab9304811da3f69c | |
parent | c4da9d1cd8df4a9efdb3150396432680d93f6e5a (diff) | |
download | wallabag-52ef49709918809d6fbe40bc68e4ff090b84e6c8.tar.gz wallabag-52ef49709918809d6fbe40bc68e4ff090b84e6c8.tar.zst wallabag-52ef49709918809d6fbe40bc68e4ff090b84e6c8.zip |
Fix print / article views
-rwxr-xr-x | app/Resources/static/themes/material/css/print.css | 15 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig | 9 |
2 files changed, 19 insertions, 5 deletions
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 @@ | |||
26 | div.tools, | 26 | div.tools, |
27 | header div, | 27 | header div, |
28 | .messages, | 28 | .messages, |
29 | .entry + .results { | 29 | .entry + .results, |
30 | #slide-out, | ||
31 | .progress, .hide-on-large-only, | ||
32 | #article > aside, | ||
33 | #article .mbm a | ||
34 | { | ||
30 | display: none !important; | 35 | display: none !important; |
31 | } | 36 | } |
32 | 37 | ||
38 | main { | ||
39 | padding-left: 0 !important; | ||
40 | } | ||
41 | |||
42 | #article { | ||
43 | margin: inherit !important; | ||
44 | } | ||
45 | |||
33 | article { | 46 | article { |
34 | border: none !important; | 47 | border: none !important; |
35 | } | 48 | } |
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 @@ | |||
206 | </header> | 206 | </header> |
207 | <aside> | 207 | <aside> |
208 | {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} | 208 | {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} |
209 | <span class="link mdi-action-query-builder"> | 209 | <span class="mdi-action-query-builder"></span> |
210 | <span class="link"> | ||
210 | {% if readingTime > 0 %} | 211 | {% if readingTime > 0 %} |
211 | {{ 'entry.list.reading_time_minutes_short'|trans({'%readingTime%': readingTime|round}) }} | 212 | {{ 'entry.list.reading_time_minutes_short'|trans({'%readingTime%': readingTime|round}) }} |
212 | {% else %} | 213 | {% else %} |
213 | {{ 'entry.list.reading_time_less_one_minute_short'|trans|raw }} | 214 | {{ 'entry.list.reading_time_less_one_minute_short'|trans|raw }} |
214 | {% endif %} | 215 | {% endif %} |
215 | </span> | 216 | </span> |
216 | <span class="link mdi-action-today" title="{{ 'entry.view.created_at'|trans }}"> {{ entry.createdAt|date('Y-m-d') }}</span> | 217 | <span class="mdi-action-today" title="{{ 'entry.view.created_at'|trans }}"> </span> <span class="link">{{ entry.createdAt|date('Y-m-d') }}</span> |
217 | <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool"> | 218 | <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool"> |
218 | <span class="link"><i class="material-icons link">link</i> {{ entry.domainName|removeWww }}</span></a> | 219 | <i class="material-icons link">link</i> <span class="link">{{ entry.domainName|removeWww }}</span></a> |
219 | <span class="tool link"><i class="material-icons link">comment</i> {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span> | 220 | <span class="tool"><i class="material-icons link">comment</i> <span class="link">{{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span> |
220 | <div id="list"> | 221 | <div id="list"> |
221 | {% for tag in entry.tags %} | 222 | {% for tag in entry.tags %} |
222 | <div class="chip"> | 223 | <div class="chip"> |