From c8b4ef7fed01c4d94ac9d2325bd2c6e97f831bad Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Wed, 19 Nov 2014 16:27:56 +0100
Subject: implementing carrot into wallabag

---
 themes/default/css/style-default.css  |   4 ++++
 themes/default/img/default/carrot.png | Bin 0 -> 718 bytes
 themes/default/view.twig              |   2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 themes/default/img/default/carrot.png

(limited to 'themes/default')

diff --git a/themes/default/css/style-default.css b/themes/default/css/style-default.css
index 889a9f5c..d00647ab 100755
--- a/themes/default/css/style-default.css
+++ b/themes/default/css/style-default.css
@@ -38,6 +38,10 @@ a.flattr span {
     background-image: url('../img/default/flattr.png');
 }
 
+a.carrot span {
+    background-image: url('../img/default/carrot.png')
+}
+
 a.email span {
     background-image: url('../img/default/envelop.png');
 }
diff --git a/themes/default/img/default/carrot.png b/themes/default/img/default/carrot.png
new file mode 100644
index 00000000..5fc17273
Binary files /dev/null and b/themes/default/img/default/carrot.png differ
diff --git a/themes/default/view.twig b/themes/default/view.twig
index dbbbde3c..b3f6d50e 100755
--- a/themes/default/view.twig
+++ b/themes/default/view.twig
@@ -15,6 +15,7 @@
                 {% if constant('SHARE_MAIL') == 1 %}<li><a href="mailto:?subject={{ entry.title|url_encode }}&amp;body={{ entry.url|url_encode }}%20via%20@wallabagapp" class="tool email" 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('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 %}
                 <li><a href="./?epub&amp;method=id&amp;value={{ entry.id|e }}" title="Generate epub file">EPUB</a></li>
                 <li><a href="mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag&amp;body={{ entry.url|url_encode }}" title="{% trans "Does this article appear wrong?" %}" class="tool bad-display"><span>{% trans "Does this article appear wrong?" %}</span></a></li>
@@ -118,4 +119,3 @@
         });
         </script>
 {% endblock %}
-
-- 
cgit v1.2.3


From fc01f94387c3c41ca0d7c6d4ad8ed1d6678abfdd Mon Sep 17 00:00:00 2001
From: Jay Sitter <jsitter@gmail.com>
Date: Fri, 21 Nov 2014 15:30:59 -0500
Subject: Globalizing and creating two variants of Carrot.org icon; tidying up
 some CSS

---
 themes/default/css/style-default.css  |   5 +++--
 themes/default/img/default/carrot.png | Bin 718 -> 0 bytes
 2 files changed, 3 insertions(+), 2 deletions(-)
 delete mode 100644 themes/default/img/default/carrot.png

(limited to 'themes/default')

diff --git a/themes/default/css/style-default.css b/themes/default/css/style-default.css
index d00647ab..6ff2aca6 100755
--- a/themes/default/css/style-default.css
+++ b/themes/default/css/style-default.css
@@ -39,7 +39,8 @@ a.flattr span {
 }
 
 a.carrot span {
-    background-image: url('../img/default/carrot.png')
+    background-image: url('../../_global/img/icons/carrot-icon--black.png');
+    background-size: 16px 16px;
 }
 
 a.email span {
@@ -60,4 +61,4 @@ a.bad-display span {
 
 a.print span {
 		background-image: url('../img/default/print.png');
-}
\ No newline at end of file
+}
diff --git a/themes/default/img/default/carrot.png b/themes/default/img/default/carrot.png
deleted file mode 100644
index 5fc17273..00000000
Binary files a/themes/default/img/default/carrot.png and /dev/null differ
-- 
cgit v1.2.3