From: Jérémy Benoist Date: Fri, 8 Dec 2017 09:27:43 +0000 (+0100) Subject: Merge pull request #3461 from Simounet/fix/rss-on-tag-list X-Git-Tag: 2.3.0~7 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=e99be2c134d836a26faa1defb3b1b473834df58b;hp=77a53ea7244a5483e57f657e8f53bf45f226c581;p=github%2Fwallabag%2Fwallabag.git Merge pull request #3461 from Simounet/fix/rss-on-tag-list Tag's list improved --- diff --git a/app/Resources/static/themes/material/css/cards.scss b/app/Resources/static/themes/material/css/cards.scss index 0819f0dc..8ef864d6 100644 --- a/app/Resources/static/themes/material/css/cards.scss +++ b/app/Resources/static/themes/material/css/cards.scss @@ -73,20 +73,6 @@ main { white-space: nowrap; } - .card-entry-labels-hidden li { - display: inline-block; - background-color: $blueAccentColor; - margin: 0 5px; - padding: 5px 12px; - border-radius: 3px; - color: #fff; - max-height: 2em; - max-width: calc(100% - 15px); - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; - } - .card-content .estimatedTime { margin-bottom: 10px; } @@ -157,13 +143,21 @@ a.original:not(.waves-effect) { margin: 10px 10px 10px auto; padding: 5px 12px 5px 16px !important; background-color: $blueAccentColor; - border-radius: 0 3px 3px 0; + border-radius: 3px; color: #fff; cursor: default; - max-height: 2em; - overflow: hidden; +} + +.card-entry-labels li { text-overflow: ellipsis; white-space: nowrap; + border-radius: 0 3px 3px 0; + overflow: hidden; +} + +.card-tag-labels li { + display: flex; + justify-content: space-between; } .card-entry-tags a, @@ -176,6 +170,33 @@ a.original:not(.waves-effect) { color: #fff; } +.card-tag-labels a { + height: 100%; + align-items: center; +} + +.card-tag-link { + display: flex; + min-width: 100px; + flex-grow: 1; +} + +.card-tag-rss { + display: flex; +} + +.card-tag-labels { + display: flex; + flex-wrap: wrap; +} + +.card-tag-labels li { + margin: 10px; + flex-basis: 19%; + flex-grow: 1; + align-items: center; +} + .card-stacked { display: flex; flex-flow: row wrap; @@ -245,3 +266,9 @@ a.original:not(.waves-effect) { .settings .div_tabs { padding-bottom: 15px; } + +@media only screen and (min-width: 992px) { + .card-tag-labels li { + max-width: 50%; + } +} diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig index 97ddedc9..c15b5146 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig @@ -12,10 +12,10 @@