SAK-49998 Master adjustments

sakaiproject · Apr 24, 2024 · 0db8d70 · 0db8d70
1 parent a0a052a
commit 0db8d70
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/assignment/tool/src/webapp/js/assignmentsByStudent.js b/assignment/tool/src/webapp/js/assignmentsByStudent.js
@@ -56,9 +56,9 @@ function renderGrouping({ studentName, actionLink, expanded }) {
   const template = document.createElement('template');
   template.innerHTML = `
     <tr>
-      <td>
+      <td class="border-0">
         <a href="${actionLink}">
-          <span class="expand-icon fa ${expanded ? "fa-chevron-down" : "fa-chevron-right"}"
+          <span class="expand-icon si ${expanded ? "si-expanded" : "si-collapsed"}"
               aria-hidden="true"></span>
           <span>${studentName}</span>
         </a>

diff --git a/library/src/skins/default/src/sass/base/_icons.scss b/library/src/skins/default/src/sass/base/_icons.scss
@@ -184,6 +184,8 @@ $fa-font-path: "./fonts";
     eye-slash-fill: bi-eye-slash-fill,
     question: bi-question,
     warning: bi-exclamation-lg,
+    expanded: bi-chevron-down,
+    collapsed: bi-chevron-right,
   );
 
 

diff --git a/library/src/skins/default/src/sass/modules/datatables/_base.scss b/library/src/skins/default/src/sass/modules/datatables/_base.scss
@@ -0,0 +1,10 @@
+.dt-header-row,
+.dt-footer-row {
+    display: flex;
+    justify-content: space-between;
+    flex-wrap: wrap;
+}
+
+.dt-header-slot {
+    padding: 2px;
+}
diff --git a/library/src/skins/default/src/sass/modules/tool/assignments/_assignments.scss b/library/src/skins/default/src/sass/modules/tool/assignments/_assignments.scss
@@ -688,9 +688,10 @@
       div:first-child {
           margin-right: 7px;
       }
+  }
 
-	.expand-icon {
-		width: 1em;
-		text-align: center;
-	}
+  .expand-icon {
+    width: 1em;
+    text-align: center;
+  }
 }