Merge pull request #3077 from wallabag/add-tags-list-view

Added tags on list view

3 files changed, 62 insertions, 1 deletions

diff --git a/app/Resources/static/themes/material/css/article.scss b/app/Resources/static/themes/material/css/article.scss
index 8b67f6bd..27ff5221 100644
--- a/app/Resources/static/themes/material/css/article.scss
+++ b/app/Resources/static/themes/material/css/article.scss
@@ -132,6 +132,7 @@
       background-color: $blueAccentColor;
       padding: 0 15px 0 10px;
       margin: auto 2px;
+      border-radius: 6px;
 
       a,
       i {
diff --git a/app/Resources/static/themes/material/css/cards.scss b/app/Resources/static/themes/material/css/cards.scss
index f5b79193..3edbe673 100644
--- a/app/Resources/static/themes/material/css/cards.scss
+++ b/app/Resources/static/themes/material/css/cards.scss
@@ -175,15 +175,66 @@ a.original:not(.waves-effect) {
 }
 
 .card-stacked {
+  display: flex;
+  flex-flow: row wrap;
+
   &:hover ul.tools-list {
-    display: block;
+    display: inline;
+    text-align: right;
+  }
+
+  .preview {
+    max-width: 100px;
+    height: auto;
+    margin-right: 10px;
+    flex: 1;
+
+    img {
+      max-width: 100%;
+      max-height: 100%;
+    }
+  }
+
+  div.metadata {
+    .chip {
+      background-color: $blueAccentColor;
+      padding: 0 15px 0 10px;
+      margin: auto 2px;
+      border-radius: 6px;
+
+      a,
+      i {
+        color: #fff;
+      }
+
+      i.material-icons {
+        float: right;
+        font-size: 20px;
+        line-height: 32px;
+        padding-left: 8px;
+      }
+    }
+  }
+
+  div.card-content {
+    flex: 4;
   }
 
   ul.tools-list {
+    flex: 1;
     display: none;
+    flex-basis: 5em;
+    align-self: flex-end;
+    float: right;
+    max-width: 6em;
   }
 }
 
+#content .collection .collection-item {
+  min-height: 65px;
+  height: auto;
+}
+
 .quickstart .card .card-action a,
 .quickstart .card .card-action a:hover {
   color: #fff !important;
diff --git a/app/Resources/static/themes/material/css/entries.scss b/app/Resources/static/themes/material/css/entries.scss
index b6a46a9e..c667be27 100644
--- a/app/Resources/static/themes/material/css/entries.scss
+++ b/app/Resources/static/themes/material/css/entries.scss
@@ -2,6 +2,15 @@
  * Entries
  * ========================================================================== */
 
+.collection {
+  margin: 15px 15px 0;
+
+  .collection-item {
+    padding: 7px;
+    height: 65px;
+  }
+}
+
 .results {
   height: 1em;