From 812c980fa5ea03b9282e32a93723e459eee763a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 29 May 2017 10:59:30 +0200 Subject: Fixed tags display on grid view --- .../static/themes/material/css/cards.scss | 17 ++++++++ .../static/themes/material/css/entries.scss | 9 +++++ .../static/themes/material/css/various.scss | 20 +++++++++ .../themes/material/Entry/_card_list.html.twig | 47 ++++++++++++---------- .../views/themes/material/Entry/entries.html.twig | 4 +- 5 files changed, 74 insertions(+), 23 deletions(-) diff --git a/app/Resources/static/themes/material/css/cards.scss b/app/Resources/static/themes/material/css/cards.scss index f5b79193..1e0155c3 100644 --- a/app/Resources/static/themes/material/css/cards.scss +++ b/app/Resources/static/themes/material/css/cards.scss @@ -182,6 +182,23 @@ a.original:not(.waves-effect) { ul.tools-list { display: none; } + + .preview { + float: left; + width: 90px; + height: 50px; + + img { + max-height: 50px; + padding-right: 10px; + width: 80px; + } + } + + .domain, + .footer { + font-size: 12px; + } } .quickstart .card .card-action a, diff --git a/app/Resources/static/themes/material/css/entries.scss b/app/Resources/static/themes/material/css/entries.scss index b6a46a9e..c667be27 100644 --- a/app/Resources/static/themes/material/css/entries.scss +++ b/app/Resources/static/themes/material/css/entries.scss @@ -2,6 +2,15 @@ * Entries * ========================================================================== */ +.collection { + margin: 15px 15px 0; + + .collection-item { + padding: 7px; + height: 65px; + } +} + .results { height: 1em; diff --git a/app/Resources/static/themes/material/css/various.scss b/app/Resources/static/themes/material/css/various.scss index 7daf40ec..512ed8cd 100644 --- a/app/Resources/static/themes/material/css/various.scss +++ b/app/Resources/static/themes/material/css/various.scss @@ -30,3 +30,23 @@ nav .input-field input { .tab { flex: 1; } + +.chip { + margin: auto 0; + border-radius: 4px; + background-color: #eee; + font-weight: normal; + height: 20px; + line-height: normal; + + a { + color: #9e9e9e; + } + + i.material-icons { + float: right; + font-size: 16px; + line-height: 32px; + padding-left: 8px; + } +} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig index 24d76a05..8a22f0c8 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig @@ -1,25 +1,30 @@ -
-
-
- - - {{ entry.title| striptags | truncate(120, true, '…') | raw }} - + diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig index b2d91c9c..6f657b18 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig @@ -24,9 +24,9 @@

-
    +
      {% for entry in entries %} -
    • +
    • {% if listMode == 1 %} {% include "@WallabagCore/themes/material/Entry/_card_list.html.twig" with {'entry': entry} only %} {% elseif entry.previewPicture is null %} -- cgit v1.2.3