From: Nicolas Lœuillet <nicolas@loeuillet.org>
Date: Mon, 3 Oct 2016 07:09:45 +0000 (+0200)
Subject: Merge pull request #2314 from wallabag/assets
X-Git-Tag: 2.1.0~4
X-Git-Url: https://git.immae.eu/?p=github%2Fwallabag%2Fwallabag.git;a=commitdiff_plain;h=ab809de18415a9ce3bbc95d3a0a1af6c50a41c4f

Merge pull request #2314 from wallabag/assets

Assets work
---

ab809de18415a9ce3bbc95d3a0a1af6c50a41c4f
diff --cc app/Resources/static/themes/material/css/main.css
index 005cc302,67be1d22..00d7a869
--- a/app/Resources/static/themes/material/css/main.css
+++ b/app/Resources/static/themes/material/css/main.css
@@@ -352,10 -348,12 +348,11 @@@ main ul.row 
  .card .card-content .card-title {
    line-height: 32px;
    max-height: 64px;
 -  display: block;
  }
  
- .card .card-content i.right, .card .card-reveal i.right {
-     margin-left: 0;
+ .card .card-content i.right,
+ .card .card-reveal i.right {
+   margin-left: 0;
  }
  
  .card .card-entry-labels {