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

[github/wallabag/wallabag.git] / app / Resources / static / themes / material / css / cards.scss

diff --git a/app/Resources/static/themes/material/css/cards.scss b/app/Resources/static/themes/material/css/cards.scss
index 18ef6e602f37c8f450465f437a86b4b6c840b362..f5b79193931248b0d9ede9cf8da6a21a8ab89706 100644 (file)
--- a/app/Resources/static/themes/material/css/cards.scss
+++ b/app/Resources/static/themes/material/css/cards.scss
@@ -27,6 +27,10 @@ main {
     color: #313131;
   }
 
+  .card-stacked .card-content .card-title {
+    display: inline-block;
+  }
+
   .card-content .activator,
   .card-reveal .activator {
     cursor: pointer;
@@ -111,21 +115,11 @@ main {
     .reading-time {
       display: inline-flex;
       vertical-align: middle;
-    }
-  }
 
-  .card-entry-labels li,
-  .card-tag-labels li {
-    margin: 10px 10px 10px auto;
-    padding: 5px 12px 5px 16px !important;
-    background-color: $blueAccentColor;
-    border-radius: 0 3px 3px 0;
-    color: #fff;
-    cursor: default;
-    max-height: 2em;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
+      span {
+        margin-right: 5px;
+      }
+    }
   }
 
   .card-image {
@@ -149,13 +143,27 @@ main {
   }
 }
 
-a.original {
+a.original:not(.waves-effect) {
   text-overflow: ellipsis;
   white-space: nowrap;
   overflow: hidden;
   display: block;
 }
 
+.card-entry-labels li,
+.card-tag-labels li {
+  margin: 10px 10px 10px auto;
+  padding: 5px 12px 5px 16px !important;
+  background-color: $blueAccentColor;
+  border-radius: 0 3px 3px 0;
+  color: #fff;
+  cursor: default;
+  max-height: 2em;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
 .card-entry-tags a,
 .card-entry-labels a,
 .card-tag-labels a,