Merge branch '4.0.0-dev' into instructor-analytics-free

Author: sanjana4khan

assets/core/scss/components/_tooltip.scss

@@ -21,17 +21,18 @@
   @include tutor-typography('tiny', 'regular', 'primary-inverse');
   position: fixed;
   z-index: 1070;
-  max-width: 200px;
+  max-width: 180px;
   padding: $tutor-spacing-4;
   background-color: $tutor-surface-dark;
   border-radius: $tutor-radius-sm;
   box-shadow: $tutor-shadow-md;
   word-wrap: break-word;
-  text-align: start;
+  text-align: center;
 
   &-large {
     max-width: 320px;
     padding: $tutor-spacing-5;
+    text-align: start;
   }
 
   &-arrow-start {

assets/core/scss/main.scss

@@ -45,6 +45,23 @@ body {
   @include tutor-transition((background-color, color));
 }
 
+.tutor-dashboard-layout,
+.tutor-learning-area,
+.tutor-account-page-wrapper {
+  min-height: 100vh;
+  background-color: $tutor-surface-base;
+
+  a {
+    text-decoration: none;
+    color: inherit;
+
+    &:hover {
+      text-decoration: none;
+      color: inherit;
+    }
+  }
+}
+
 // Remove default margin in all browsers
 h1,
 h2,
@@ -66,24 +83,14 @@ ol {
   list-style: none;
 }
 
-li > ol,
-li > ul,
+li>ol,
+li>ul,
 ol,
 ul {
   padding: 0;
 }
 
-a  {
-  text-decoration: none;
-  color: inherit;
-
-  &:hover {
-    text-decoration: none;
-    color: inherit;
-  }
-}
-
 // Alpine.js cloak utility
 [x-cloak] {
   display: none !important;
-}
+}

assets/core/scss/mixins/_buttons.scss

@@ -166,7 +166,7 @@
     color: $tutor-text-primary;
 
     svg {
-      color: $tutor-icon-idle;
+      color: $tutor-icon-secondary;
     }
 
     &:hover:not(:disabled) {

assets/core/ts/constant.ts

@@ -10,4 +10,5 @@ export const TUTOR_CUSTOM_EVENTS = {
   FORM_STATE_CHANGE: 'tutor-form-state-change',
   TUTOR_PLAYER_READY: 'tutor-player-ready',
   COMMENT_REPLIED: 'tutor:comment:replied',
+  LESSON_PLAYER_READY: 'tutorLessonPlayerReady',
 };

assets/core/ts/services/Query.ts

@@ -232,21 +232,16 @@ export class QueryService {
 
           return result;
         } catch (err) {
-          const error = {
-            message: (err as Error).message || 'Mutation failed',
-            code: (err as { code?: string }).code,
-          } as TError;
-
-          (this as unknown as MutationState<TData, TVariables, TError>).error = error;
+          (this as unknown as MutationState<TData, TVariables, TError>).error = err as TError;
           (this as unknown as MutationState<TData, TVariables, TError>).isError = true;
 
           if (options.onError) {
-            options.onError(error, variables);
+            options.onError(err as TError, variables);
           }
 
           // onSettled callback - always called
           if (options.onSettled) {
-            options.onSettled(null, error, variables);
+            options.onSettled(null, err as TError, variables);
           }
 
           throw err;