aboutsummaryrefslogtreecommitdiffhomepage
path: root/themes
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2014-10-30 21:43:15 +0100
committerNicolas LÅ“uillet <nicolas@loeuillet.org>2014-10-30 21:43:15 +0100
commit052bdfc17e9edf22e2335630e137bf34787bf302 (patch)
tree96d226cc6242dff08e39fc65966cdcd89f62293d /themes
parent476b8902bb8cf9df910c6069383ccee740f93ab1 (diff)
parentc9e6fec4bf47042c2693c5e163b2a0cbd878d54d (diff)
downloadwallabag-052bdfc17e9edf22e2335630e137bf34787bf302.tar.gz
wallabag-052bdfc17e9edf22e2335630e137bf34787bf302.tar.zst
wallabag-052bdfc17e9edf22e2335630e137bf34787bf302.zip
Merge pull request #897 from jsit/displaymode
Fixing display mode switching in Baggy theme (issue #896)
Diffstat (limited to 'themes')
-rwxr-xr-xthemes/baggy/css/main.css14
-rwxr-xr-xthemes/baggy/home.twig2
2 files changed, 10 insertions, 6 deletions
diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css
index 6b5a1f4c..f0148909 100755
--- a/themes/baggy/css/main.css
+++ b/themes/baggy/css/main.css
@@ -360,11 +360,15 @@ footer a {
360 position: relative; 360 position: relative;
361 overflow: hidden; 361 overflow: hidden;
362 padding: 1.5em 1.5em 3em 1.5em; 362 padding: 1.5em 1.5em 3em 1.5em;
363 -webkit-transition: all 0.5s ease; 363
364 -moz-transition: all 0.5s ease; 364 /* Removing CSS transitions because they make the switch from list view to
365 -ms-transition: all 0.5s ease; 365 * table view jerky
366 -o-transition: all 0.5s ease; 366 */
367 transition: all 0.5s ease; 367 /* -webkit-transition: all 0.5s ease; */
368 /* -moz-transition: all 0.5s ease; */
369 /* -ms-transition: all 0.5s ease; */
370 /* -o-transition: all 0.5s ease; */
371 /* transition: all 0.5s ease; */
368} 372}
369 373
370.entrie:before { 374.entrie:before {
diff --git a/themes/baggy/home.twig b/themes/baggy/home.twig
index a870fc21..03de6b9b 100755
--- a/themes/baggy/home.twig
+++ b/themes/baggy/home.twig
@@ -38,7 +38,7 @@
38 {% endblock %} 38 {% endblock %}
39 <div id="list-entries" class="list-entries"> 39 <div id="list-entries" class="list-entries">
40 {% for entry in entries %} 40 {% for entry in entries %}
41 <div id="entry-{{ entry.id|e }}" class="entrie"{% if listmode %} style="width:100%; margin-left:0;"{% endif %}> 41 <div id="entry-{{ entry.id|e }}" class="entrie">
42 <h2><a href="index.php?view=view&amp;id={{ entry.id|e }}">{{ entry.title|raw }}</a></h2> 42 <h2><a href="index.php?view=view&amp;id={{ entry.id|e }}">{{ entry.title|raw }}</a></h2>
43 {% if entry.content| getReadingTime > 0 %} 43 {% if entry.content| getReadingTime > 0 %}
44 <div class="estimatedTime"><a target="_blank" title="{% trans "estimated reading time:" %} {{ entry.content| getReadingTime }} min" class="tool reading-time"><span>{% trans "estimated reading time :" %} {{ entry.content| getReadingTime }} min</span></div> 44 <div class="estimatedTime"><a target="_blank" title="{% trans "estimated reading time:" %} {{ entry.content| getReadingTime }} min" class="tool reading-time"><span>{% trans "estimated reading time :" %} {{ entry.content| getReadingTime }} min</span></div>