chore: resolved conflicts

lms/public/css/style.css

@@ -415,11 +415,13 @@ input[type=checkbox] {
 }
 
 .course-card-footer {
-  margin-top: auto;
+	display: flex;
+	justify-content: space-between;
+	margin-top: auto;
 }
 
-.course-card-footer .avatar-group {
-  display: inherit;
+.course-price {
+	font-weight: 500;
 }
 
 .view-course-link {
@@ -552,6 +554,11 @@ input[type=checkbox] {
   }
 }
 
+.course-card-instructors {
+	display: flex;
+	align-items: center;
+}
+
 .course-card-wide-content {
   display: flex;
   flex-direction: column;
@@ -2285,6 +2292,13 @@ select {
 	left: 0;
 }
 
-.course-filter {
+.form-section .section-head {
+	margin-bottom: var(--margin-sm);
+	font-weight: 700;
+	color: var(--heading-color);
+}
+
+.form-column:first-child {
+	padding-right: 1rem !important;
+}
 
-}

lms/public/js/common_functions.js

@@ -2,8 +2,8 @@ frappe.ready(() => {
 	setup_file_size();
 	pin_header();
 
-	$(".join-batch").click((e) => {
-		join_course(e);
+	$(".enroll-in-course").click((e) => {
+		enroll_in_course(e);
 	});
 
 	$(".notify-me").click((e) => {
@@ -72,7 +72,7 @@ const file_size = (value) => {
 	return value;
 };
 
-const join_course = (e) => {
+const enroll_in_course = (e) => {
 	e.preventDefault();
 	let course = $(e.currentTarget).attr("data-course");
 	if (frappe.session.user == "Guest") {
@@ -205,7 +205,7 @@ const expand_the_first_chapter = () => {
 
 const expand_the_active_chapter = () => {
 	let selector = $(".course-home-headings.title");
-	console.log(selector);
+
 	if (selector.length && $(".course-details-page").length) {
 		expand_for_course_details(selector);
 	} else if ($(".active-lesson").length) {