Globalizing and creating two variants of Carrot.org icon; tidying up some CSS

diff --git a/themes/_global/img/icons/carrot-icon--black.png b/themes/_global/img/icons/carrot-icon--black.png
new file mode 100644 (file)
index 0000000..6da7925
Binary files /dev/null and b/themes/_global/img/icons/carrot-icon--black.png differ

diff --git a/themes/_global/img/icons/carrot-icon--white.png b/themes/_global/img/icons/carrot-icon--white.png
new file mode 100644 (file)
index 0000000..a70044b
Binary files /dev/null and b/themes/_global/img/icons/carrot-icon--white.png differ

diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css
index 76d92003e7a346a6a98d9276252c2a6a9ed81351..568eb116a1f8820a20ac31cb1b19c7dfca36849b 100755 (executable)
--- a/themes/baggy/css/main.css
+++ b/themes/baggy/css/main.css
@@ -15,11 +15,11 @@ html {
 }
 
 body {
-  background: #EEE;
+  background-color: #EEE;
 }
 
 .login {
-  background: #333;
+  background-color: #333;
 }
 
 .login #main {
@@ -28,7 +28,7 @@ body {
 }
 
 .login form {
-  background: #FFF;
+  background-color: #FFF;
   padding: 1.5em;
   box-shadow: 0 1px 8px rgba(0,0,0,0.9);
   width: 20em;
@@ -51,7 +51,7 @@ body {
 
 ::selection { 
   color: #FFF;  
-  background: #000;
+  background-color: #000;
 } 
 
 .desktopHide {
@@ -129,7 +129,7 @@ form .row {
 
 form button, input[type="submit"] {
   cursor:pointer;
-  background: #000;
+  background-color: #000;
   color: #FFF;
   border:0;
   padding: 0.5em 1em;
@@ -138,7 +138,7 @@ form button, input[type="submit"] {
 }
 
   form button:hover, form button:focus, input[type="submit"]:hover, input[type="submit"]:focus {
-    background: #FFF;
+    background-color: #FFF;
     color: #000;
     -webkit-transition: all 0.5s ease;
      -moz-transition: all 0.5s ease;
@@ -155,7 +155,7 @@ h2:after {
   content: "";
   height: 4px;
   width: 70px;
-  background: #000;
+  background-color: #000;
   display: block;
 }
 
@@ -176,7 +176,7 @@ h2:after {
   width: 10em;
   left: 0;
   text-align: right;
-  background: #333;
+  background-color: #333;
   padding-top: 9.5em;
   height: 100%;
   box-shadow:inset -4px 0 20px rgba(0,0,0,0.6);
@@ -208,7 +208,7 @@ h2:after {
   }
 
   #links > li > a:hover, #links > li > a:focus {
-    background: #999;
+    background-color: #999;
     color: #000;
   }
 
@@ -344,7 +344,7 @@ footer a {
 }
 
 .entrie {
-  background: #FFF;
+  background-color: #FFF;
   letter-spacing:normal;
   box-shadow: 0 3px 7px rgba(0,0,0,0.3);
   display: inline-block;
@@ -391,7 +391,7 @@ footer a {
   width: 100%;
   bottom: 0;
   left: 0;
-  background: #000;
+  background-color: #000;
   -webkit-transition: all 0.5s ease;
      -moz-transition: all 0.5s ease;
       -ms-transition: all 0.5s ease;
@@ -557,7 +557,7 @@ footer a {
 }
 
        .popup-form form {
-               background: #FFF;
+               background-color: #FFF;
                position: absolute;
                top: 0;
                left: 0;
@@ -574,7 +574,7 @@ footer a {
 
 .closeMessage,
 .close-button {
-  background: #000;
+  background-color: #000;
   color: #FFF;
        font-size: 1.2em;
        line-height: 1.6;
@@ -587,7 +587,7 @@ footer a {
        .closeMessage:focus,
        .close-button:hover,
        .close-button:focus {
-               background: #999;
+               background-color: #999;
                color: #000;
        }
 
@@ -657,17 +657,18 @@ a.add-to-wallabag-link-after:after {
 @font-face {
   font-family: 'icomoon';
   src:url('../fonts/icomoon.eot?-s0mcsx');
-  src:url('../fonts/icomoon.eot?#iefix-s0mcsx') format('embedded-opentype'),
-    url('../fonts/icomoon.woff?-s0mcsx') format('woff'),
-    url('../fonts/icomoon.ttf?-s0mcsx') format('truetype'),
-    url('../fonts/icomoon.svg?-s0mcsx#icomoon') format('svg');
+  src:url('../fonts/icomoon.eot?#iefix-s0mcsx')   format('embedded-opentype'),
+      url('../fonts/icomoon.woff?-s0mcsx')        format('woff'),
+      url('../fonts/icomoon.ttf?-s0mcsx')         format('truetype'),
+      url('../fonts/icomoon.svg?-s0mcsx#icomoon') format('svg');
   font-weight: normal;
   font-style: normal;
 }
 
-.icon span {
-  position: absolute;
-  top: -9999px;
+.icon span,
+.icon-image span {
+       display: inline-block;
+       text-indent: -9999px;
 }
 
 [class^="icon-"]:before, [class*=" icon-"]:before {
@@ -736,6 +737,23 @@ a.add-to-wallabag-link-after:after {
   content: "\e80d";
 }
 
+
+/* .icon-image class, for image-based icons
+        ========================================================================== */
+
+.icon-image {
+       background-size: 16px 16px;
+       background-repeat: no-repeat;
+       background-position: center;
+       padding-right: 1em !important;
+       padding-left: 1em !important;
+}
+
+/* Carrot (http://carrot.org) */
+.icon-image--carrot {
+       background-image: url('../../_global/img/icons/carrot-icon--white.png');
+}
+
 /* ==========================================================================
    Icon selected
    ========================================================================== */
@@ -805,7 +823,7 @@ a.add-to-wallabag-link-after:after {
 
 blockquote {
   border:1px solid #999;
-  background: #FFF;
+  background-color: #FFF;
   padding: 1em;
   margin: 0;
 }
@@ -838,14 +856,14 @@ blockquote {
 }
 
 #article_toolbar a {
-  background: #000;
+  background-color: #000;
   padding: 0.3em 0.5em 0.2em;
   color: #FFF;
   text-decoration: none;
 }
   
   #article_toolbar a:hover, #article_toolbar a:focus {
-    background: #999;
+    background-color: #999;
   }
 
 .shaarli:before {
@@ -868,7 +886,7 @@ blockquote {
 }
 
 .icon-rss {
-  background: #000;
+  background-color: #000;
   color: #FFF;
   padding: 0.2em 0.5em;
 }
@@ -883,7 +901,7 @@ blockquote {
 }
 
 .list-tags .icon-rss:hover, .list-tags .icon-rss:focus {
-  background: #FFF;
+  background-color: #FFF;
   color: #000;
   text-decoration: none;
 }
@@ -944,7 +962,7 @@ pre code {
     margin-left: 0;
   }
   body > header {
-    background: #333;
+    background-color: #333;
     position: fixed;
     top: 0;
     width: 100%;
@@ -990,11 +1008,11 @@ pre code {
     width: 2.5em;
     height: 2.5em;
     cursor: pointer;
-    background: #999;
+    background-color: #999;
     font-size: 1.2em;
   }
     .desktopHide:hover, .desktopHide:focus {
-      background: #FFF;
+      background-color: #FFF;
     }
   #links {
     display: none;

diff --git a/themes/baggy/view.twig b/themes/baggy/view.twig
index 9182ee75dba2d02c6d41daf90ce29dc73df8abcd..ee96403134d259ec14954b7acef15e8ec305e44e 100755 (executable)
--- a/themes/baggy/view.twig
+++ b/themes/baggy/view.twig
@@ -16,7 +16,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 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('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 %}
-                {% if constant('CARROT') == 1 %}<li><a href="https://secure.carrot.org/GiveAndGetBack.do?url={{ entry.url|url_encode }}&title={{ entry.title|url_encode }}" target="_blank" title="{% trans "carrot" %}"><span>Carrot</span></a></li>{% 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-image icon-image--carrot" target="_blank" title="{% trans "carrot" %}"><span>Carrot</span></a></li>{% endif %}
                 {% if constant('SHOW_PRINTLINK') == 1 %}<li><a title="{% trans "Print" %}" class="tool icon icon-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 icon icon-delete"><span>{% trans "Does this article appear wrong?" %}</span></a></li>
@@ -96,4 +96,4 @@
             });
         });
         </script>
-{% endblock %}
\ No newline at end of file
+{% endblock %}

diff --git a/themes/default/css/style-default.css b/themes/default/css/style-default.css
index d00647abc77e62ab52f9a4de5e69e712d57f578e..6ff2aca67138b7f211d74770726ce786a2b1bb82 100755 (executable)
--- 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 (file)
index 5fc1727..0000000
Binary files a/themes/default/img/default/carrot.png and /dev/null differ