Merge remote-tracking branch 'origin/master' into 2.2

[github/wallabag/wallabag.git] / app / Resources / static / themes / baggy / css / main.css

diff --git a/app/Resources/static/themes/baggy/css/main.css b/app/Resources/static/themes/baggy/css/main.css
index eeedd2774f48d4909f2508bd93da49cedd97ec30..4f48f8cae741da4b55d7461ef3eeb3295c1330c2 100755 (executable)
--- a/app/Resources/static/themes/baggy/css/main.css
+++ b/app/Resources/static/themes/baggy/css/main.css
@@ -383,9 +383,11 @@ footer a {
   max-height: 2em;
   overflow-y: hidden;
   padding: 0;
+  margin: 0;
 }
 
-.card-entry-tags li {
+.card-entry-tags li,
+.card-entry-tags span {
   display: inline-block;
   margin: 0 5px;
   padding: 5px 12px;
@@ -394,14 +396,25 @@ footer a {
   max-height: 2em;
   overflow: hidden;
   text-overflow: ellipsis;
+}
+
+.card-entry-tags a,
+.card-entry-labels a {
+  text-decoration: none;
+  font-weight: normal;
   color: #fff;
 }
 
+.nav-panel-add-tag {
+  margin-top: 10px;
+}
+
 .list-entries + .results {
   margin-bottom: 2em;
 }
 
-.estimatedTime .reading-time {
+.reading-time,
+.created-at {
   color: #999;
   font-style: italic;
   font-weight: normal;
@@ -509,6 +522,7 @@ img.preview {
   color: #666;
   font-size: 0.9em;
   line-height: 1.7;
+  margin-top: 5px;
 }
 
 .entry h2 a::first-letter {
@@ -568,7 +582,6 @@ img.preview {
 
 div.pagination ul {
   text-align: right;
-  margin-bottom: 50px;
 }
 
 .nb-results {
@@ -796,6 +809,15 @@ a.add-to-wallabag-link-after::after {
   text-transform: none;
   line-height: 1;
 
+  /* Enable Ligatures ================ */
+  letter-spacing: 0;
+  -webkit-font-feature-settings: "liga";
+  -moz-font-feature-settings: "liga=1";
+  -moz-font-feature-settings: "liga";
+  -ms-font-feature-settings: "liga" 1;
+  -o-font-feature-settings: "liga";
+  font-feature-settings: "liga";
+
   /* Better Font Rendering =========== */
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
@@ -838,7 +860,7 @@ a.add-to-wallabag-link-after::after {
 }
 
 .icon-twitter::before {
-  content: "\ea91";
+  content: "\ea96";
 }
 
 .icon-down-open::before {
@@ -877,6 +899,22 @@ a.add-to-wallabag-link-after::after {
   content: "\e936";
 }
 
+.icon-eye::before {
+  content: "\e9ce";
+}
+
+.icon-no-eye::before {
+  content: "\e9d1";
+}
+
+.icon-calendar::before {
+  content: "\e953";
+}
+
+.icon-time::before {
+  content: "\e952";
+}
+
 /* .icon-image class, for image-based icons
   ========================================================================== */
 
@@ -898,6 +936,16 @@ a.add-to-wallabag-link-after::after {
   background-image: url("../../_global/img/icons/diaspora-icon--black.png");
 }
 
+/* Unmark.it */
+.icon-image--unmark {
+  background-image: url("../../_global/img/icons/unmark-icon--black.png");
+}
+
+/* shaarli */
+.icon-image--shaarli {
+  background-image: url("../../_global/img/icons/shaarli.png");
+}
+
 /* ==========================================================================
    Icon selected
    ========================================================================== */
@@ -991,6 +1039,7 @@ blockquote {
 
 #article_toolbar li {
   display: inline-block;
+  margin: 3px auto;
 }
 
 #article_toolbar a {
@@ -1148,6 +1197,14 @@ pre code {
   }
 }
 
+@media screen and (max-height: 770px) {
+  .menu.users,
+  .menu.internal,
+  .menu.developer {
+    display: none;
+  }
+}
+
 @media screen and (max-width: 500px) {
   .entry {
     width: 100%;