aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas.loeuillet@gmail.com>2013-09-09 05:01:58 -0700
committerNicolas LÅ“uillet <nicolas.loeuillet@gmail.com>2013-09-09 05:01:58 -0700
commit2230a38cd678259947ccaffecee579604822d1cf (patch)
tree7ee8787fce39dcec7f3699068c9ac51bbdcb1c30
parentef6051b95e2e289bb32107b75594406db2801653 (diff)
parent2edde7fe337a8502ee5d37ae0b76f76295864b7c (diff)
downloadwallabag-2230a38cd678259947ccaffecee579604822d1cf.tar.gz
wallabag-2230a38cd678259947ccaffecee579604822d1cf.tar.zst
wallabag-2230a38cd678259947ccaffecee579604822d1cf.zip
Merge pull request #205 from NumEricR/less-is-more
Less is more :-)
-rw-r--r--tpl/_top.twig6
-rw-r--r--tpl/css/style.css7
-rw-r--r--tpl/home.twig2
3 files changed, 8 insertions, 7 deletions
diff --git a/tpl/_top.twig b/tpl/_top.twig
index ae01cc3f..dc20081e 100644
--- a/tpl/_top.twig
+++ b/tpl/_top.twig
@@ -1,3 +1,7 @@
1 <header class="w600p center mbm"> 1 <header class="w600p center mbm">
2 <h1><a href="./" title="{% trans "back to home" %}" ><img src="./tpl/img/logo.png" alt="logo poche" /></a></h1> 2 <h1>
3 {% if view == 'home' %}{% block logo %}<img src="./tpl/img/logo.png" alt="logo poche" />{% endblock %}
4 {% else %}<a href="./" title="{% trans "back to home" %}" >{{ block('logo') }}</a>
5 {% endif %}
6 </h1>
3 </header> \ No newline at end of file 7 </header> \ No newline at end of file
diff --git a/tpl/css/style.css b/tpl/css/style.css
index f07072a7..5f7fd77d 100644
--- a/tpl/css/style.css
+++ b/tpl/css/style.css
@@ -236,12 +236,7 @@ a, a:hover, a:visited {
236 margin: 2px; 236 margin: 2px;
237} 237}
238.pagination .disabled { 238.pagination .disabled {
239 border: 1px solid #eee; 239 display: none;
240 color: #ddd;
241 margin: 2px;
242 padding: 4px 8px;
243 font-size: 11px;
244 font-weight: bold;
245} 240}
246 241
247#bookmarklet { 242#bookmarklet {
diff --git a/tpl/home.twig b/tpl/home.twig
index db4e0888..771c36c5 100644
--- a/tpl/home.twig
+++ b/tpl/home.twig
@@ -12,10 +12,12 @@
12{% include '_menu.twig' %} 12{% include '_menu.twig' %}
13{% endblock %} 13{% endblock %}
14{% block precontent %} 14{% block precontent %}
15 {% if entries|length > 1 %}
15 <ul id="sort"> 16 <ul id="sort">
16 <li><a href="./?sort=ia&amp;view={{ view }}"><img src="./tpl/img/{{ constant('THEME') }}/top.png" alt="{% trans "by date asc" %}" title="{% trans "by date asc" %}" /></a> {% trans "by date" %} <a href="./?sort=id&amp;view={{ view }}"><img src="./tpl/img/{{ constant('THEME') }}/down.png" alt="{% trans "by date desc" %}" title="{% trans "by date desc" %}" /></a></li> 17 <li><a href="./?sort=ia&amp;view={{ view }}"><img src="./tpl/img/{{ constant('THEME') }}/top.png" alt="{% trans "by date asc" %}" title="{% trans "by date asc" %}" /></a> {% trans "by date" %} <a href="./?sort=id&amp;view={{ view }}"><img src="./tpl/img/{{ constant('THEME') }}/down.png" alt="{% trans "by date desc" %}" title="{% trans "by date desc" %}" /></a></li>
17 <li><a href="./?sort=ta&amp;view={{ view }}"><img src="./tpl/img/{{ constant('THEME') }}/top.png" alt="{% trans "by title asc" %}" title="{% trans "by title asc" %}" /></a> {% trans "by title" %} <a href="./?sort=td&amp;view={{ view }}"><img src="./tpl/img/{{ constant('THEME') }}/down.png" alt="{% trans "by title desc" %}" title="{% trans "by title desc" %}" /></a></li> 18 <li><a href="./?sort=ta&amp;view={{ view }}"><img src="./tpl/img/{{ constant('THEME') }}/top.png" alt="{% trans "by title asc" %}" title="{% trans "by title asc" %}" /></a> {% trans "by title" %} <a href="./?sort=td&amp;view={{ view }}"><img src="./tpl/img/{{ constant('THEME') }}/down.png" alt="{% trans "by title desc" %}" title="{% trans "by title desc" %}" /></a></li>
18 </ul> 19 </ul>
20 {% endif %}
19{% endblock %} 21{% endblock %}
20{% block content %} 22{% block content %}
21 {% if entries is empty %} 23 {% if entries is empty %}