From 4c6ee89c9c70f24209f2bb86de2b3137ab2d801c Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sun, 7 May 2017 17:13:08 +0200 Subject: [PATCH] Fix review again Signed-off-by: Thomas Citharel --- .../static/themes/material/css/article.scss | 30 ++++---- .../static/themes/material/css/cards.scss | 2 +- .../themes/material/Entry/entry.html.twig | 74 ++++++++++--------- web/bundles/wallabagcore/material.css | 2 +- 4 files changed, 57 insertions(+), 51 deletions(-) diff --git a/app/Resources/static/themes/material/css/article.scss b/app/Resources/static/themes/material/css/article.scss index dc12f857e..0c7735c33 100644 --- a/app/Resources/static/themes/material/css/article.scss +++ b/app/Resources/static/themes/material/css/article.scss @@ -103,27 +103,31 @@ aside { .tools { - font-size: 0.8em; display: flex; flex-flow: row wrap; - li { - display: inline-flex; - vertical-align: middle; - margin: 0 5px; + .stats { + font-size: 0.8em; + margin: 8px 15px 5px; + + li { + display: inline-flex; + vertical-align: middle; + margin: 0 5px; + } + + a { + color: #000; + text-decoration: none; + } } - a { - color: #000; - text-decoration: none; + .tags { + float: right; + margin: 5px 15px 10px; } } - #list { - float: right; - margin: -5px 15px auto; - } - .chip { background-color: $blueAccentColor; padding: 0 15px 0 10px; diff --git a/app/Resources/static/themes/material/css/cards.scss b/app/Resources/static/themes/material/css/cards.scss index d0f4c828c..40351475e 100644 --- a/app/Resources/static/themes/material/css/cards.scss +++ b/app/Resources/static/themes/material/css/cards.scss @@ -143,7 +143,7 @@ main { } } -a.original { +a.original:not(.waves-effect) { text-overflow: ellipsis; white-space: nowrap; overflow: hidden; diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig index 987329a5d..47e6e8c32 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig @@ -216,46 +216,48 @@

{{ entry.title|striptags|raw }}