]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Merge pull request #2314 from wallabag/assets
authorNicolas LÅ“uillet <nicolas@loeuillet.org>
Mon, 3 Oct 2016 07:09:45 +0000 (09:09 +0200)
committerGitHub <noreply@github.com>
Mon, 3 Oct 2016 07:09:45 +0000 (09:09 +0200)
Assets work

1  2 
app/Resources/static/themes/material/css/main.css
src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig

index 005cc30207e1205980237d8cce78a9eca7cf6dbd,67be1d22911828eaf59c611d3ce1a534f1d6b56a..00d7a8699e1f52320cbf87566c08846e4d459f37
@@@ -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 {