aboutsummaryrefslogtreecommitdiffhomepage
path: root/app
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2016-10-11 21:01:30 +0200
committerJeremy Benoist <jeremy.benoist@gmail.com>2016-10-11 21:01:30 +0200
commite4cf672ccf61689ba28c2e89fc55f83167800b18 (patch)
tree5dc22c97797bdcdd0a3d2a7e182410f04a748c1e /app
parente57df5611fe82ce61a71d51c762ee9296f18c3ac (diff)
parentdbe94e73a9eaf3acb250812913b0303b35d01a2e (diff)
downloadwallabag-e4cf672ccf61689ba28c2e89fc55f83167800b18.tar.gz
wallabag-e4cf672ccf61689ba28c2e89fc55f83167800b18.tar.zst
wallabag-e4cf672ccf61689ba28c2e89fc55f83167800b18.zip
Merge remote-tracking branch 'origin/master' into 2.2
Diffstat (limited to 'app')
-rwxr-xr-xapp/Resources/static/themes/material/css/main.css6
-rw-r--r--app/config/config.yml2
-rw-r--r--app/config/routing.yml5
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 {
414 max-width: 50%; 414 max-width: 50%;
415} 415}
416 416
417.card .card-entry-labels li { 417.card .card-entry-labels li,
418.card-tag-labels li {
418 margin: 10px 10px 10px auto; 419 margin: 10px 10px 10px auto;
419 padding: 5px 12px 5px 16px; 420 padding: 5px 12px 5px 16px !important;
420 background-color: rgba(0, 151, 167, 0.85); 421 background-color: rgba(0, 151, 167, 0.85);
421 border-radius: 0 3px 3px 0; 422 border-radius: 0 3px 3px 0;
422 color: #fff; 423 color: #fff;
@@ -447,6 +448,7 @@ main ul.row {
447 448
448.card-entry-tags a, 449.card-entry-tags a,
449.card-entry-labels a, 450.card-entry-labels a,
451.card-tag-labels a,
450.card-entry-labels-hidden a, 452.card-entry-labels-hidden a,
451#list .chip a { 453#list .chip a {
452 text-decoration: none; 454 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:
30 assets: ~ 30 assets: ~
31 31
32wallabag_core: 32wallabag_core:
33 version: 2.1.1 33 version: 2.1.2-dev
34 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" 34 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
35 languages: 35 languages:
36 en: 'English' 36 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:
13 prefix: /users 13 prefix: /users
14 14
15wallabag_api: 15wallabag_api:
16 resource: "@WallabagApiBundle/Controller/"
17 type: annotation
18 prefix: /
19
20wallabag_api:
16 resource: "@WallabagApiBundle/Resources/config/routing.yml" 21 resource: "@WallabagApiBundle/Resources/config/routing.yml"
17 prefix: / 22 prefix: /
18 23