aboutsummaryrefslogtreecommitdiffhomepage
path: root/app/Resources
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2016-06-24 14:23:38 +0200
committerGitHub <noreply@github.com>2016-06-24 14:23:38 +0200
commit33e2aec18b25d2c47774fede22ecd91e936b4400 (patch)
treeadc266a43baf13509c119bbbab8be7cc06dadd2b /app/Resources
parentb1c9b78203710ad4cfd601b06bf1ec384595b3f3 (diff)
parenteef833d644f90518c712eccac7805d99562fd263 (diff)
downloadwallabag-33e2aec18b25d2c47774fede22ecd91e936b4400.tar.gz
wallabag-33e2aec18b25d2c47774fede22ecd91e936b4400.tar.zst
wallabag-33e2aec18b25d2c47774fede22ecd91e936b4400.zip
Merge pull request #2170 from wallabag/addTagsOnEntriesView
Add tags on entries view and minor ui fixes
Diffstat (limited to 'app/Resources')
-rwxr-xr-xapp/Resources/static/themes/material/css/main.css47
1 files changed, 45 insertions, 2 deletions
diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css
index 473b0308..053dfd91 100755
--- a/app/Resources/static/themes/material/css/main.css
+++ b/app/Resources/static/themes/material/css/main.css
@@ -342,6 +342,44 @@ main ul.row {
342 line-height: 32px; 342 line-height: 32px;
343} 343}
344 344
345.card .card-entry-labels {
346 position: absolute;
347 top:10px;
348 z-index: 90;
349 max-width: 50%;
350}
351
352.card .card-entry-labels li {
353 margin: 10px 10px 10px auto;
354 padding: 5px 12px 5px 16px;
355 background-color: rgba(0,151,167,0.85);
356 border-radius: 0 3px 3px 0;
357 color: #fff;
358 cursor: default;
359 max-height: 2em;
360 overflow: hidden;
361 text-overflow: ellipsis;
362 white-space: nowrap;
363}
364
365.card .card-entry-labels-hidden {
366 margin-top: 5px;
367}
368
369.card .card-entry-labels-hidden li {
370 display: inline-block;
371 background-color: rgba(0,151,167,0.85);
372 margin: 0 5px;
373 padding: 5px 12px;
374 border-radius: 3px;
375 color: #fff;
376 max-height: 2em;
377 max-width: calc(100% - 15px);
378 overflow: hidden;
379 text-overflow: ellipsis;
380 white-space: nowrap;
381}
382
345.card .card-content .estimatedTime { 383.card .card-content .estimatedTime {
346 margin-bottom: 10px; 384 margin-bottom: 10px;
347} 385}
@@ -401,6 +439,10 @@ main ul.row {
401 height: auto; 439 height: auto;
402} 440}
403 441
442#article > header > h1 {
443 font-size: 2em;
444}
445
404.reader-mode { 446.reader-mode {
405 width: 95px !important; 447 width: 95px !important;
406 transition: width 0.2s ease; 448 transition: width 0.2s ease;
@@ -445,12 +487,13 @@ main ul.row {
445 487
446#article aside #list { 488#article aside #list {
447 float: right; 489 float: right;
448 margin-right: 15px; 490 margin: 0 15px 10px;
449} 491}
450 492
451#article aside .chip { 493#article aside .chip {
452 background-color: #039be5; 494 background-color: rgba(0,151,167,0.85);
453 color: #fff; 495 color: #fff;
496 padding: 0 15px 0 10px;
454} 497}
455 498
456#article aside .chip i { 499#article aside .chip i {