moparisthebest/wallabag
1
0
Fork 0
mirror of https://github.com/moparisthebest/wallabag synced 2024-11-30 04:42:19 -05:00
Code Issues Releases Wiki Activity

Merge pull request #897 from jsit/displaymode

Browse Source 
Fixing display mode switching in Baggy theme (issue #896)
This commit is contained in:
Nicolas Lœuillet 2014-10-30 21:43:15 +01:00
commit 052bdfc17e
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
themes/baggy/css/main.css
View File

@ -360,11 +360,15 @@ footer a {
position: relative; position: relative;
overflow: hidden; overflow: hidden;
padding: 1.5em 1.5em 3em 1.5em; padding: 1.5em 1.5em 3em 1.5em;
-webkit-transition: all 0.5s ease;
-moz-transition: all 0.5s ease; /* Removing CSS transitions because they make the switch from list view to
-ms-transition: all 0.5s ease; * table view jerky
-o-transition: all 0.5s ease; */
transition: all 0.5s ease; /* -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 { .entrie:before {

2
themes/baggy/home.twig
View File

@ -38,7 +38,7 @@
{% endblock %} {% endblock %}
<div id="list-entries" class="list-entries"> <div id="list-entries" class="list-entries">
{% for entry in 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> <h2><a href="index.php?view=view&amp;id={{ entry.id|e }}">{{ entry.title|raw }}</a></h2>
{% if entry.content| getReadingTime > 0 %} {% 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> <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>