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

[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 8f7f8f7b4e87ac4020477012f82fa11dffca19e8..9ae1be826d75d7f32838e3099f31f6036ebab86b 100644 (file)
--- a/app/Resources/static/themes/material/css/cards.scss
+++ b/app/Resources/static/themes/material/css/cards.scss
@@ -18,6 +18,24 @@ main {
   overflow: hidden;
 }
 
+@mixin mixin-reading-time {
+  .reading-time {
+    display: inline-flex;
+    vertical-align: middle;
+
+    .card-reading-time,
+    .card-created-at {
+      display: inline-flex;
+    }
+
+    span {
+      margin-right: 5px;
+    }
+
+    @content;
+  }
+}
+
 .card {
   .card-content .card-title,
   .card-reveal .card-title {
@@ -98,14 +116,7 @@ main {
       margin-right: 5px !important;
     }
 
-    .reading-time {
-      display: inline-flex;
-      vertical-align: middle;
-
-      span {
-        margin-right: 5px;
-      }
-    }
+    @include mixin-reading-time;
   }
 
   .card-image {
@@ -116,13 +127,6 @@ main {
     height: 13.5em;
   }
 
-  .card-image .preview,
-  .card-fullimage .preview {
-    height: 14em;
-    background: no-repeat 50%/cover;
-    display: block;
-  }
-
   &.sw {
     max-width: 370px;
     margin-left: auto;
@@ -137,6 +141,19 @@ a.original:not(.waves-effect) {
   display: block;
 }
 
+.card .card-image .preview,
+.card .card-fullimage .preview,
+.card-stacked .preview {
+  height: 100%;
+  background: no-repeat 50%/cover;
+  background-color: #efefef;
+  display: block;
+
+  &--default {
+    background-size: contain;
+  }
+}
+
 .card-entry-labels li,
 .card-tag-labels li {
   margin: 10px 10px 10px auto;
@@ -180,6 +197,17 @@ a.original:not(.waves-effect) {
   flex-grow: 1;
 }
 
+.card-tag-form {
+  display: flex;
+  min-width: 100px;
+  flex-grow: 1;
+}
+
+.card-tag-form input {
+  margin-bottom: 0;
+  height: 2rem;
+}
+
 .card-tag-rss {
   display: flex;
 }
@@ -205,24 +233,29 @@ a.original:not(.waves-effect) {
     text-align: right;
   }
 
-  .preview {
+  .card-preview {
     max-width: 100px;
-    height: auto;
+    max-height: 50px;
     margin-right: 10px;
     flex: 1;
-
-    img {
-      max-width: 100%;
-      max-height: 100%;
-    }
   }
 
   div.metadata {
+    overflow: hidden;
+    height: 1.5em;
+    display: flex;
+
+    ul.tags {
+      margin-left: 4px;
+    }
+
     .chip {
       background-color: $blueAccentColor;
-      padding: 0 15px 0 10px;
-      margin: auto 2px;
+      padding: 0 7px;
+      margin: auto 1px;
       border-radius: 6px;
+      line-height: 22px;
+      height: 22px;
 
       a,
       i {
@@ -236,6 +269,16 @@ a.original:not(.waves-effect) {
         padding-left: 8px;
       }
     }
+
+    @include mixin-reading-time {
+      padding: 0 5px;
+      flex-wrap: wrap;
+      margin-left: auto;
+
+      i.material-icons {
+        font-size: 20px;
+      }
+    }
   }
 
   div.card-content {
@@ -269,9 +312,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%;
-  }
-}