aboutsummaryrefslogtreecommitdiffhomepage
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/Resources/static/themes/baggy/css/ratatouille.css3
-rwxr-xr-xapp/Resources/static/themes/material/css/main.css3
-rw-r--r--app/config/config.yml7
3 files changed, 9 insertions, 4 deletions
diff --git a/app/Resources/static/themes/baggy/css/ratatouille.css b/app/Resources/static/themes/baggy/css/ratatouille.css
index bf89d881..b5aeb54e 100644
--- a/app/Resources/static/themes/baggy/css/ratatouille.css
+++ b/app/Resources/static/themes/baggy/css/ratatouille.css
@@ -63,8 +63,7 @@ pre {
63 max-width: 61.25em; /* 980px */ 63 max-width: 61.25em; /* 980px */
64} 64}
65 65
66table, 66table, img, figure {
67img {
68 max-width: 100%; 67 max-width: 100%;
69 height: auto; 68 height: auto;
70} 69}
diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css
index 2ffe0b46..cade37f6 100755
--- a/app/Resources/static/themes/material/css/main.css
+++ b/app/Resources/static/themes/material/css/main.css
@@ -436,7 +436,8 @@ main ul.row {
436 max-width: 40em; 436 max-width: 40em;
437} 437}
438 438
439#article img { 439#article img,
440#article figure {
440 max-width: 100%; 441 max-width: 100%;
441 height: auto; 442 height: auto;
442} 443}
diff --git a/app/config/config.yml b/app/config/config.yml
index a1517e97..80754393 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.0.5 33 version: 2.0.7
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'
@@ -140,6 +140,11 @@ nelmio_cors:
140 '^/api/': 140 '^/api/':
141 allow_origin: ['*'] 141 allow_origin: ['*']
142 allow_headers: ['X-Custom-Auth'] 142 allow_headers: ['X-Custom-Auth']
143 allow_methods: ['POST', 'PUT', 'PATCH','GET', 'DELETE']
144 max_age: 3600
145 '^/oauth/':
146 allow_origin: ['*']
147 allow_headers: ['X-Custom-Auth']
143 allow_methods: ['POST', 'PUT', 'GET', 'DELETE'] 148 allow_methods: ['POST', 'PUT', 'GET', 'DELETE']
144 max_age: 3600 149 max_age: 3600
145 '^/': 150 '^/':