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

3 files changed, 10 insertions, 3 deletions

diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css
index b66c88f9..d91b469f 100755
--- a/app/Resources/static/themes/material/css/main.css
+++ b/app/Resources/static/themes/material/css/main.css
@@ -414,9 +414,10 @@ main ul.row {
   max-width: 50%;
 }
 
-.card .card-entry-labels li {
+.card .card-entry-labels li,
+.card-tag-labels li {
   margin: 10px 10px 10px auto;
-  padding: 5px 12px 5px 16px;
+  padding: 5px 12px 5px 16px !important;
   background-color: rgba(0, 151, 167, 0.85);
   border-radius: 0 3px 3px 0;
   color: #fff;
@@ -447,6 +448,7 @@ main ul.row {
 
 .card-entry-tags a,
 .card-entry-labels a,
+.card-tag-labels a,
 .card-entry-labels-hidden a,
 #list .chip a {
   text-decoration: none;
diff --git a/app/config/config.yml b/app/config/config.yml
index 75d7299c..bcc4c8eb 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -30,7 +30,7 @@ framework:
     assets: ~
 
 wallabag_core:
-    version: 2.1.1
+    version: 2.1.2-dev
     paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
     languages:
         en: 'English'
diff --git a/app/config/routing.yml b/app/config/routing.yml
index 2be74d7f..750ed435 100644
--- a/app/config/routing.yml
+++ b/app/config/routing.yml
@@ -13,6 +13,11 @@ wallabag_user:
     prefix: /users
 
 wallabag_api:
+    resource: "@WallabagApiBundle/Controller/"
+    type: annotation
+    prefix: /
+
+wallabag_api:
     resource: "@WallabagApiBundle/Resources/config/routing.yml"
     prefix: /