diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index 1623547..27d6f4a 100755 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -812,4 +812,4 @@ class Poche } -} +} \ No newline at end of file diff --git a/inc/poche/config.inc.default.php b/inc/poche/config.inc.default.php index 304b392..0f88f33 100755 --- a/inc/poche/config.inc.default.php +++ b/inc/poche/config.inc.default.php @@ -49,6 +49,7 @@ @define ('NOT_FLATTRABLE', '0'); @define ('FLATTRABLE', '1'); @define ('FLATTRED', '2'); +@define ('CARROT', FALSE); // display or not print link in article view @define ('SHOW_PRINTLINK', '1'); // display or not percent of read in article view. Affects only default theme. diff --git a/themes/_global/img/icons/carrot-icon--black.png b/themes/_global/img/icons/carrot-icon--black.png new file mode 100644 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 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 028c8b4..2aad3aa 100755 --- 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,15 +657,16 @@ 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 { +.icon span, +.icon-image span { position: absolute; top: -9999px; } @@ -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; @@ -1046,4 +1064,3 @@ pre code { width: 100%; } } - diff --git a/themes/baggy/view.twig b/themes/baggy/view.twig index bad8ced..ee96403 100755 --- a/themes/baggy/view.twig +++ b/themes/baggy/view.twig @@ -16,6 +16,7 @@ {% if constant('SHARE_MAIL') == 1 %}
  • {% trans "Email" %}
  • {% endif %} {% if constant('SHARE_SHAARLI') == 1 %}
  • {% trans "shaarli" %}
  • {% endif %} {% if constant('FLATTR') == 1 %}{% if flattr.status == constant('FLATTRABLE') %}
  • {% trans "flattr" %}
  • {% elseif flattr.status == constant('FLATTRED') %}
  • {% trans "flattr" %} ({{ flattr.numFlattrs }})
  • {% endif %}{% endif %} + {% if constant('CARROT') == 1 %}
  • Carrot
  • {% endif %} {% if constant('SHOW_PRINTLINK') == 1 %}
  • {% trans "Print" %}
  • {% endif %}
  • EPUB
  • {% trans "Does this article appear wrong?" %}
  • @@ -95,4 +96,4 @@ }); }); -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/themes/courgette/_view.twig b/themes/courgette/_view.twig index bae278f..5234f76 100755 --- a/themes/courgette/_view.twig +++ b/themes/courgette/_view.twig @@ -12,6 +12,7 @@ {% if constant('SHARE_MAIL') == 1 %}
  • {% trans "email" %}
  • {% endif %} {% if constant('SHARE_SHAARLI') == 1 %}
  • {% trans "shaarli" %}
  • {% endif %} {% if constant('FLATTR') == 1 %}{% if flattr.status == constant('FLATTRABLE') %}
  • {% trans "flattr" %}
  • {% elseif flattr.status == constant('FLATTRED') %}
  • {% trans "flattr" %}{{ flattr.numFlattrs }}
  • {% endif %}{% endif %} + {% if constant('CARROT') == 1 %}
  • {% trans "carrot" %}
  • {% endif %}
  • EPUB
  • {% trans "this article appears wrong?" %}
  • diff --git a/themes/courgette/css/style-default.css b/themes/courgette/css/style-default.css index 3377a75..297f86a 100755 --- a/themes/courgette/css/style-default.css +++ b/themes/courgette/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'); } @@ -56,4 +60,4 @@ a.bad-display span { a.reading-time span { background-image: url('../img/default/clock.png'); -} +} \ No newline at end of file diff --git a/themes/courgette/img/default/carrot.png b/themes/courgette/img/default/carrot.png new file mode 100644 index 0000000..5fc1727 Binary files /dev/null and b/themes/courgette/img/default/carrot.png differ diff --git a/themes/default/css/style-default.css b/themes/default/css/style-default.css index 889a9f5..6ff2aca 100755 --- a/themes/default/css/style-default.css +++ b/themes/default/css/style-default.css @@ -38,6 +38,11 @@ a.flattr span { background-image: url('../img/default/flattr.png'); } +a.carrot span { + background-image: url('../../_global/img/icons/carrot-icon--black.png'); + background-size: 16px 16px; +} + a.email span { background-image: url('../img/default/envelop.png'); } @@ -56,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/view.twig b/themes/default/view.twig index a6aaba7..b3507ce 100755 --- a/themes/default/view.twig +++ b/themes/default/view.twig @@ -15,6 +15,7 @@ {% if constant('SHARE_MAIL') == 1 %}
  • {% trans "Email" %}
  • {% endif %} {% if constant('SHARE_SHAARLI') == 1 %}
  • {% trans "shaarli" %}
  • {% endif %} {% if constant('FLATTR') == 1 %}{% if flattr.status == constant('FLATTRABLE') %}
  • {% trans "flattr" %}
  • {% elseif flattr.status == constant('FLATTRED') %}
  • {% trans "flattr" %}{{ flattr.numFlattrs }}
  • {% endif %}{% endif %} + {% if constant('CARROT') == 1 %}
  • {% trans "carrot" %}
  • {% endif %} {% if constant('SHOW_PRINTLINK') == 1 %}
  • {% trans "Print" %}
  • {% endif %}
  • EPUB
  • {% trans "Does this article appear wrong?" %}
  • @@ -117,4 +118,4 @@ } }); -{% endblock %} +{% endblock %} \ No newline at end of file