From: Jeremy Benoist <j0k3r@users.noreply.github.com>
Date: Mon, 24 Aug 2015 10:16:08 +0000 (+0200)
Subject: Merge pull request #1395 from wallabag/v2-fix-1378
X-Git-Tag: 2.0.0-alpha.0~8
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=8c55a9e6c9a563c3a4b3b3d35581e1c67a8a8c04;hp=-c;p=github%2Fwallabag%2Fwallabag.git

Merge pull request #1395 from wallabag/v2-fix-1378

fix #1378: nice display for tags list
---

8c55a9e6c9a563c3a4b3b3d35581e1c67a8a8c04
diff --combined src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css
index 1d50faf7,286fa641..6c139b72
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/css/main.css
@@@ -303,6 -303,30 +303,30 @@@ main ul.row 
      margin: 0;
      z-index: 9999;
  }
+ 
+ #article aside .link {
+     color: #000;
+     font-size: 0.6em;
+     text-decoration: none;
+ }
+ 
+ #article aside #list {
+     float: right;
+     margin-right: 15px;
+ }
+ 
+ #article aside span a {
+     background-color: #039be5;
+     color: #fff;
+     border-radius: 3px;
+     float: left;
+     font-size: 0.6em;
+     margin-left: 0.5em;
+     margin-bottom: 0.5em;
+     padding: 4px;
+     text-decoration: none;
+ }
+ 
  /* ==========================================================================
     6 = Media queries
     ========================================================================== */
@@@ -367,7 -391,6 +391,7 @@@
     7 = Others
     ========================================================================== */
  
 -div.input-field div, div.input-field ul {
 +/* force height on non-input field in the settings page */
 +div.settings div.input-field div, div.settings div.input-field ul {
      margin-top: 40px;
  }