Merge pull request #897 from jsit/displaymode

Fixing display mode switching in Baggy theme (issue #896)

diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css
index 6b5a1f4c49df38b30f861ed6c30d4a77ffd512fd..f01489098a6a6ecef3d05b34ae5c20260075c097 100755 (executable)
--- a/themes/baggy/css/main.css
+++ b/themes/baggy/css/main.css
@@ -360,11 +360,15 @@ footer a {
   position: relative;
   overflow: hidden;
   padding: 1.5em 1.5em 3em 1.5em;
-  -webkit-transition: all 0.5s ease;
-     -moz-transition: all 0.5s ease;
-      -ms-transition: all 0.5s ease;
-       -o-transition: all 0.5s ease;
-          transition: all 0.5s ease;
+
+       /* Removing CSS transitions because they make the switch from list view to
+        * table view jerky
+        */
+  /* -webkit-transition: all 0.5s ease; */
+  /*    -moz-transition: all 0.5s ease; */
+  /*     -ms-transition: all 0.5s ease; */
+  /*      -o-transition: all 0.5s ease; */
+  /*         transition: all 0.5s ease; */
 }
 
 .entrie:before {

diff --git a/themes/baggy/home.twig b/themes/baggy/home.twig
index a870fc21cc010e1951b3a4320457edf98cfae0fb..03de6b9b74fddf65a43da762d894c7fdddcdb0da 100755 (executable)
--- a/themes/baggy/home.twig
+++ b/themes/baggy/home.twig
@@ -38,7 +38,7 @@
                 {% endblock %}
             <div id="list-entries" class="list-entries">
                     {% for entry in entries %}
-                <div id="entry-{{ entry.id|e }}" class="entrie"{% if listmode %} style="width:100%; margin-left:0;"{% endif %}>
+                <div id="entry-{{ entry.id|e }}" class="entrie">
                     <h2><a href="index.php?view=view&amp;id={{ entry.id|e }}">{{ entry.title|raw }}</a></h2>
                     {% if entry.content| getReadingTime > 0 %}
                         <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>