diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2019-01-15 09:41:18 +0100 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2019-01-15 09:41:18 +0100 |
commit | 5419a8368ebb4b4d57f481b842f1fcc576c9149d (patch) | |
tree | cd970bb8f3ec5e6487fc1e3bd2de1f89455d3d90 /app/Resources/static | |
parent | 5c331bf0f9ef679aaf91ef29b13120272fcccbf5 (diff) | |
parent | f6b9e883c01196d5aec249f6e8e02e07d0da4089 (diff) | |
download | wallabag-5419a8368ebb4b4d57f481b842f1fcc576c9149d.tar.gz wallabag-5419a8368ebb4b4d57f481b842f1fcc576c9149d.tar.zst wallabag-5419a8368ebb4b4d57f481b842f1fcc576c9149d.zip |
Merge remote-tracking branch 'origin/master' into 2.4
Diffstat (limited to 'app/Resources/static')
-rw-r--r-- | app/Resources/static/themes/material/css/cards.scss | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/app/Resources/static/themes/material/css/cards.scss b/app/Resources/static/themes/material/css/cards.scss index 52872220..1acc03dc 100644 --- a/app/Resources/static/themes/material/css/cards.scss +++ b/app/Resources/static/themes/material/css/cards.scss | |||
@@ -116,18 +116,6 @@ main { | |||
116 | height: 13.5em; | 116 | height: 13.5em; |
117 | } | 117 | } |
118 | 118 | ||
119 | .card-image .preview, | ||
120 | .card-fullimage .preview { | ||
121 | height: 100%; | ||
122 | background: no-repeat 50%/cover; | ||
123 | background-color: #efefef; | ||
124 | display: block; | ||
125 | |||
126 | &--default { | ||
127 | background-size: contain; | ||
128 | } | ||
129 | } | ||
130 | |||
131 | &.sw { | 119 | &.sw { |
132 | max-width: 370px; | 120 | max-width: 370px; |
133 | margin-left: auto; | 121 | margin-left: auto; |
@@ -142,6 +130,19 @@ a.original:not(.waves-effect) { | |||
142 | display: block; | 130 | display: block; |
143 | } | 131 | } |
144 | 132 | ||
133 | .card .card-image .preview, | ||
134 | .card .card-fullimage .preview, | ||
135 | .card-stacked .preview { | ||
136 | height: 100%; | ||
137 | background: no-repeat 50%/cover; | ||
138 | background-color: #efefef; | ||
139 | display: block; | ||
140 | |||
141 | &--default { | ||
142 | background-size: contain; | ||
143 | } | ||
144 | } | ||
145 | |||
145 | .card-entry-labels li, | 146 | .card-entry-labels li, |
146 | .card-tag-labels li { | 147 | .card-tag-labels li { |
147 | margin: 10px 10px 10px auto; | 148 | margin: 10px 10px 10px auto; |
@@ -221,24 +222,21 @@ a.original:not(.waves-effect) { | |||
221 | text-align: right; | 222 | text-align: right; |
222 | } | 223 | } |
223 | 224 | ||
224 | .preview { | 225 | .card-preview { |
225 | max-width: 100px; | 226 | max-width: 100px; |
226 | height: auto; | 227 | max-height: 50px; |
227 | margin-right: 10px; | 228 | margin-right: 10px; |
228 | flex: 1; | 229 | flex: 1; |
229 | |||
230 | img { | ||
231 | max-width: 100%; | ||
232 | max-height: 100%; | ||
233 | } | ||
234 | } | 230 | } |
235 | 231 | ||
236 | div.metadata { | 232 | div.metadata { |
237 | .chip { | 233 | .chip { |
238 | background-color: $blueAccentColor; | 234 | background-color: $blueAccentColor; |
239 | padding: 0 15px 0 10px; | 235 | padding: 0 7px; |
240 | margin: auto 2px; | 236 | margin: auto 2px; |
241 | border-radius: 6px; | 237 | border-radius: 6px; |
238 | line-height: 22px; | ||
239 | height: 22px; | ||
242 | 240 | ||
243 | a, | 241 | a, |
244 | i { | 242 | i { |