aboutsummaryrefslogtreecommitdiffhomepage
path: root/app/Resources
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2019-05-15 14:38:07 +0200
committerJeremy Benoist <jeremy.benoist@gmail.com>2019-05-15 14:38:07 +0200
commit9f0957b831622ee577fa7d8f92ec0df6f3a8e274 (patch)
tree362e95af5fc0786e7934e0ab25764d90123bf997 /app/Resources
parent9e2194e9cb55acf0a715e36c33f9f9d8689e0761 (diff)
parent227a1a27f19604d64ffdfee56b4c8fc6b325bee6 (diff)
downloadwallabag-9f0957b831622ee577fa7d8f92ec0df6f3a8e274.tar.gz
wallabag-9f0957b831622ee577fa7d8f92ec0df6f3a8e274.tar.zst
wallabag-9f0957b831622ee577fa7d8f92ec0df6f3a8e274.zip
Merge remote-tracking branch 'origin/master' into 2.4
Diffstat (limited to 'app/Resources')
-rw-r--r--app/Resources/static/themes/material/css/cards.scss52
-rw-r--r--app/Resources/static/themes/material/css/media_queries.scss4
2 files changed, 42 insertions, 14 deletions
diff --git a/app/Resources/static/themes/material/css/cards.scss b/app/Resources/static/themes/material/css/cards.scss
index c893b376..9ae1be82 100644
--- a/app/Resources/static/themes/material/css/cards.scss
+++ b/app/Resources/static/themes/material/css/cards.scss
@@ -18,6 +18,24 @@ main {
18 overflow: hidden; 18 overflow: hidden;
19} 19}
20 20
21@mixin mixin-reading-time {
22 .reading-time {
23 display: inline-flex;
24 vertical-align: middle;
25
26 .card-reading-time,
27 .card-created-at {
28 display: inline-flex;
29 }
30
31 span {
32 margin-right: 5px;
33 }
34
35 @content;
36 }
37}
38
21.card { 39.card {
22 .card-content .card-title, 40 .card-content .card-title,
23 .card-reveal .card-title { 41 .card-reveal .card-title {
@@ -98,19 +116,7 @@ main {
98 margin-right: 5px !important; 116 margin-right: 5px !important;
99 } 117 }
100 118
101 .reading-time { 119 @include mixin-reading-time;
102 display: inline-flex;
103 vertical-align: middle;
104
105 .card-reading-time,
106 .card-created-at {
107 display: inline-flex;
108 }
109
110 span {
111 margin-right: 5px;
112 }
113 }
114 } 120 }
115 121
116 .card-image { 122 .card-image {
@@ -235,10 +241,18 @@ a.original:not(.waves-effect) {
235 } 241 }
236 242
237 div.metadata { 243 div.metadata {
244 overflow: hidden;
245 height: 1.5em;
246 display: flex;
247
248 ul.tags {
249 margin-left: 4px;
250 }
251
238 .chip { 252 .chip {
239 background-color: $blueAccentColor; 253 background-color: $blueAccentColor;
240 padding: 0 7px; 254 padding: 0 7px;
241 margin: auto 2px; 255 margin: auto 1px;
242 border-radius: 6px; 256 border-radius: 6px;
243 line-height: 22px; 257 line-height: 22px;
244 height: 22px; 258 height: 22px;
@@ -255,6 +269,16 @@ a.original:not(.waves-effect) {
255 padding-left: 8px; 269 padding-left: 8px;
256 } 270 }
257 } 271 }
272
273 @include mixin-reading-time {
274 padding: 0 5px;
275 flex-wrap: wrap;
276 margin-left: auto;
277
278 i.material-icons {
279 font-size: 20px;
280 }
281 }
258 } 282 }
259 283
260 div.card-content { 284 div.card-content {
diff --git a/app/Resources/static/themes/material/css/media_queries.scss b/app/Resources/static/themes/material/css/media_queries.scss
index 491eedce..6f9d2a95 100644
--- a/app/Resources/static/themes/material/css/media_queries.scss
+++ b/app/Resources/static/themes/material/css/media_queries.scss
@@ -173,6 +173,10 @@
173 .row .col { 173 .row .col {
174 padding: 0; 174 padding: 0;
175 } 175 }
176
177 .card-stacked div.metadata .reading-time {
178 display: none;
179 }
176} 180}
177 181
178@media screen and (max-width: 310px), 182@media screen and (max-width: 310px),