From a9f61d3dbba07d25d4290572f157787c0b99dcfd Mon Sep 17 00:00:00 2001 From: Rurik19 Date: Wed, 4 Oct 2017 12:19:09 +0300 Subject: CORS repare for api --- app/config/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'app') diff --git a/app/config/config.yml b/app/config/config.yml index 0c2b6a1d..8bef8312 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -147,18 +147,18 @@ nelmio_cors: paths: '^/api/': allow_origin: ['*'] - allow_headers: ['X-Custom-Auth'] + allow_headers: ['Authorization','content-type'] allow_methods: ['POST', 'PUT', 'PATCH','GET', 'DELETE'] max_age: 3600 '^/oauth/': allow_origin: ['*'] - allow_headers: ['X-Custom-Auth'] + allow_headers: ['Authorization','content-type'] allow_methods: ['POST', 'PUT', 'GET', 'DELETE'] max_age: 3600 '^/': #origin_regex: true - allow_origin: ['^http://localhost:[0-9]+'] - allow_headers: ['X-Custom-Auth'] + allow_origin: ['*'] + allow_headers: ['Authorization','content-type'] allow_methods: ['POST', 'PUT', 'GET', 'DELETE'] max_age: 3600 hosts: ['^api\.'] -- cgit v1.2.3 From fb7dedf36c115b8658a014a7a50b003ea3b58f67 Mon Sep 17 00:00:00 2001 From: Kevin Decherf Date: Sat, 2 Mar 2019 22:48:43 +0100 Subject: material: move a media query from cards to dedicated scss file Signed-off-by: Kevin Decherf --- app/Resources/static/themes/material/css/cards.scss | 6 ------ app/Resources/static/themes/material/css/media_queries.scss | 4 ++++ 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'app') diff --git a/app/Resources/static/themes/material/css/cards.scss b/app/Resources/static/themes/material/css/cards.scss index 4f67e038..4cbeb7bd 100644 --- a/app/Resources/static/themes/material/css/cards.scss +++ b/app/Resources/static/themes/material/css/cards.scss @@ -272,9 +272,3 @@ a.original:not(.waves-effect) { .settings .div_tabs { padding-bottom: 15px; } - -@media only screen and (min-width: 992px) { - .card-tag-labels li { - max-width: 50%; - } -} diff --git a/app/Resources/static/themes/material/css/media_queries.scss b/app/Resources/static/themes/material/css/media_queries.scss index 72584426..56e6fd0f 100644 --- a/app/Resources/static/themes/material/css/media_queries.scss +++ b/app/Resources/static/themes/material/css/media_queries.scss @@ -12,6 +12,10 @@ .pagination { margin-left: auto; } + + .card-tag-labels li { + max-width: 50%; + } } @media only screen and (max-width: 992px) { -- cgit v1.2.3 From 05232afe3223242ef9563bb8a6ae13a462a043b0 Mon Sep 17 00:00:00 2001 From: Kevin Decherf Date: Sat, 2 Mar 2019 23:46:00 +0100 Subject: material: fix left padding of content on medium screens Fixes #3877 Signed-off-by: Kevin Decherf --- app/Resources/static/themes/material/css/media_queries.scss | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'app') diff --git a/app/Resources/static/themes/material/css/media_queries.scss b/app/Resources/static/themes/material/css/media_queries.scss index 56e6fd0f..1626365e 100644 --- a/app/Resources/static/themes/material/css/media_queries.scss +++ b/app/Resources/static/themes/material/css/media_queries.scss @@ -12,12 +12,18 @@ .pagination { margin-left: auto; } - + .card-tag-labels li { max-width: 50%; } } +@media screen and (min-width: 993px) { + main #content { + padding-left: 70px; + } +} + @media only screen and (max-width: 992px) { header, main, -- cgit v1.2.3 From f1f1efb5def331721e03bc55ac3be81fbae8fd01 Mon Sep 17 00:00:00 2001 From: Kevin Decherf Date: Sun, 3 Mar 2019 02:13:14 +0100 Subject: material: wrap card actions, remove class hiding of creation date Signed-off-by: Kevin Decherf --- app/Resources/static/themes/material/css/cards.scss | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'app') diff --git a/app/Resources/static/themes/material/css/cards.scss b/app/Resources/static/themes/material/css/cards.scss index 4cbeb7bd..68001a01 100644 --- a/app/Resources/static/themes/material/css/cards.scss +++ b/app/Resources/static/themes/material/css/cards.scss @@ -102,6 +102,11 @@ main { display: inline-flex; vertical-align: middle; + .card-reading-time, + .card-created-at { + display: inline-flex; + } + span { margin-right: 5px; } -- cgit v1.2.3 From 246cc9ac939f076fb7b2453e1b616a8b3500e1d1 Mon Sep 17 00:00:00 2001 From: Kevin Decherf Date: Sun, 3 Mar 2019 02:16:19 +0100 Subject: material: add media queries to hide creation date from card actions Hide the creation date from card actions on specific sizes when there's not enough space for all parts. Fixes #3851 Signed-off-by: Kevin Decherf --- app/Resources/static/themes/material/css/media_queries.scss | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'app') diff --git a/app/Resources/static/themes/material/css/media_queries.scss b/app/Resources/static/themes/material/css/media_queries.scss index 1626365e..32d8c484 100644 --- a/app/Resources/static/themes/material/css/media_queries.scss +++ b/app/Resources/static/themes/material/css/media_queries.scss @@ -174,3 +174,12 @@ padding: 0; } } + +@media screen and (max-width: 310px), + screen and (min-width: 601px) and (max-width: 660px), + screen and (min-width: 993px) and (max-width: 1050px), + screen and (min-width: 1201px) and (max-width: 1250px) { + .card .card-action .reading-time .card-created-at { + display: none; + } +} -- cgit v1.2.3 From f2aa3730549cacc5dbb00279a8b0cf980b23d67c Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Mon, 4 Mar 2019 09:32:26 +0100 Subject: Prepare 2.3.7 release --- app/config/wallabag.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app') diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml index 09b2f3a2..863c9345 100644 --- a/app/config/wallabag.yml +++ b/app/config/wallabag.yml @@ -1,5 +1,5 @@ wallabag_core: - version: 2.3.7-dev + version: 2.3.7 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" languages: en: 'English' -- cgit v1.2.3 From 3d7a1f4cafb1a12d20a92285f050beaddb78543f Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Mon, 4 Mar 2019 13:49:23 +0100 Subject: Jump to 2.3.8-dev --- app/config/wallabag.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app') diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml index 863c9345..96dfacf9 100644 --- a/app/config/wallabag.yml +++ b/app/config/wallabag.yml @@ -1,5 +1,5 @@ wallabag_core: - version: 2.3.7 + version: 2.3.8-dev paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" languages: en: 'English' -- cgit v1.2.3 From cf0010cf4adbefb8fc73d55474a1446a3a2f2f36 Mon Sep 17 00:00:00 2001 From: Kevin Decherf Date: Sat, 9 Mar 2019 00:27:50 +0100 Subject: material: fix left padding on non-entry pages introduced by #3893 Signed-off-by: Kevin Decherf --- app/Resources/static/themes/material/css/media_queries.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app') diff --git a/app/Resources/static/themes/material/css/media_queries.scss b/app/Resources/static/themes/material/css/media_queries.scss index 32d8c484..491eedce 100644 --- a/app/Resources/static/themes/material/css/media_queries.scss +++ b/app/Resources/static/themes/material/css/media_queries.scss @@ -19,7 +19,7 @@ } @media screen and (min-width: 993px) { - main #content { + body.entry main #content { padding-left: 70px; } } -- cgit v1.2.3