From cc07f9e463fff0416261d0fd13cae776f13c13a5 Mon Sep 17 00:00:00 2001 From: Nursoltan Saipolda Date: Mon, 24 Oct 2022 16:15:37 +0800 Subject: [PATCH 1/3] fix reject api call --- src/shared/services/timelineWall.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/shared/services/timelineWall.js b/src/shared/services/timelineWall.js index 7ca916e706..fd7865a887 100644 --- a/src/shared/services/timelineWall.js +++ b/src/shared/services/timelineWall.js @@ -182,7 +182,10 @@ export const rejectEventById = async (tokenV3, id, body, successFn) => { try { fetch(`${baseUrl}/timelineEvents/${id}/reject`, { method: 'PUT', - headers: { Authorization: `Bearer ${tokenV3}` }, + headers: { + Authorization: `Bearer ${tokenV3}`, + 'Content-Type': 'application/json; charset=utf-8', + }, body: JSON.stringify(body), }).then(() => { successFn(); From 9fecc5991db0fa419e69db556b8dd38e024d9f57 Mon Sep 17 00:00:00 2001 From: Nursoltan Saipolda Date: Mon, 24 Oct 2022 16:46:44 +0800 Subject: [PATCH 2/3] issue10: side navigation style --- .../timeline-events/right-filter/styles.scss | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/shared/containers/timeline-wall/timeline-events/right-filter/styles.scss b/src/shared/containers/timeline-wall/timeline-events/right-filter/styles.scss index 6cd6cf43e5..099ea57179 100644 --- a/src/shared/containers/timeline-wall/timeline-events/right-filter/styles.scss +++ b/src/shared/containers/timeline-wall/timeline-events/right-filter/styles.scss @@ -54,8 +54,19 @@ padding: 10px 0; position: fixed; right: 0; + left: 1374px; max-height: 70%; overflow: scroll; + -ms-overflow-style: none; /* Internet Explorer 10+ */ + scrollbar-width: none; /* Firefox */ + + &::-webkit-scrollbar { + display: none; /* Safari and Chrome */ + } + + @media (max-width: 1500px) { + left: unset; + } @media (max-width: 768px) { border-radius: 0; From 97f26b5e2c54d0688e6a2a7d54b4696451ed6592 Mon Sep 17 00:00:00 2001 From: Nursoltan Saipolda Date: Mon, 24 Oct 2022 16:58:18 +0800 Subject: [PATCH 3/3] fix border radius --- .../timeline-wall/timeline-events/right-filter/styles.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/shared/containers/timeline-wall/timeline-events/right-filter/styles.scss b/src/shared/containers/timeline-wall/timeline-events/right-filter/styles.scss index 099ea57179..ce83f8f22d 100644 --- a/src/shared/containers/timeline-wall/timeline-events/right-filter/styles.scss +++ b/src/shared/containers/timeline-wall/timeline-events/right-filter/styles.scss @@ -50,7 +50,8 @@ display: flex; flex-direction: column; width: 120px; - border-radius: 8px; + border-top-left-radius: 8px; + border-bottom-left-radius: 8px; padding: 10px 0; position: fixed; right: 0;