From 23423f8d69722ae7135d3a78dfe97569dfc1776a Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sun, 1 Feb 2015 12:27:34 +0100 Subject: fixed random on default theme --- themes/default/home.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'themes') diff --git a/themes/default/home.twig b/themes/default/home.twig index abc96af8..8fe56397 100755 --- a/themes/default/home.twig +++ b/themes/default/home.twig @@ -32,7 +32,7 @@ {% if nb_results > 1 %}
{{ nb_results }} {% trans "results" %}{% if searchterm is defined %}{% trans " found for « " %} {{ searchterm }} »{% endif %} - {% trans "random" %}
+ {% trans "random" %}
{{ page_links | raw }} {% elseif nb_results == 1 %} -- cgit v1.2.3 From 1c91178932cd5b48d793261c6631697186853a93 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Wed, 4 Feb 2015 23:37:37 +0100 Subject: fix autoclose (#984) and bookmarklet mode --- themes/baggy/config.twig | 2 +- themes/default/config.twig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'themes') diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig index a5a61559..95e09734 100755 --- a/themes/baggy/config.twig +++ b/themes/baggy/config.twig @@ -27,7 +27,7 @@

{% trans "Bookmarklet" %}

- {% trans "Drag & drop this link to your bookmarks bar:" %} {% trans "bag it!" %} + {% trans "Drag & drop this link to your bookmarks bar:" %} {% trans "bag it!" %}

{% trans "Feeds" %}

diff --git a/themes/default/config.twig b/themes/default/config.twig index bac563cf..87f964c9 100755 --- a/themes/default/config.twig +++ b/themes/default/config.twig @@ -27,7 +27,7 @@

{% trans "Bookmarklet" %}

- {% trans "Drag & drop this link to your bookmarks bar:" %} {% trans "bag it!" %} + {% trans "Drag & drop this link to your bookmarks bar:" %} {% trans "bag it!" %}

{% trans "Feeds" %}

-- cgit v1.2.3 From 571b99e8045ab45bfa04bbc2a90dc566dba59452 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Wed, 4 Feb 2015 23:50:33 +0100 Subject: added evernote support --- themes/baggy/view.twig | 1 + themes/default/view.twig | 1 + 2 files changed, 2 insertions(+) (limited to 'themes') diff --git a/themes/baggy/view.twig b/themes/baggy/view.twig index 0a8380de..473e3695 100755 --- a/themes/baggy/view.twig +++ b/themes/baggy/view.twig @@ -15,6 +15,7 @@ {% if constant('SHARE_TWITTER') == 1 %}
    • {% endif %} {% if constant('SHARE_MAIL') == 1 %}
    • {% endif %} {% if constant('SHARE_SHAARLI') == 1 %}
  • {% trans "shaarli" %}
    • {% endif %} + {% if constant('SHARE_EVERNOTE') == 1 %}
  • {% trans "evernote" %}
    • {% endif %} {% if constant('SHARE_DIASPORA') == 1 %}
  • {% trans "diaspora" %}
    • {% 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 %} diff --git a/themes/default/view.twig b/themes/default/view.twig index be8bf99e..87371d13 100755 --- a/themes/default/view.twig +++ b/themes/default/view.twig @@ -14,6 +14,7 @@ {% if constant('SHARE_TWITTER') == 1 %}
    • {% endif %} {% if constant('SHARE_MAIL') == 1 %}
    • {% endif %} {% if constant('SHARE_SHAARLI') == 1 %}
  • {% trans "shaarli" %}
    • {% endif %} + {% if constant('SHARE_EVERNOTE') == 1 %}
  • {% trans "evernote" %}
    • {% endif %} {% if constant('SHARE_DIASPORA') == 1 %}
  • {% trans "diaspora" %}
    • {% 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 %} -- cgit v1.2.3 From d0ea3544cad2ce4f1d0193d6d7bbda80eabadf91 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Thu, 5 Feb 2015 17:04:14 +0100 Subject: add evernote icon --- themes/_global/img/icons/evernote-icon--black.svg | 8 ++++++++ themes/baggy/css/main.css | 3 +++ themes/baggy/fonts/icomoon.eot | Bin 6040 -> 6304 bytes themes/baggy/fonts/icomoon.svg | 1 + themes/baggy/fonts/icomoon.ttf | Bin 5876 -> 6140 bytes themes/baggy/fonts/icomoon.woff | Bin 5952 -> 6216 bytes themes/baggy/view.twig | 2 +- themes/default/css/style-default.css | 5 +++++ 8 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 themes/_global/img/icons/evernote-icon--black.svg (limited to 'themes') diff --git a/themes/_global/img/icons/evernote-icon--black.svg b/themes/_global/img/icons/evernote-icon--black.svg new file mode 100644 index 00000000..1336648c --- /dev/null +++ b/themes/_global/img/icons/evernote-icon--black.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css index 90d546fc..54622cfc 100755 --- a/themes/baggy/css/main.css +++ b/themes/baggy/css/main.css @@ -742,6 +742,9 @@ a.add-to-wallabag-link-after:after { .icon-reload:before { content: "\ea2e"; } +.icon-evernote:before { + content: "\e603"; +} /* .icon-image class, for image-based icons diff --git a/themes/baggy/fonts/icomoon.eot b/themes/baggy/fonts/icomoon.eot index 784ac198..3d4d14ae 100644 Binary files a/themes/baggy/fonts/icomoon.eot and b/themes/baggy/fonts/icomoon.eot differ diff --git a/themes/baggy/fonts/icomoon.svg b/themes/baggy/fonts/icomoon.svg index 2e2f16f7..19fcfa1f 100644 --- a/themes/baggy/fonts/icomoon.svg +++ b/themes/baggy/fonts/icomoon.svg @@ -10,6 +10,7 @@ + diff --git a/themes/baggy/fonts/icomoon.ttf b/themes/baggy/fonts/icomoon.ttf index b4fb95bc..923f56d8 100644 Binary files a/themes/baggy/fonts/icomoon.ttf and b/themes/baggy/fonts/icomoon.ttf differ diff --git a/themes/baggy/fonts/icomoon.woff b/themes/baggy/fonts/icomoon.woff index 158108f1..a2e86d36 100644 Binary files a/themes/baggy/fonts/icomoon.woff and b/themes/baggy/fonts/icomoon.woff differ diff --git a/themes/baggy/view.twig b/themes/baggy/view.twig index 473e3695..0d0a4438 100755 --- a/themes/baggy/view.twig +++ b/themes/baggy/view.twig @@ -15,7 +15,7 @@ {% if constant('SHARE_TWITTER') == 1 %}
    • {% endif %} {% if constant('SHARE_MAIL') == 1 %}
    • {% endif %} {% if constant('SHARE_SHAARLI') == 1 %}
  • {% trans "shaarli" %}
    • {% endif %} - {% if constant('SHARE_EVERNOTE') == 1 %}
  • {% trans "evernote" %}
    • {% endif %} + {% if constant('SHARE_EVERNOTE') == 1 %}
  • {% trans "evernote" %}
    • {% endif %} {% if constant('SHARE_DIASPORA') == 1 %}
  • {% trans "diaspora" %}
    • {% 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 %} diff --git a/themes/default/css/style-default.css b/themes/default/css/style-default.css index 666c4a28..39a4df90 100755 --- a/themes/default/css/style-default.css +++ b/themes/default/css/style-default.css @@ -43,6 +43,11 @@ a.carrot span { 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; -- cgit v1.2.3 From cefdc12380c5acee927e3f8e1cb85213f4b1475d Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 10 Feb 2015 01:16:50 +0100 Subject: changed description text place in about screen --- themes/baggy/about.twig | 4 ++-- themes/default/about.twig | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'themes') diff --git a/themes/baggy/about.twig b/themes/baggy/about.twig index 110196a6..93c96df2 100755 --- a/themes/baggy/about.twig +++ b/themes/baggy/about.twig @@ -7,6 +7,8 @@ {% block content %}

    {% trans "About wallabag" %}

    +

    {% trans "wallabag is a read-it-later application: you can save a web page by keeping only content. Elements like ads or menus are deleted." %}

    +
    {% trans "Project website" %}
    https://www.wallabag.org
    @@ -27,8 +29,6 @@
    {{ constant('POCHE') }}
    -

    {% trans "wallabag is a read-it-later application: you can save a web page by keeping only content. Elements like ads or menus are deleted." %}

    -

    {% trans "Getting help" %}

    diff --git a/themes/default/about.twig b/themes/default/about.twig index 5ca3217c..bab9b5eb 100755 --- a/themes/default/about.twig +++ b/themes/default/about.twig @@ -7,6 +7,8 @@ {% block content %}

    {% trans "About wallabag" %}

    +

    {% trans "wallabag is a read-it-later application: you can save a web page by keeping only content. Elements like ads or menus are deleted." %}

    +
    {% trans "Project website" %}
    http://www.wallabag.org
    @@ -27,8 +29,6 @@
    {{ constant('POCHE') }}
    -

    {% trans "wallabag is a read-it-later application: you can save a web page by keeping only content. Elements like ads or menus are deleted." %}

    -

    {% trans "Helping wallabag" %}

    {% trans "wallabag is free and opensource. You can help us:" %}

    -- cgit v1.2.3