diff --git a/kolibri/plugins/learn/assets/src/views/TopicsPage/ToggleHeaderTabs.vue b/kolibri/plugins/learn/assets/src/views/TopicsPage/ToggleHeaderTabs.vue index f75134bc297..8b739a90d89 100644 --- a/kolibri/plugins/learn/assets/src/views/TopicsPage/ToggleHeaderTabs.vue +++ b/kolibri/plugins/learn/assets/src/views/TopicsPage/ToggleHeaderTabs.vue @@ -4,7 +4,8 @@ v-show="!$isPrint" class="tab-block" :style="{ - borderBottomColor: !$isPrint ? $themeTokens.fineLine : 'transparent', + backgroundColor: $themeTokens.surface, + borderBottom: `1px solid ${$themeTokens.fineLine}` }" > @@ -63,8 +62,9 @@ /> - - +
+ +
@@ -114,7 +114,7 @@ @import '~kolibri-design-system/lib/styles/definitions'; - $header-height: 324px; + $header-height: 274px; $toolbar-height: 70px; .header { diff --git a/kolibri/plugins/learn/assets/src/views/TopicsPage/index.vue b/kolibri/plugins/learn/assets/src/views/TopicsPage/index.vue index 8f0579ffb3a..63992921f9a 100644 --- a/kolibri/plugins/learn/assets/src/views/TopicsPage/index.vue +++ b/kolibri/plugins/learn/assets/src/views/TopicsPage/index.vue @@ -36,7 +36,33 @@ :description="topic && topic.description" :thumbnail="topic && topic.thumbnail" :breadcrumbs="breadcrumbs" - /> + > + + @@ -157,31 +183,6 @@ @loadMoreTopics="handleLoadMoreInTopic" @close="sidePanelIsOpen = false" /> - - - - 0) { - this.tabPosition = { - position: 'fixed', - top: `${tabBottom - 70}px`, - }; - } else { - this.tabPosition = {}; - } - }, // Stick the side panel to top. That can be on the very top of the viewport // or right under the 'Browse channel' toolbar, depending on whether the toolbar // is visible or no (the toolbar hides on smaller resolutions when scrolling @@ -692,7 +675,7 @@ const headerBottom = header ? header.getBoundingClientRect().bottom : 0; const topbarBottom = topbar ? topbar.getBoundingClientRect().bottom : 0; - if (headerBottom < Math.max(topbarBottom, 0)) { + if (header && headerBottom < Math.max(topbarBottom, 0)) { this.sidePanelStyleOverrides = { position: 'fixed', top: `${Math.max(0, headerBottom, topbarBottom)}px`, @@ -751,7 +734,7 @@ $header-height: 324px; $toolbar-height: 70px; - $total-height: 394px; + $total-height: 324px; .page { position: relative; @@ -762,12 +745,13 @@ .side-panel { position: absolute; top: $total-height; + min-height: calc(100vh - #{$toolbar-height}); padding-top: 16px; } .main-content-grid { position: relative; - top: $toolbar-height; + top: 120px; margin: 24px; }