git fix #1159 and bring icons to all themes (dirty icons)

diff --git a/themes/dark/css/style-dark.css b/themes/dark/css/style-dark.css
index 41782c485f6538e16bb37183f555cb70f2768e16..d0491bcc60cdf72ac3bba7ed583b700008367ae8 100644 (file)
--- a/themes/dark/css/style-dark.css
+++ b/themes/dark/css/style-dark.css
@@ -65,6 +65,27 @@ a.bad-display span {
     background-image: url('../img/dark/bad-display.png');
 }
 
+a.reload span {
+    background-image: url('../../default/img/default/reload.png');
+}
+a.print span {
+        background-image: url('../../default/img/default/print.png');
+}
+a.carrot span {
+    background-image: url('../../_global/img/icons/carrot-icon--black.png');
+    background-size: 16px 16px;
+}
+
+a.evernote span {
+    background-image: url('../../_global/img/icons/evernote-icon--black.svg');
+    background-size: 16px 16px;
+}
+
+a.diaspora span {
+    background-image: url('../../_global/img/icons/diaspora-icon--black.png');
+    background-size: 16px 16px;
+}
+
 .pagination a {
     color: #aaa;
 }

diff --git a/themes/default/view.twig b/themes/default/view.twig
index 57d2596516262f0d1248ba8ebd135dd97b652cb2..0010d18fb8da437899af6552f5ca46779fa5bb8f 100755 (executable)
--- a/themes/default/view.twig
+++ b/themes/default/view.twig
@@ -21,7 +21,7 @@
                 {% if constant('FLATTR') == 1 %}{% if flattr.status == constant('FLATTRABLE') %}<li><a href="http://flattr.com/submit/auto?url={{ entry.url }}" class="tool flattr" target="_blank" title="{% trans "flattr" %}"><span>{% trans "flattr" %}</span></a></li>{% elseif flattr.status == constant('FLATTRED') %}<li><a href="{{ flattr.flattrItemURL }}" class="tool flattr" target="_blank" title="{% trans "flattr" %}"><span>{% trans "flattr" %}</span>{{ flattr.numFlattrs }}</a></li>{% endif %}{% endif %}
                 {% if constant('CARROT') == 1 %}<li><a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" class="tool carrot icon" target="_blank" title="{% trans "carrot" %}"><span>{% trans "carrot" %}</span></a></li>{% endif %}
                 {% if constant('SHOW_PRINTLINK') == 1 %}<li><a title="{% trans "Print" %}" class="tool print" href="javascript: window.print();"><span>{% trans "Print" %}</span></a></li>{% endif %}
-                {% if constant('RELOAD_ARTICLE') == 1 %}<li><a class="tool reload" href="./?action=reload_article&amp;id={{ entry.id|e }}" title="{% trans "Reload article" %}"><span>{% trans "Reload article" %}</span></a></li>{% endif %}}
+                {% if constant('RELOAD_ARTICLE') == 1 %}<li><a class="tool reload" href="./?action=reload_article&amp;id={{ entry.id|e }}" title="{% trans "Reload article" %}"><span>{% trans "Reload article" %}</span></a></li>{% endif %}
                 {% if constant('EPUB') == 1 %}<li><a href="./?epub&amp;method=id&amp;value={{ entry.id|e }}" title="Generate ePub file">EPUB</a></li>{% endif %}
                 {% if constant('MOBI') == 1 %}<li><a href="./?mobi&amp;method=id&amp;value={{ entry.id|e }}" title="Generate Mobi file">MOBI</a></li>{% endif %}
                 {% if constant('PDF') == 1 %}<li><a href="./?pdf&amp;method=id&amp;value={{ entry.id|e }}" title="Generate PDF file">PDF</a></li>{% endif %}

diff --git a/themes/dmagenta/css/style-dmagenta.css b/themes/dmagenta/css/style-dmagenta.css
index 4dc592d21d2e5a2a62b0082091a66b30dcc2dde4..4b31ec9a1c35c8f60a8e5b743268ac07742c031b 100644 (file)
--- a/themes/dmagenta/css/style-dmagenta.css
+++ b/themes/dmagenta/css/style-dmagenta.css
@@ -65,6 +65,27 @@ a.bad-display span {
     background-image: url('../img/dmagenta/bad-display.png');
 }
 
+a.reload span {
+    background-image: url('../../default/img/default/reload.png');
+}
+a.print span {
+        background-image: url('../../default/img/default/print.png');
+}
+a.carrot span {
+    background-image: url('../../_global/img/icons/carrot-icon--black.png');
+    background-size: 16px 16px;
+}
+
+a.evernote span {
+    background-image: url('../../_global/img/icons/evernote-icon--black.svg');
+    background-size: 16px 16px;
+}
+
+a.diaspora span {
+    background-image: url('../../_global/img/icons/diaspora-icon--black.png');
+    background-size: 16px 16px;
+}
+
 .pagination a {
     color: #aaa;
 }

diff --git a/themes/solarized-dark/css/style-solarized-dark.css b/themes/solarized-dark/css/style-solarized-dark.css
index 77a97d3828726f7bda48ac5fc21e1b125a85562b..e9f25821f2f979c65e48b38983179744d785d174 100644 (file)
--- a/themes/solarized-dark/css/style-solarized-dark.css
+++ b/themes/solarized-dark/css/style-solarized-dark.css
@@ -218,6 +218,26 @@ a.link span {
 a.bad-display span {
     background-image: url('../img/solarized-dark/bad-display.png');
 }
+a.reload span {
+    background-image: url('../../default/img/default/reload.png');
+}
+a.print span {
+        background-image: url('../../default/img/default/print.png');
+}
+a.carrot span {
+    background-image: url('../../_global/img/icons/carrot-icon--black.png');
+    background-size: 16px 16px;
+}
+
+a.evernote span {
+    background-image: url('../../_global/img/icons/evernote-icon--black.svg');
+    background-size: 16px 16px;
+}
+
+a.diaspora span {
+    background-image: url('../../_global/img/icons/diaspora-icon--black.png');
+    background-size: 16px 16px;
+}
 
 .arrow-down {
     width: 0px;

diff --git a/themes/solarized/css/style-solarized.css b/themes/solarized/css/style-solarized.css
index cf16338f4d4d08a48e02f1e9edbba8c51654874f..b8e892386ce42818db859a1f0b7c7d2d47063340 100644 (file)
--- a/themes/solarized/css/style-solarized.css
+++ b/themes/solarized/css/style-solarized.css
@@ -219,6 +219,27 @@ a.bad-display span {
     background-image: url('../img/solarized/bad-display.png');
 }
 
+a.reload span {
+    background-image: url('../../default/img/default/reload.png');
+}
+a.print span {
+        background-image: url('../../default/img/default/print.png');
+}
+a.carrot span {
+    background-image: url('../../_global/img/icons/carrot-icon--black.png');
+    background-size: 16px 16px;
+}
+
+a.evernote span {
+    background-image: url('../../_global/img/icons/evernote-icon--black.svg');
+    background-size: 16px 16px;
+}
+
+a.diaspora span {
+    background-image: url('../../_global/img/icons/diaspora-icon--black.png');
+    background-size: 16px 16px;
+}
+
 .arrow-down {
     width: 0px;
     height: 0px;