diff options
Diffstat (limited to 'app')
-rw-r--r-- | app/Resources/static/themes/material/css/cards.scss | 11 | ||||
-rw-r--r-- | app/Resources/static/themes/material/css/media_queries.scss | 19 | ||||
-rw-r--r-- | app/config/config.yml | 8 | ||||
-rw-r--r-- | app/config/wallabag.yml | 2 |
4 files changed, 29 insertions, 11 deletions
diff --git a/app/Resources/static/themes/material/css/cards.scss b/app/Resources/static/themes/material/css/cards.scss index 1acc03dc..c893b376 100644 --- a/app/Resources/static/themes/material/css/cards.scss +++ b/app/Resources/static/themes/material/css/cards.scss | |||
@@ -102,6 +102,11 @@ main { | |||
102 | display: inline-flex; | 102 | display: inline-flex; |
103 | vertical-align: middle; | 103 | vertical-align: middle; |
104 | 104 | ||
105 | .card-reading-time, | ||
106 | .card-created-at { | ||
107 | display: inline-flex; | ||
108 | } | ||
109 | |||
105 | span { | 110 | span { |
106 | margin-right: 5px; | 111 | margin-right: 5px; |
107 | } | 112 | } |
@@ -283,9 +288,3 @@ a.original:not(.waves-effect) { | |||
283 | .settings .div_tabs { | 288 | .settings .div_tabs { |
284 | padding-bottom: 15px; | 289 | padding-bottom: 15px; |
285 | } | 290 | } |
286 | |||
287 | @media only screen and (min-width: 992px) { | ||
288 | .card-tag-labels li { | ||
289 | max-width: 50%; | ||
290 | } | ||
291 | } | ||
diff --git a/app/Resources/static/themes/material/css/media_queries.scss b/app/Resources/static/themes/material/css/media_queries.scss index 72584426..491eedce 100644 --- a/app/Resources/static/themes/material/css/media_queries.scss +++ b/app/Resources/static/themes/material/css/media_queries.scss | |||
@@ -12,6 +12,16 @@ | |||
12 | .pagination { | 12 | .pagination { |
13 | margin-left: auto; | 13 | margin-left: auto; |
14 | } | 14 | } |
15 | |||
16 | .card-tag-labels li { | ||
17 | max-width: 50%; | ||
18 | } | ||
19 | } | ||
20 | |||
21 | @media screen and (min-width: 993px) { | ||
22 | body.entry main #content { | ||
23 | padding-left: 70px; | ||
24 | } | ||
15 | } | 25 | } |
16 | 26 | ||
17 | @media only screen and (max-width: 992px) { | 27 | @media only screen and (max-width: 992px) { |
@@ -164,3 +174,12 @@ | |||
164 | padding: 0; | 174 | padding: 0; |
165 | } | 175 | } |
166 | } | 176 | } |
177 | |||
178 | @media screen and (max-width: 310px), | ||
179 | screen and (min-width: 601px) and (max-width: 660px), | ||
180 | screen and (min-width: 993px) and (max-width: 1050px), | ||
181 | screen and (min-width: 1201px) and (max-width: 1250px) { | ||
182 | .card .card-action .reading-time .card-created-at { | ||
183 | display: none; | ||
184 | } | ||
185 | } | ||
diff --git a/app/config/config.yml b/app/config/config.yml index 2d8f9bf0..078f277a 100644 --- a/app/config/config.yml +++ b/app/config/config.yml | |||
@@ -148,18 +148,18 @@ nelmio_cors: | |||
148 | paths: | 148 | paths: |
149 | '^/api/': | 149 | '^/api/': |
150 | allow_origin: ['*'] | 150 | allow_origin: ['*'] |
151 | allow_headers: ['X-Custom-Auth'] | 151 | allow_headers: ['Authorization','content-type'] |
152 | allow_methods: ['POST', 'PUT', 'PATCH','GET', 'DELETE'] | 152 | allow_methods: ['POST', 'PUT', 'PATCH','GET', 'DELETE'] |
153 | max_age: 3600 | 153 | max_age: 3600 |
154 | '^/oauth/': | 154 | '^/oauth/': |
155 | allow_origin: ['*'] | 155 | allow_origin: ['*'] |
156 | allow_headers: ['X-Custom-Auth'] | 156 | allow_headers: ['Authorization','content-type'] |
157 | allow_methods: ['POST', 'PUT', 'GET', 'DELETE'] | 157 | allow_methods: ['POST', 'PUT', 'GET', 'DELETE'] |
158 | max_age: 3600 | 158 | max_age: 3600 |
159 | '^/': | 159 | '^/': |
160 | #origin_regex: true | 160 | #origin_regex: true |
161 | allow_origin: ['^http://localhost:[0-9]+'] | 161 | allow_origin: ['*'] |
162 | allow_headers: ['X-Custom-Auth'] | 162 | allow_headers: ['Authorization','content-type'] |
163 | allow_methods: ['POST', 'PUT', 'GET', 'DELETE'] | 163 | allow_methods: ['POST', 'PUT', 'GET', 'DELETE'] |
164 | max_age: 3600 | 164 | max_age: 3600 |
165 | hosts: ['^api\.'] | 165 | hosts: ['^api\.'] |
diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml index 09b2f3a2..96dfacf9 100644 --- a/app/config/wallabag.yml +++ b/app/config/wallabag.yml | |||
@@ -1,5 +1,5 @@ | |||
1 | wallabag_core: | 1 | wallabag_core: |
2 | version: 2.3.7-dev | 2 | version: 2.3.8-dev |
3 | paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" | 3 | paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" |
4 | languages: | 4 | languages: |
5 | en: 'English' | 5 | en: 'English' |