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

2 files changed, 24 insertions, 6 deletions

diff --git a/app/Resources/static/themes/material/css/cards.scss b/app/Resources/static/themes/material/css/cards.scss
index 1acc03dc..c893b376 100644
--- 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%;
-  }
-}
diff --git a/app/Resources/static/themes/material/css/media_queries.scss b/app/Resources/static/themes/material/css/media_queries.scss
index 72584426..491eedce 100644
--- a/app/Resources/static/themes/material/css/media_queries.scss
+++ b/app/Resources/static/themes/material/css/media_queries.scss
@@ -12,6 +12,16 @@
   .pagination {
     margin-left: auto;
   }
+
+  .card-tag-labels li {
+    max-width: 50%;
+  }
+}
+
+@media screen and (min-width: 993px) {
+  body.entry main #content {
+    padding-left: 70px;
+  }
 }
 
 @media only screen and (max-width: 992px) {
@@ -164,3 +174,12 @@
     padding: 0;
   }
 }
+
+@media screen and (max-width: 310px),
+  screen and (min-width: 601px) and (max-width: 660px),
+  screen and (min-width: 993px) and (max-width: 1050px),
+  screen and (min-width: 1201px) and (max-width: 1250px) {
+  .card .card-action .reading-time .card-created-at {
+    display: none;
+  }
+}