From f37891fdb6d93580f25ced7d6f5c226dce3bf3b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Wed, 19 Feb 2014 15:20:13 +0100 Subject: [fix] css display with baggy theme --- themes/baggy/css/messages.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'themes/baggy') diff --git a/themes/baggy/css/messages.css b/themes/baggy/css/messages.css index 0cd89a9e..85a0dbc1 100755 --- a/themes/baggy/css/messages.css +++ b/themes/baggy/css/messages.css @@ -1,18 +1,18 @@ -.messages.error { +.install .messages.error { border: 1px solid #c42608; color: #c00 !important; background: #fff0ef; text-align: left; } -.messages.notice { +.install .messages.notice { border: 1px solid #ebcd41; color: #000; background: #fffcd3; text-align: left; } -.messages.success { +.install .messages.success { border: 1px solid #6dc70c; background: #e0fbcc; text-align: left; -- cgit v1.2.3 From e1cfef7bf1ba8efc293b11811d0ac8f1775e0c2a Mon Sep 17 00:00:00 2001 From: Nicolas Steinmetz Date: Wed, 19 Feb 2014 23:08:01 +0100 Subject: Update _head.twig Remove googlefonts now called in font.css - need still to put the woff file in font directory --- themes/baggy/_head.twig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'themes/baggy') diff --git a/themes/baggy/_head.twig b/themes/baggy/_head.twig index 0079b228..206d5aae 100644 --- a/themes/baggy/_head.twig +++ b/themes/baggy/_head.twig @@ -2,7 +2,6 @@ - @@ -10,4 +9,4 @@ - \ No newline at end of file + -- cgit v1.2.3 From 860473f33c6ac02725a5e5f340592be599503de2 Mon Sep 17 00:00:00 2001 From: Nicolas Steinmetz Date: Wed, 19 Feb 2014 23:09:12 +0100 Subject: Update font.css Add reference for ptsans font in local instead of google fonts --- themes/baggy/css/font.css | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'themes/baggy') diff --git a/themes/baggy/css/font.css b/themes/baggy/css/font.css index e69de29b..ec662158 100755 --- a/themes/baggy/css/font.css +++ b/themes/baggy/css/font.css @@ -0,0 +1,6 @@ +@font-face { + font-family: 'PT Sans'; + font-style: normal; + font-weight: 700; + src: local('PT Sans Bold'), local('PTSans-Bold'), url(/themes/baggy/fonts/ptsans.woff) format('woff'); +} -- cgit v1.2.3 From 30c12d392700d05ef183e117c2a55c5f98f1e031 Mon Sep 17 00:00:00 2001 From: Nicolas Steinmetz Date: Wed, 19 Feb 2014 23:30:55 +0100 Subject: add font file --- themes/baggy/font/ptsans.woff | Bin 0 -> 24816 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 themes/baggy/font/ptsans.woff (limited to 'themes/baggy') diff --git a/themes/baggy/font/ptsans.woff b/themes/baggy/font/ptsans.woff new file mode 100644 index 00000000..cf7c62e1 Binary files /dev/null and b/themes/baggy/font/ptsans.woff differ -- cgit v1.2.3 From d09a5674e915e79762931a3465461327fb5737ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 20 Feb 2014 08:58:59 +0100 Subject: [add] message in install screen to prevent user when wallabag is already installed --- themes/baggy/css/messages.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'themes/baggy') diff --git a/themes/baggy/css/messages.css b/themes/baggy/css/messages.css index 85a0dbc1..42da70b3 100755 --- a/themes/baggy/css/messages.css +++ b/themes/baggy/css/messages.css @@ -1,19 +1,19 @@ -.install .messages.error { +.messages.error.install { border: 1px solid #c42608; color: #c00 !important; background: #fff0ef; text-align: left; } -.install .messages.notice { +.messages.notice.install { border: 1px solid #ebcd41; color: #000; background: #fffcd3; text-align: left; } -.install .messages.success { +.messages.success.install { border: 1px solid #6dc70c; - background: #e0fbcc; + background: #e0fbcc !important; text-align: left; } \ No newline at end of file -- cgit v1.2.3 From 689de3dbcc1252e230ab25723c237723f5a4d4a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 20 Feb 2014 13:02:13 +0100 Subject: rename font folder into fonts in baggy theme --- themes/baggy/css/font.css | 2 +- themes/baggy/font/icomoon.eot | Bin 3724 -> 0 bytes themes/baggy/font/icomoon.svg | 26 -------------------------- themes/baggy/font/icomoon.ttf | Bin 3560 -> 0 bytes themes/baggy/font/icomoon.woff | Bin 3528 -> 0 bytes themes/baggy/font/ptsans.woff | Bin 24816 -> 0 bytes themes/baggy/fonts/icomoon.eot | Bin 0 -> 3724 bytes themes/baggy/fonts/icomoon.svg | 26 ++++++++++++++++++++++++++ themes/baggy/fonts/icomoon.ttf | Bin 0 -> 3560 bytes themes/baggy/fonts/icomoon.woff | Bin 0 -> 3528 bytes themes/baggy/fonts/ptsans.woff | Bin 0 -> 24816 bytes 11 files changed, 27 insertions(+), 27 deletions(-) delete mode 100755 themes/baggy/font/icomoon.eot delete mode 100755 themes/baggy/font/icomoon.svg delete mode 100755 themes/baggy/font/icomoon.ttf delete mode 100755 themes/baggy/font/icomoon.woff delete mode 100644 themes/baggy/font/ptsans.woff create mode 100755 themes/baggy/fonts/icomoon.eot create mode 100755 themes/baggy/fonts/icomoon.svg create mode 100755 themes/baggy/fonts/icomoon.ttf create mode 100755 themes/baggy/fonts/icomoon.woff create mode 100644 themes/baggy/fonts/ptsans.woff (limited to 'themes/baggy') diff --git a/themes/baggy/css/font.css b/themes/baggy/css/font.css index ec662158..7c02a16f 100755 --- a/themes/baggy/css/font.css +++ b/themes/baggy/css/font.css @@ -2,5 +2,5 @@ font-family: 'PT Sans'; font-style: normal; font-weight: 700; - src: local('PT Sans Bold'), local('PTSans-Bold'), url(/themes/baggy/fonts/ptsans.woff) format('woff'); + src: local('PT Sans Bold'), local('PTSans-Bold'), url(../fonts/ptsans.woff) format('woff'); } diff --git a/themes/baggy/font/icomoon.eot b/themes/baggy/font/icomoon.eot deleted file mode 100755 index 02f53b36..00000000 Binary files a/themes/baggy/font/icomoon.eot and /dev/null differ diff --git a/themes/baggy/font/icomoon.svg b/themes/baggy/font/icomoon.svg deleted file mode 100755 index d9c35b98..00000000 --- a/themes/baggy/font/icomoon.svg +++ /dev/null @@ -1,26 +0,0 @@ - - - -Generated by IcoMoon - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/themes/baggy/font/icomoon.ttf b/themes/baggy/font/icomoon.ttf deleted file mode 100755 index 3860dd04..00000000 Binary files a/themes/baggy/font/icomoon.ttf and /dev/null differ diff --git a/themes/baggy/font/icomoon.woff b/themes/baggy/font/icomoon.woff deleted file mode 100755 index c3a91ed7..00000000 Binary files a/themes/baggy/font/icomoon.woff and /dev/null differ diff --git a/themes/baggy/font/ptsans.woff b/themes/baggy/font/ptsans.woff deleted file mode 100644 index cf7c62e1..00000000 Binary files a/themes/baggy/font/ptsans.woff and /dev/null differ diff --git a/themes/baggy/fonts/icomoon.eot b/themes/baggy/fonts/icomoon.eot new file mode 100755 index 00000000..02f53b36 Binary files /dev/null and b/themes/baggy/fonts/icomoon.eot differ diff --git a/themes/baggy/fonts/icomoon.svg b/themes/baggy/fonts/icomoon.svg new file mode 100755 index 00000000..d9c35b98 --- /dev/null +++ b/themes/baggy/fonts/icomoon.svg @@ -0,0 +1,26 @@ + + + +Generated by IcoMoon + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/themes/baggy/fonts/icomoon.ttf b/themes/baggy/fonts/icomoon.ttf new file mode 100755 index 00000000..3860dd04 Binary files /dev/null and b/themes/baggy/fonts/icomoon.ttf differ diff --git a/themes/baggy/fonts/icomoon.woff b/themes/baggy/fonts/icomoon.woff new file mode 100755 index 00000000..c3a91ed7 Binary files /dev/null and b/themes/baggy/fonts/icomoon.woff differ diff --git a/themes/baggy/fonts/ptsans.woff b/themes/baggy/fonts/ptsans.woff new file mode 100644 index 00000000..cf7c62e1 Binary files /dev/null and b/themes/baggy/fonts/ptsans.woff differ -- cgit v1.2.3 From 032e0ca13ab8ebf99b5169f6f733db4184cdde6c Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Thu, 20 Feb 2014 19:28:39 +0200 Subject: a lot of refactoring: tag action is now handled by home view and uses sorting and pagination. Some small view enhacenments. Fix of #476, #461 for baggy and other themes --- themes/baggy/_menu.twig | 5 ++++- themes/baggy/css/main.css | 5 +++-- themes/baggy/edit-tags.twig | 7 +++++-- themes/baggy/home.twig | 5 ++++- themes/baggy/tag.twig | 34 ---------------------------------- 5 files changed, 16 insertions(+), 40 deletions(-) delete mode 100644 themes/baggy/tag.twig (limited to 'themes/baggy') diff --git a/themes/baggy/_menu.twig b/themes/baggy/_menu.twig index 3e7a2cbf..e9cd9d4a 100644 --- a/themes/baggy/_menu.twig +++ b/themes/baggy/_menu.twig @@ -4,6 +4,9 @@
  • {% trans "favorites" %}
  • {% trans "archive" %}
  • {% trans "tags" %}
    • +
  • {% trans "save a link" %}
  • {% trans "config" %}
  • {% trans "logout" %}
    • - \ No newline at end of file + + + {% include '_pocheit-form.twig' %} diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css index 45211a87..3b8220d9 100755 --- a/themes/baggy/css/main.css +++ b/themes/baggy/css/main.css @@ -563,7 +563,8 @@ footer a { ========================================================================== */ .messages { - text-align: center; + text-align: left; + margin-top: 1em; } .messages > * { display: inline-block;} @@ -818,4 +819,4 @@ blockquote { #article_toolbar a { padding: 0.3em 0.4em 0.2em; } -} \ No newline at end of file +} diff --git a/themes/baggy/edit-tags.twig b/themes/baggy/edit-tags.twig index 9f11a2c3..9e9012ee 100644 --- a/themes/baggy/edit-tags.twig +++ b/themes/baggy/edit-tags.twig @@ -4,6 +4,9 @@ {% include '_menu.twig' %} {% endblock %} {% block content %} +
    +

    {{ entry.title|raw }} +

    {% if tags is empty %}
    no tags
    {% endif %} @@ -11,10 +14,10 @@ {% for tag in tags %}
  • {{ tag.value }} ✘
    • {% endfor %}
    - -

    {% trans "You can enter multiple tags, separated by commas." %}

    + +

    {% trans "You can enter multiple tags, separated by commas." %}

    {% trans "return to article" %} {% endblock %} diff --git a/themes/baggy/home.twig b/themes/baggy/home.twig index 33afdbbd..4f9db063 100644 --- a/themes/baggy/home.twig +++ b/themes/baggy/home.twig @@ -12,6 +12,9 @@ {% include '_menu.twig' %} {% endblock %} {% block content %} + {% if tag %} +

    {% trans "Tag" %}: {{ tag.value }}

    + {% endif %} {% if entries is empty %}

    {% trans "No articles found." %}

    {% else %} @@ -40,7 +43,7 @@

    {{ entry.content|striptags|slice(0, 300) }}...

    - + {% endfor %} {% if view == 'home' %}{% if nb_results > 1 %}{{ "Mark all the entries as read" }}{% endif %}{% endif %} diff --git a/themes/baggy/tag.twig b/themes/baggy/tag.twig deleted file mode 100644 index 141ac909..00000000 --- a/themes/baggy/tag.twig +++ /dev/null @@ -1,34 +0,0 @@ -{% extends "layout.twig" %} -{% block title %}tag {% endblock %} -{% block menu %} -{% include '_menu.twig' %} -{% endblock %} -{% block content %} -

    {% trans "Tag" %} {{ tag.value }}

    - {% if entries is empty %} -

    {% trans "No link available here!" %}

    - {% else %} - {% block pager %} - {% if nb_results > 1 %} -
    -
    {{ nb_results }} {% trans "results" %}
    - {{ page_links | raw }} -
    - {% endif %} - {% endblock %} -
    - {% for entry in entries %} -
    -

    {{ entry.title|raw }}

    - -

    {{ entry.content|striptags|slice(0, 300) }}...

    -
    - {% endfor %} -
    - {% endif %} -{% endblock %} \ No newline at end of file -- cgit v1.2.3 From cd425599ce7af0e69d22a7c4b4061eed6e1706a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 21 Feb 2014 14:08:20 +0100 Subject: typo in fonts call and in label on config screen --- themes/baggy/config.twig | 4 ++-- themes/baggy/css/main.css | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'themes/baggy') diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig index 598409b9..cbb42f65 100644 --- a/themes/baggy/config.twig +++ b/themes/baggy/config.twig @@ -14,8 +14,8 @@
  • Windows Phone: {% trans "download the application" %}
  • - - + +
    • diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css index 3b8220d9..a5bd6529 100755 --- a/themes/baggy/css/main.css +++ b/themes/baggy/css/main.css @@ -473,11 +473,11 @@ footer a { @font-face { font-family: 'icomoon'; - src:url('../font/icomoon.eot?-s0mcsx'); - src:url('../font/icomoon.eot?#iefix-s0mcsx') format('embedded-opentype'), - url('../font/icomoon.woff?-s0mcsx') format('woff'), - url('../font/icomoon.ttf?-s0mcsx') format('truetype'), - url('../font/icomoon.svg?-s0mcsx#icomoon') format('svg'); + 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'); font-weight: normal; font-style: normal; } -- cgit v1.2.3 From e5382002b47f3278bd46d5b76a34ad694096f010 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 21 Feb 2014 14:58:07 +0100 Subject: [change] login button into sign in --- themes/baggy/login.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'themes/baggy') diff --git a/themes/baggy/login.twig b/themes/baggy/login.twig index e4751a41..645db376 100644 --- a/themes/baggy/login.twig +++ b/themes/baggy/login.twig @@ -24,7 +24,7 @@
    - +
    -- cgit v1.2.3 From 565bb72d9904b88a999cb432cb9e94c7968fed74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 21 Feb 2014 15:00:21 +0100 Subject: [fix] link in footer was unclickable #453 --- themes/baggy/css/main.css | 1 + 1 file changed, 1 insertion(+) (limited to 'themes/baggy') diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css index a5bd6529..3e128b08 100755 --- a/themes/baggy/css/main.css +++ b/themes/baggy/css/main.css @@ -254,6 +254,7 @@ footer { color: #999; font-size: 0.8em; font-style: italic; + z-index: 20; } footer a { -- cgit v1.2.3 From c9bd17a1007bb78e5de0775efca01df0fb515031 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 21 Feb 2014 15:24:33 +0100 Subject: [add] languages well displayed on config page #480 --- themes/baggy/config.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'themes/baggy') diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig index cbb42f65..b37ac115 100644 --- a/themes/baggy/config.twig +++ b/themes/baggy/config.twig @@ -69,7 +69,7 @@ -- cgit v1.2.3