Merge pull request #2170 from wallabag/addTagsOnEntriesView

Add tags on entries view and minor ui fixes

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 {
   line-height: 32px;
 }
 
+.card .card-entry-labels {
+    position: absolute;
+    top:10px;
+    z-index: 90;
+    max-width: 50%;
+}
+
+.card .card-entry-labels li {
+    margin: 10px 10px 10px auto;
+    padding: 5px 12px 5px 16px;
+    background-color: rgba(0,151,167,0.85);
+    border-radius: 0 3px 3px 0;
+    color: #fff;
+    cursor: default;
+    max-height: 2em;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
+.card .card-entry-labels-hidden {
+    margin-top: 5px;
+}
+
+.card .card-entry-labels-hidden li {
+    display: inline-block;
+    background-color: rgba(0,151,167,0.85);
+    margin: 0 5px;
+    padding: 5px 12px;
+    border-radius: 3px;
+    color: #fff;
+    max-height: 2em;
+    max-width: calc(100% - 15px);
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
 .card .card-content .estimatedTime {
   margin-bottom: 10px;
 }
@@ -401,6 +439,10 @@ main ul.row {
   height: auto;
 }
 
+#article > header > h1 {
+  font-size: 2em;
+}
+
 .reader-mode {
   width: 95px !important;
   transition: width 0.2s ease;
@@ -445,12 +487,13 @@ main ul.row {
 
 #article aside #list {
   float: right;
-  margin-right: 15px;
+  margin: 0 15px 10px;
 }
 
 #article aside .chip {
-  background-color: #039be5;
+  background-color: rgba(0,151,167,0.85);
   color: #fff;
+  padding: 0 15px 0 10px;
 }
 
 #article aside .chip i {