Merge branch 'master' of https://github.com/GirlCodeZA/tutor-indigo

GirlCodeZA · Mar 14, 2024 · b1e377b · b1e377b
2 parents 633b592 + fc02bcd
commit b1e377b
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 25 deletions.
diff --git a/tutorindigo/templates/indigo/lms/static/images/logo.png b/tutorindigo/templates/indigo/lms/static/images/logo.png
diff --git a/tutorindigo/templates/indigo/lms/static/sass/courseware/_about.scss b/tutorindigo/templates/indigo/lms/static/sass/courseware/_about.scss
@@ -3,6 +3,7 @@
     &.container {
         padding-top: 50px;
         padding-bottom: 20px;
+        padding-bottom: 20px;
         @include media-breakpoint-up(md) {
             padding-top: 70px;
             padding-bottom: 70px;
@@ -138,31 +139,22 @@
         }
     }
     .about-content {
-<<<<<<< HEAD
         display: flex;
         flex-flow: column-reverse;
         flex-wrap: wrap;
         @include media-breakpoint-up(md) {
             display: block;
         }
-=======
->>>>>>> 5ee6eac (fix: Updates of favicon and minor fixes - v2.1)
         &:after {
             display: block;
             clear: both;
             content: "";
         }
         .details {
-<<<<<<< HEAD
             width: 100%;
             @include media-breakpoint-up(md) {
                 width: calc(100% - 32% - 35px);
                 margin-right: 35px;
-=======
-            @include media-breakpoint-up(md) {
-                width: calc(100% - 32% - 35px);
-                margin-right: 57px;
->>>>>>> 5ee6eac (fix: Updates of favicon and minor fixes - v2.1)
             }
             @include media-breakpoint-up(lg) {
                 width: calc(100% - 32% - 57px);
@@ -264,17 +256,12 @@
         background: $primary-light;
         padding: 24px;
         border-radius: 8px;
-<<<<<<< HEAD
         width: 100%;
         box-sizing: border-box;
         margin: 0 0 25px;
         @include media-breakpoint-up(md) {
             width: 32%;
             margin: 0;
-=======
-        @include media-breakpoint-up(md) {
-            width: 32%;
->>>>>>> 5ee6eac (fix: Updates of favicon and minor fixes - v2.1)
         }
         h2 {
             color:#111827;

diff --git a/tutorindigo/templates/indigo/lms/static/sass/partials/lms/theme/_extras.scss b/tutorindigo/templates/indigo/lms/static/sass/partials/lms/theme/_extras.scss
@@ -12,6 +12,15 @@ body, body.view-profile {
     -moz-osx-font-smoothing: grayscale;
     text-rendering: optimizeLegibility;
 }
+.page-content-container {
+  max-width: 1090px;
+  margin: 0 auto;
+  padding: 0 15px;
+  border: none;
+  -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
+    text-rendering: optimizeLegibility;
+}
 .page-content-container {
   max-width: 1090px;
   margin: 0 auto;
@@ -287,10 +296,7 @@ nav.wrapper-preview-menu {
 @import '../../../dashbord/dashbord';
 @import '../../../courseware/discover';
 @import '../../../courseware/about';
-<<<<<<< HEAD
 @import '../../../courseware/bookmarks';
-=======
->>>>>>> 5ee6eac (fix: Updates of favicon and minor fixes - v2.1)
 @import '../../../home/home';
 
 

diff --git a/tutorindigo/templates/indigo/lms/templates/course.html b/tutorindigo/templates/indigo/lms/templates/course.html
@@ -8,11 +8,7 @@
 <article class="course" id="${course.id}" role="region" aria-label="${course.display_name_with_default}">
     <header class="course-image">
       <div class="cover-image">
-<<<<<<< HEAD
         <img src="${course.course_image_url}" onerror="this.src='/theming/asset/images/no_course_image.png';" alt="${course.display_name_with_default} ${course.display_number_with_default}" />
-=======
-        <img src="${course.course_image_url}" onerror="this.src='/static/indigo/images/no_course_image.png';" alt="${course.display_name_with_default} ${course.display_number_with_default}" />
->>>>>>> 5ee6eac (fix: Updates of favicon and minor fixes - v2.1)
       </div>
     </header>
     <div class="course-info" aria-hidden="true">

diff --git a/tutorindigo/templates/indigo/lms/templates/discovery/course_card.underscore b/tutorindigo/templates/indigo/lms/templates/discovery/course_card.underscore
@@ -1,11 +1,7 @@
 <article class="course" role="region" aria-label="<%- content.display_name %>">
         <header class="course-image">
             <div class="cover-image">
-<<<<<<< HEAD
                 <img src="<%- image_url %>" onerror="this.src='/theming/asset/images/no_course_image.png';" alt="<%- content.display_name %> <%- content.number %>" />
-=======
-                <img src="<%- image_url %>" onerror="this.src='/static/indigo/images/no_course_image.png';" alt="<%- content.display_name %> <%- content.number %>" />
->>>>>>> 5ee6eac (fix: Updates of favicon and minor fixes - v2.1)
             </div>
         </header>
         <section class="course-info" aria-hidden="true">