Merge remote-tracking branch 'origin/master' into 2.4

2019-04-01 13:16:15 +02:00
parent b886ee923d bfd69c74e5
commit 3620dae1e6
14 changed files with 185 additions and 66 deletions
--- a/app/Resources/static/themes/material/css/cards.scss
+++ b/app/Resources/static/themes/material/css/cards.scss
@ -102,6 +102,11 @@ main {
      display: inline-flex;
      vertical-align: middle;

+      .card-reading-time,
+      .card-created-at {
+        display: inline-flex;
+      }
+
      span {
        margin-right: 5px;
      }
@ -283,9 +288,3 @@ 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%;
-  }
-}