diff options
author | Jeremy Benoist <j0k3r@users.noreply.github.com> | 2016-10-05 16:16:21 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-05 16:16:21 +0200 |
commit | 046f33e21bb96429933fc37ad756105f0ec67873 (patch) | |
tree | c6aa518ebb32a4ab2e33ccbe4925e7aab7edeae3 /app | |
parent | 145d69fe5d79f8d4edf493ed42e80f73beb689a3 (diff) | |
parent | 15f1352ef8761d3e083fc17c8354c30ca3542050 (diff) | |
download | wallabag-046f33e21bb96429933fc37ad756105f0ec67873.tar.gz wallabag-046f33e21bb96429933fc37ad756105f0ec67873.tar.zst wallabag-046f33e21bb96429933fc37ad756105f0ec67873.zip |
Merge pull request #2374 from wallabag/clickable-tags
Clickable tags
Diffstat (limited to 'app')
-rwxr-xr-x | app/Resources/static/themes/baggy/css/main.css | 16 | ||||
-rwxr-xr-x | app/Resources/static/themes/material/css/main.css | 9 |
2 files changed, 24 insertions, 1 deletions
diff --git a/app/Resources/static/themes/baggy/css/main.css b/app/Resources/static/themes/baggy/css/main.css index 99ea6c6b..61e7b22a 100755 --- a/app/Resources/static/themes/baggy/css/main.css +++ b/app/Resources/static/themes/baggy/css/main.css | |||
@@ -383,9 +383,11 @@ footer a { | |||
383 | max-height: 2em; | 383 | max-height: 2em; |
384 | overflow-y: hidden; | 384 | overflow-y: hidden; |
385 | padding: 0; | 385 | padding: 0; |
386 | margin: 0; | ||
386 | } | 387 | } |
387 | 388 | ||
388 | .card-entry-tags li { | 389 | .card-entry-tags li, |
390 | .card-entry-tags span { | ||
389 | display: inline-block; | 391 | display: inline-block; |
390 | margin: 0 5px; | 392 | margin: 0 5px; |
391 | padding: 5px 12px; | 393 | padding: 5px 12px; |
@@ -394,9 +396,19 @@ footer a { | |||
394 | max-height: 2em; | 396 | max-height: 2em; |
395 | overflow: hidden; | 397 | overflow: hidden; |
396 | text-overflow: ellipsis; | 398 | text-overflow: ellipsis; |
399 | } | ||
400 | |||
401 | .card-entry-tags a, | ||
402 | .card-entry-labels a { | ||
403 | text-decoration: none; | ||
404 | font-weight: normal; | ||
397 | color: #fff; | 405 | color: #fff; |
398 | } | 406 | } |
399 | 407 | ||
408 | .nav-panel-add-tag { | ||
409 | margin-top: 10px; | ||
410 | } | ||
411 | |||
400 | .list-entries + .results { | 412 | .list-entries + .results { |
401 | margin-bottom: 2em; | 413 | margin-bottom: 2em; |
402 | } | 414 | } |
@@ -509,6 +521,7 @@ img.preview { | |||
509 | color: #666; | 521 | color: #666; |
510 | font-size: 0.9em; | 522 | font-size: 0.9em; |
511 | line-height: 1.7; | 523 | line-height: 1.7; |
524 | margin-top: 5px; | ||
512 | } | 525 | } |
513 | 526 | ||
514 | .entry h2 a::first-letter { | 527 | .entry h2 a::first-letter { |
@@ -1021,6 +1034,7 @@ blockquote { | |||
1021 | 1034 | ||
1022 | #article_toolbar li { | 1035 | #article_toolbar li { |
1023 | display: inline-block; | 1036 | display: inline-block; |
1037 | margin: 3px auto; | ||
1024 | } | 1038 | } |
1025 | 1039 | ||
1026 | #article_toolbar a { | 1040 | #article_toolbar a { |
diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css index 9c501de5..b66c88f9 100755 --- a/app/Resources/static/themes/material/css/main.css +++ b/app/Resources/static/themes/material/css/main.css | |||
@@ -445,6 +445,15 @@ main ul.row { | |||
445 | white-space: nowrap; | 445 | white-space: nowrap; |
446 | } | 446 | } |
447 | 447 | ||
448 | .card-entry-tags a, | ||
449 | .card-entry-labels a, | ||
450 | .card-entry-labels-hidden a, | ||
451 | #list .chip a { | ||
452 | text-decoration: none; | ||
453 | font-weight: normal; | ||
454 | color: #fff; | ||
455 | } | ||
456 | |||
448 | .card .card-content .estimatedTime { | 457 | .card .card-content .estimatedTime { |
449 | margin-bottom: 10px; | 458 | margin-bottom: 10px; |
450 | } | 459 | } |