From b5829a905850b849619dbc86364ecbbd34d9beaa Mon Sep 17 00:00:00 2001 From: Akmal Djumakhodjaev Date: Thu, 17 Jun 2021 11:25:30 +0800 Subject: [PATCH 1/3] Fix jumping market selector --- sass/components/_chart-title.scss | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sass/components/_chart-title.scss b/sass/components/_chart-title.scss index 1e834a4d1..ba5541f35 100644 --- a/sass/components/_chart-title.scss +++ b/sass/components/_chart-title.scss @@ -87,7 +87,9 @@ .cq-symbol-info { display: flex; flex-direction: column; - margin: 0 10px 0 20px; + margin: 0 0 0 20px; + min-width: 15rem; + min-height: 4.2rem; .cq-market { font-size: 1em; @@ -114,6 +116,8 @@ font-size: 1.6em; text-align: left; line-height: 24px; + width: auto; + padding-right: 1rem; @include themify($themes) { color: themed('ChartTitleSymbolText'); } From 1bb7bcd273b9efaf06f41f1812a6bf0311eb8541 Mon Sep 17 00:00:00 2001 From: Akmal Djumakhodjaev Date: Thu, 17 Jun 2021 14:25:39 +0800 Subject: [PATCH 2/3] Added media query --- sass/components/_chart-title.scss | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sass/components/_chart-title.scss b/sass/components/_chart-title.scss index ba5541f35..46101d5e1 100644 --- a/sass/components/_chart-title.scss +++ b/sass/components/_chart-title.scss @@ -88,8 +88,10 @@ display: flex; flex-direction: column; margin: 0 0 0 20px; - min-width: 15rem; - min-height: 4.2rem; + @media (min-width: 768px) { + min-width: 15rem; + min-height: 4.2rem; + } .cq-market { font-size: 1em; From ae5c2e4570a8585e857b13c2c5eb6f4778e954cc Mon Sep 17 00:00:00 2001 From: Akmal Djumakhodjaev Date: Thu, 24 Jun 2021 15:09:10 +0800 Subject: [PATCH 3/3] Fix: market tabs are not scrolled after window resize --- src/store/CategoricalDisplayStore.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/store/CategoricalDisplayStore.js b/src/store/CategoricalDisplayStore.js index 56dfa69fb..d553826bb 100644 --- a/src/store/CategoricalDisplayStore.js +++ b/src/store/CategoricalDisplayStore.js @@ -247,6 +247,15 @@ export default class CategoricalDisplayStore { return; } + if (!this.mainStore.chart.isMobile) { + const categories = Object.keys(this.categoryElements); + const last_category = categories.pop(); + const last_category_bottom_gap = this.height - (64 + categories.length * 40); // to make the last category height reach it's filter tab + if (this.categoryElements[last_category]) { + this.categoryElements[last_category].style.minHeight = `${last_category_bottom_gap}px`; + } + } + // hits: 40px for title hight + 4px for content bottom border const categoryTitleHeight = 44; const scrollPanelTop = this.scrollPanel.getBoundingClientRect().top;