diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-10-11 21:01:30 +0200 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-10-11 21:01:30 +0200 |
commit | e4cf672ccf61689ba28c2e89fc55f83167800b18 (patch) | |
tree | 5dc22c97797bdcdd0a3d2a7e182410f04a748c1e /app/Resources | |
parent | e57df5611fe82ce61a71d51c762ee9296f18c3ac (diff) | |
parent | dbe94e73a9eaf3acb250812913b0303b35d01a2e (diff) | |
download | wallabag-e4cf672ccf61689ba28c2e89fc55f83167800b18.tar.gz wallabag-e4cf672ccf61689ba28c2e89fc55f83167800b18.tar.zst wallabag-e4cf672ccf61689ba28c2e89fc55f83167800b18.zip |
Merge remote-tracking branch 'origin/master' into 2.2
Diffstat (limited to 'app/Resources')
-rwxr-xr-x | app/Resources/static/themes/material/css/main.css | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css index b66c88f9..d91b469f 100755 --- a/app/Resources/static/themes/material/css/main.css +++ b/app/Resources/static/themes/material/css/main.css | |||
@@ -414,9 +414,10 @@ main ul.row { | |||
414 | max-width: 50%; | 414 | max-width: 50%; |
415 | } | 415 | } |
416 | 416 | ||
417 | .card .card-entry-labels li { | 417 | .card .card-entry-labels li, |
418 | .card-tag-labels li { | ||
418 | margin: 10px 10px 10px auto; | 419 | margin: 10px 10px 10px auto; |
419 | padding: 5px 12px 5px 16px; | 420 | padding: 5px 12px 5px 16px !important; |
420 | background-color: rgba(0, 151, 167, 0.85); | 421 | background-color: rgba(0, 151, 167, 0.85); |
421 | border-radius: 0 3px 3px 0; | 422 | border-radius: 0 3px 3px 0; |
422 | color: #fff; | 423 | color: #fff; |
@@ -447,6 +448,7 @@ main ul.row { | |||
447 | 448 | ||
448 | .card-entry-tags a, | 449 | .card-entry-tags a, |
449 | .card-entry-labels a, | 450 | .card-entry-labels a, |
451 | .card-tag-labels a, | ||
450 | .card-entry-labels-hidden a, | 452 | .card-entry-labels-hidden a, |
451 | #list .chip a { | 453 | #list .chip a { |
452 | text-decoration: none; | 454 | text-decoration: none; |