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

app/Resources/static/themes/material/css/cards.scss

@@ -6,16 +6,6 @@ main {
   #content {
     padding: 0 0.5rem;
   }
-
-  ul.row {
-    margin: 0.4rem 0 0;
-    padding: 0 0.75rem;
-  }
-}
-
-.data .card .card-body {
-  height: 19em;
-  overflow: hidden;
 }
 
 @mixin mixin-reading-time {
@@ -37,6 +27,11 @@ main {
 }
 
 .card {
+  .card-content {
+    padding-bottom: 12px;
+    flex-grow: 1;
+  }
+
   .card-content .card-title,
   .card-reveal .card-title {
     line-height: 22.8px;
@@ -95,7 +90,7 @@ main {
   }
 
   .card-action {
-    padding: 10px 5px 10px 15px;
+    padding: 10px 10px 10px 15px;
 
     ul.links {
       margin: 0;
@@ -112,8 +107,9 @@ main {
       color: #fff;
     }
 
-    ul.tools li a.tool {
-      margin-right: 5px !important;
+    .tool {
+      display: flex;
+      margin-right: 0 !important;
     }
 
     @include mixin-reading-time;
@@ -134,6 +130,12 @@ main {
   }
 }
 
+.card-body {
+  display: flex;
+  flex-grow: 1;
+  flex-direction: column;
+}
+
 a.original:not(.waves-effect) {
   text-overflow: ellipsis;
   white-space: nowrap;
@@ -311,3 +313,23 @@ a.original:not(.waves-effect) {
 .settings .div_tabs {
   padding-bottom: 15px;
 }
+
+.entries-row {
+  display: grid;
+  margin: 0.4rem 0 0;
+  padding: 0 0.75rem;
+  gap: 20px;
+}
+
+.entry-card {
+  display: flex;
+  margin: 0;
+  height: 100%;
+  flex-direction: column;
+}
+
+
+.tools {
+  display: flex;
+  gap: 10px;
+}

app/Resources/static/themes/material/css/entries.scss

@@ -3,7 +3,7 @@
  * ========================================================================== */
 
 .mass-buttons {
-  margin: 5px;
+  margin: 10px 5px 10px 20px;
 
   #selectAll {
     position: relative;
@@ -17,12 +17,13 @@
 
   button {
     i {
-      font-size: 12px;
+      font-size: 15px;
     }
 
     height: 24px;
     line-height: 24px;
     padding: 0 0.5rem;
+    margin-right: 0.75rem;
   }
 }
 
@@ -38,8 +39,13 @@
   }
 }
 
+.entries {
+  list-style: none;
+}
+
 .collection {
-  margin: 15px 15px 0;
+  margin: 5px 15px 0;
+  padding: 0;
 
   .collection-item {
     padding: 7px;

app/Resources/static/themes/material/css/media_queries.scss

@@ -2,6 +2,12 @@
    Media queries
    ========================================================================== */
 
+@media only screen and (min-width: 450px) {
+  .entries-row {
+    grid-template-columns: repeat(auto-fill, minmax(340px, 1fr));
+  }
+}
+
 @media only screen and (min-width: 992px) {
   nav,
   body:not(.entry):not(.login) main,
@@ -180,15 +186,6 @@
   }
 }
 
-@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;
-  }
-}
-
 @media only print {
   body {
     display: block;