Merge pull request #8143 from sairina/exercise-scroll

learningequality · Jun 11, 2021 · 56482a4 · 56482a4
2 parents adf80ee + 4254ff0
commit 56482a4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 21 deletions.
diff --git a/kolibri/core/assets/src/views/MultiPaneLayout.vue b/kolibri/core/assets/src/views/MultiPaneLayout.vue
@@ -52,29 +52,16 @@
     name: 'MultiPaneLayout',
     mixins: [responsiveWindowMixin, responsiveElementMixin],
     computed: {
-      maxHeight() {
-        const APP_BAR_HEIGHT = this.windowIsSmall ? 56 : 64;
-        const PADDING = this.windowIsSmall ? 16 : 32;
-        const MARGIN = 16;
-        let maxHeight = this.windowHeight - APP_BAR_HEIGHT - PADDING * 2 - MARGIN;
-        if (this.$refs.header) {
-          maxHeight = maxHeight - this.$refs.header.clientHeight;
-        }
-        if (this.$refs.footer) {
-          maxHeight = maxHeight - this.$refs.footer.clientHeight;
-        }
-        return maxHeight;
-      },
       styles() {
         return {
           header: {
             borderBottomColor: this.$themeTokens.textDisabled,
           },
           aside: {
-            maxHeight: `${this.maxHeight}px`,
+            maxHeight: `${this.windowHeight}px`,
           },
           main: {
-            maxHeight: this.$slots.aside ? `${this.maxHeight}px` : '',
+            maxHeight: this.$slots.aside ? `${this.windowHeight}px` : '',
           },
           footer: {
             borderTopColor: this.$themeTokens.textDisabled,
@@ -103,8 +90,9 @@
     border-bottom-width: 1px;
   }
 
-  .aside,
-  .main {
+  .main,
+  .aside {
+    height: 100%;
     overflow-y: auto;
   }
 

diff --git a/kolibri/plugins/coach/assets/src/views/plan/LessonContentPreviewPage/index.vue b/kolibri/plugins/coach/assets/src/views/plan/LessonContentPreviewPage/index.vue
@@ -5,17 +5,17 @@
       <div>
         <KGrid>
           <KGridItem
-            :layout8="{ span: 4 }"
-            :layout12="{ span: 6 }"
+            :layout8="{ span: 6 }"
+            :layout12="{ span: 9 }"
           >
             <h1>
               <KLabeledIcon :icon="content.kind" :label="content.title" />
             </h1>
           </KGridItem>
           <KGridItem
             :layout="{ alignment: 'right' }"
-            :layout8="{ span: 4 }"
-            :layout12="{ span: 6 }"
+            :layout8="{ span: 2 }"
+            :layout12="{ span: 3 }"
           >
             <template v-if="displaySelectOptions">
               <template v-if="isSelected">