redo the whole lot of commits I've deleted while trying Gitlab/Framasoft mirroring

4 files changed, 7 insertions, 6 deletions

diff --git a/themes/default/img/default/shaarli.png b/themes/_global/img/icons/shaarli.png
index 1eb30f60..1eb30f60 100644
--- a/themes/default/img/default/shaarli.png
+++ b/themes/_global/img/icons/shaarli.png
diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css
index 91c1ab9f..e3d98586 100755
--- a/themes/baggy/css/main.css
+++ b/themes/baggy/css/main.css
@@ -775,6 +775,10 @@ a.add-to-wallabag-link-after:after {
         background-image: url('../../_global/img/icons/carrot-icon--white.png');
 }
 
+.icon-image--shaarli {
+  background-image: url('../../_global/img/icons/shaarli.png');
+}
+
 /* Diaspora */
 .icon-image--diaspora {
         background-image: url('../../_global/img/icons/diaspora-icon--black.png');
@@ -906,10 +910,6 @@ blockquote {
     background-color: #999;
   }
 
-.shaarli:before {
-  content: "*";
-}
-
 .return {
   text-decoration: none;
   margin-top: 1em;
diff --git a/themes/baggy/view.twig b/themes/baggy/view.twig
index a57d1771..ebc30b69 100755
--- a/themes/baggy/view.twig
+++ b/themes/baggy/view.twig
@@ -17,7 +17,7 @@
                 <li><a title="{% trans "Delete" %}" class="tool delete icon icon-trash" href="./?action=delete&amp;id={{ entry.id|e }}"><span>{% trans "Delete" %}</span></a></li>
                 {% if constant('SHARE_TWITTER') == 1 %}<li><a href="https://twitter.com/home?status={{entry.title|url_encode}}%20{{ entry.url|url_encode }}%20via%20@wallabagapp" target="_blank" class="tool twitter icon icon-twitter" title="{% trans "Tweet" %}"><span>{% trans "Tweet" %}</span></a></li>{% endif %}
                 {% if constant('SHARE_MAIL') == 1 %}<li><a href="mailto:?subject={{ entry.title }}&amp;body={{ content|striptags|slice(0, 700) }}%2E%2E%2E%0A%0A{% trans "Read the rest at" %} {{ entry.url|url_encode }}%20via%20@wallabagapp" class="tool email icon icon-mail" title="{% trans "Email" %}"><span>{% trans "Email" %}</span></a></li>{% endif %}
-                {% if constant('SHARE_SHAARLI') == 1 %}<li><a href="{{ constant('SHAARLI_URL') }}/index.php?post={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}" target="_blank" class="tool shaarli" title="{% trans "shaarli" %}"><span>{% trans "shaarli" %}</span></a></li>{% endif %}
+                {% if constant('SHARE_SHAARLI') == 1 %}<li><a href="{{ constant('SHAARLI_URL') }}/index.php?post={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}" target="_blank" class="tool shaarli icon-image icon-image--shaarli" title="{% trans "shaarli" %}"><span>{% trans "shaarli" %}</span></a></li>{% endif %}
                 {% if constant('SHARE_EVERNOTE') == 1 %}<li><a href="https://www.evernote.com/clip.action?url={{ entry.url|url_encode }}&amp;title={{ entry.title|url_encode }}" target="_blank" class="tool evernote icon icon-evernote" title="{% trans "evernote" %}"><span>{% trans "evernote" %}</span></a></li>{% endif %}
                 {% if constant('SHARE_DIASPORA') == 1 %}<li><a href="{{ constant('DIASPORA_URL') }}/bookmarklet?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}&notes=&v=1&noui=1&jump=doclose" target="_blank" class="tool diaspora icon-image icon-image--diaspora" title="{% trans "diaspora" %}"><span>{% trans "diaspora" %}</span></a></li>{% endif %}
                 {% if constant('FLATTR') == 1 %}{% if flattr.status == constant('FLATTRABLE') %}<li><a href="http://flattr.com/submit/auto?url={{ entry.url }}" class="tool flattr icon icon-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 icon icon-flattr" target="_blank" title="{% trans "flattr" %}"><span>{% trans "flattr" %}</span> ({{ flattr.numFlattrs }})</a></li>{% endif %}{% endif %}
diff --git a/themes/default/css/style-default.css b/themes/default/css/style-default.css
index 8b18320d..7530efbb 100755
--- a/themes/default/css/style-default.css
+++ b/themes/default/css/style-default.css
@@ -43,7 +43,8 @@ a.twitter span {
 }
 
 a.shaarli span {
-    background-image: url('../img/default/shaarli.png');
+    background-image: url('../../_global/img/icons/shaarli.png');
+    background-size: 16px 16px;
 }
 
 a.flattr span {