Merge branch 'main' of https://github.com/frappe/school into jobs-improvement

school/lms/widgets/MemberCard.html

@@ -1,7 +1,6 @@
-<div class="common-card-style member-card {{dimension_class}} ">
-  {% set avatar_class = "avatar-xl" if not dimension_class else "avatar-large"%}
+<div class="common-card-style member-card">
   {{ widgets.Avatar(member=member, avatar_class=avatar_class) }}
-  <div class="small-title member-card-title">
+  <div class="small-title member-card-title {% if show_course_count %} font-weight-bold {% endif %}">
     {{ member.full_name }}
   </div>
   {% set course_count = member.get_authored_courses() | length %}

school/overrides/user.py

@@ -280,7 +280,7 @@ def get_user_details(users):
     user_details = []
     for user in users:
         details = frappe.get_doc("User", user)
-        user_details.append(Widgets().MemberCard(member=details))
+        user_details.append(Widgets().MemberCard(member=details, avatar_class="avatar-large"))
 
     return user_details
 

school/public/css/style.css

@@ -804,10 +804,10 @@ input[type=checkbox] {
 
 .member-parent {
   display: grid;
-  grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
-  -moz-column-gap: 32px;
-  column-gap: 32px;
-  row-gap: 32px;
+  grid-template-columns: repeat(auto-fill, minmax(180px, 1fr));
+  -moz-column-gap: 1rem;
+  column-gap: 1rem;
+  row-gap: 1rem;
 }
 
 @media (max-width: 600px) {

school/www/cohorts/subgroup.html

@@ -56,7 +56,7 @@
     {% if mentors %}
       <div class="member-parent">
       {% for m in mentors %}
-        {{ widgets.MemberCard(member=m, show_course_count=False, dimension_class="") }}
+        {{ widgets.MemberCard(member=m, show_course_count=False) }}
       {% endfor %}
       </div>
     {% else %}
@@ -70,7 +70,7 @@
   {% if students %}
   <div class="member-parent">
     {% for student in students %}
-      {{ widgets.MemberCard(member=student, show_course_count=False, dimension_class="") }}
+      {{ widgets.MemberCard(member=student, show_course_count=False) }}
     {% endfor %}
   </div>
   {% else %}

school/www/community/index.html

@@ -18,7 +18,7 @@
 
     <div class="member-parent">
       {% for user in user_details %}
-      {{ widgets.MemberCard(member=user, show_course_count=False) }}
+      {{ widgets.MemberCard(member=user, show_course_count=False, avatar_class="avatar-large") }}
       {% endfor %}
     </div>
     {% if user_count > user_details | length %}

school/www/courses/course.html

@@ -129,7 +129,7 @@
   <div class="course-home-headings">
     Creator
   </div>
-  {{ widgets.MemberCard(member=course.get_instructor(), show_course_count=True, dimension_class="member-card-large") }}
+  {{ widgets.MemberCard(member=course.get_instructor(), show_course_count=True, avatar_class="avatar-large") }}
 </div>
 {% endmacro %}
 
@@ -218,7 +218,7 @@
   </div>
   <div class="member-parent">
     {% for mentor in course.get_mentors() %}
-    {{ widgets.MemberCard(member=mentor, show_course_count=False, dimension_class="") }}
+    {{ widgets.MemberCard(member=mentor, show_course_count=False) }}
     {% endfor %}
   </div>
   <div class="view-all-mentors">