aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeremy Benoist <j0k3r@users.noreply.github.com>2016-09-01 22:23:45 +0200
committerGitHub <noreply@github.com>2016-09-01 22:23:45 +0200
commit33adf8dc915f4911fd454e98194c1b2323514d4a (patch)
tree421d747de74344c4bcd5da15d6a724abb2cc056b
parent8bde9d0efe69d8481e1a8223909d8a8fdea4a054 (diff)
parentbe20e6f00945accc65849e14558bcdb50c08a6ff (diff)
downloadwallabag-33adf8dc915f4911fd454e98194c1b2323514d4a.tar.gz
wallabag-33adf8dc915f4911fd454e98194c1b2323514d4a.tar.zst
wallabag-33adf8dc915f4911fd454e98194c1b2323514d4a.zip
Merge pull request #2242 from wallabag/fix-minor-css
Fix print / article views
-rwxr-xr-xapp/Resources/static/themes/baggy/css/print.css4
-rwxr-xr-xapp/Resources/static/themes/material/css/print.css15
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig43
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig9
4 files changed, 45 insertions, 26 deletions
diff --git a/app/Resources/static/themes/baggy/css/print.css b/app/Resources/static/themes/baggy/css/print.css
index 6f187ff5..f7f6a8ad 100755
--- a/app/Resources/static/themes/baggy/css/print.css
+++ b/app/Resources/static/themes/baggy/css/print.css
@@ -26,7 +26,9 @@
26 div.tools, 26 div.tools,
27 header div, 27 header div,
28 .messages, 28 .messages,
29 .entrie + .results { 29 .entrie + .results,
30 #article .mbm a,
31 #article-informations {
30 display: none !important; 32 display: none !important;
31 } 33 }
32 34
diff --git a/app/Resources/static/themes/material/css/print.css b/app/Resources/static/themes/material/css/print.css
index a16be71e..1eb96735 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/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
index 6c46f91f..675168bb 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig
@@ -30,29 +30,32 @@
30 <li><a href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&amp;body={{ entry.url|url_encode }}" title="{{ 'entry.view.left_menu.problem.label'|trans }}" class="tool bad-display icon icon-delete"><span>{{ 'entry.view.left_menu.problem.label'|trans }}</span></a></li> 30 <li><a href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&amp;body={{ entry.url|url_encode }}" title="{{ 'entry.view.left_menu.problem.label'|trans }}" class="tool bad-display icon icon-delete"><span>{{ 'entry.view.left_menu.problem.label'|trans }}</span></a></li>
31 </ul> 31 </ul>
32 </div> 32 </div>
33 <div class="link mdi-action-today">
34 {{ 'entry.view.created_at'|trans }}: {{ entry.createdAt|date('Y-m-d') }}
35 </div>
36 33
37 <div class="link mdi-action-query-builder"> 34 <div id="article-informations">
38 {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} 35 <div class="link mdi-action-today">
39 {% if readingTime > 0 %} 36 {{ 'entry.view.created_at'|trans }}: {{ entry.createdAt|date('Y-m-d') }}
40 {{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': readingTime|round})|capitalize }} 37 </div>
41 {% else %}
42 {{ 'entry.list.reading_time_less_one_minute'|trans|raw }}
43 {% endif %}
44 </div>
45 38
46 {% set nbAnnotations = entry.annotations | length %} 39 <div class="link mdi-action-query-builder">
47 <span class="tool link"><i class="material-icons link">comment</i> {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span> 40 {% set readingTime = entry.readingTime / app.user.config.readingSpeed %}
48 <aside class="tags"> 41 {% if readingTime > 0 %}
49 {% for tag in entry.tags %} 42 {{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': readingTime|round})|capitalize }}
50 <span class="label-outline"><i class="material-icons">label_outline</i> {{ tag.label }}</span> <a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}"class="nostyle"><i>✘</i></a> 43 {% else %}
51 {% endfor %} 44 {{ 'entry.list.reading_time_less_one_minute'|trans|raw }}
52 <div class="input-field nav-panel-add-tag" style="display: none"> 45 {% endif %}
53 {{ render(controller( "WallabagCoreBundle:Tag:addTagForm", { 'id': entry.id } )) }}
54 </div> 46 </div>
55 </aside> 47
48 {% set nbAnnotations = entry.annotations | length %}
49 <span class="tool link"><i class="material-icons link">comment</i> {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span>
50 <aside class="tags">
51 {% for tag in entry.tags %}
52 <span class="label-outline"><i class="material-icons">label_outline</i> {{ tag.label }}</span> <a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}"class="nostyle"><i>✘</i></a>
53 {% endfor %}
54 <div class="input-field nav-panel-add-tag" style="display: none">
55 {{ render(controller( "WallabagCoreBundle:Tag:addTagForm", { 'id': entry.id } )) }}
56 </div>
57 </aside>
58 </div>
56 {% if entry.previewPicture is not null %} 59 {% if entry.previewPicture is not null %}
57 <div><img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title|raw }}" /></div> 60 <div><img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title|raw }}" /></div>
58 {% endif %} 61 {% endif %}
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">