From 645c0d5bce85be0dfcb7b58c31ce96a47ceb99e3 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 4 Oct 2016 20:11:10 +0200 Subject: [PATCH 1/2] better tags on baggy --- app/Resources/static/themes/baggy/css/main.css | 16 +++++++++++++++- .../views/themes/baggy/Entry/entries.html.twig | 6 +++--- .../views/themes/baggy/Entry/entry.html.twig | 4 +++- .../wallabagcore/themes/baggy/css/style.min.css | 2 +- .../themes/baggy/css/style.min.css.map | 2 +- 5 files changed, 23 insertions(+), 7 deletions(-) diff --git a/app/Resources/static/themes/baggy/css/main.css b/app/Resources/static/themes/baggy/css/main.css index 99ea6c6b2..61e7b22a7 100755 --- a/app/Resources/static/themes/baggy/css/main.css +++ b/app/Resources/static/themes/baggy/css/main.css @@ -383,9 +383,11 @@ footer a { max-height: 2em; overflow-y: hidden; padding: 0; + margin: 0; } -.card-entry-tags li { +.card-entry-tags li, +.card-entry-tags span { display: inline-block; margin: 0 5px; padding: 5px 12px; @@ -394,9 +396,19 @@ footer a { max-height: 2em; overflow: hidden; text-overflow: ellipsis; +} + +.card-entry-tags a, +.card-entry-labels a { + text-decoration: none; + font-weight: normal; color: #fff; } +.nav-panel-add-tag { + margin-top: 10px; +} + .list-entries + .results { margin-bottom: 2em; } @@ -509,6 +521,7 @@ img.preview { color: #666; font-size: 0.9em; line-height: 1.7; + margin-top: 5px; } .entry h2 a::first-letter { @@ -1021,6 +1034,7 @@ blockquote { #article_toolbar li { display: inline-block; + margin: 3px auto; } #article_toolbar a { diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig index 1c0430e8a..3af88b237 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig @@ -29,16 +29,16 @@
  • {{ entry.domainName|removeWww }}
  • {% if entry.previewPicture is null %} -

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

    +

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

    {% else %} {{ entry.title|raw }} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig index 9a5c8fe02..b1aabf9b3 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entry.html.twig @@ -57,9 +57,11 @@ {% set nbAnnotations = entry.annotations | length %} comment {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}