aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorKevin Decherf <kevin@kdecherf.com>2019-03-03 02:13:14 +0100
committerKevin Decherf <kevin@kdecherf.com>2019-03-03 19:22:32 +0100
commitf1f1efb5def331721e03bc55ac3be81fbae8fd01 (patch)
treeffeed1726293a882d0bbb81866697c950a327a2a
parent806635f7d5d2ee6aa07bc5ae1246f42aef63fb3e (diff)
downloadwallabag-f1f1efb5def331721e03bc55ac3be81fbae8fd01.tar.gz
wallabag-f1f1efb5def331721e03bc55ac3be81fbae8fd01.tar.zst
wallabag-f1f1efb5def331721e03bc55ac3be81fbae8fd01.zip
material: wrap card actions, remove class hiding of creation date
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
-rw-r--r--app/Resources/static/themes/material/css/cards.scss5
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_actions.html.twig12
2 files changed, 12 insertions, 5 deletions
diff --git a/app/Resources/static/themes/material/css/cards.scss b/app/Resources/static/themes/material/css/cards.scss
index 4cbeb7bd..68001a01 100644
--- a/app/Resources/static/themes/material/css/cards.scss
+++ b/app/Resources/static/themes/material/css/cards.scss
@@ -102,6 +102,11 @@ main {
102 display: inline-flex; 102 display: inline-flex;
103 vertical-align: middle; 103 vertical-align: middle;
104 104
105 .card-reading-time,
106 .card-created-at {
107 display: inline-flex;
108 }
109
105 span { 110 span {
106 margin-right: 5px; 111 margin-right: 5px;
107 } 112 }
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_actions.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_actions.html.twig
index 827f09d9..be764e10 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_actions.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_actions.html.twig
@@ -1,9 +1,11 @@
1<div class="card-action"> 1<div class="card-action">
2 <span class="reading-time grey-text"> 2 <div class="reading-time grey-text">
3 {% include "@WallabagCore/themes/material/Entry/_reading_time.html.twig" with {'entry': entry} only %} 3 <div class="card-reading-time">{% include "@WallabagCore/themes/material/Entry/_reading_time.html.twig" with {'entry': entry} only %}</div>
4 <i class="material-icons hide-on-med-and-down" title="{{ 'entry.view.created_at'|trans }}">today</i> 4 <div class="card-created-at">
5 <span class="hide-on-med-and-down">&nbsp;{{ entry.createdAt|date('Y-m-d') }}</span> 5 <i class="material-icons" title="{{ 'entry.view.created_at'|trans }}">today</i>
6 </span> 6 <span>&nbsp;{{ entry.createdAt|date('Y-m-d') }}</span>
7 </div>
8 </div>
7 9
8 <ul class="tools right"> 10 <ul class="tools right">
9 <li> 11 <li>