Index: lams_central/web/css/components.scss =================================================================== diff -u -r8ab1c658eca81a42d7f21d0067bff04c15f70c38 -r76e983188f512edbc2d0b5e2028f06d8c5692cb7 --- lams_central/web/css/components.scss (.../components.scss) (revision 8ab1c658eca81a42d7f21d0067bff04c15f70c38) +++ lams_central/web/css/components.scss (.../components.scss) (revision 76e983188f512edbc2d0b5e2028f06d8c5692cb7) @@ -616,10 +616,9 @@ /*----------collapsable-icon-left----------------*/ -.component-page-wrapper .collapsable-icon-left button[data-bs-toggle="collapse"]:after { +.component-page-wrapper .collapsable-icon-left button:after { font-family: FontAwesome; float: left; - color: #6c757d; margin-right: .5rem; } Index: lams_central/web/css/free.ui.jqgrid.custom.css =================================================================== diff -u -rbbe6b21a663059e2539bc0ea5ce761445b5ae1c1 -r76e983188f512edbc2d0b5e2028f06d8c5692cb7 --- lams_central/web/css/free.ui.jqgrid.custom.css (.../free.ui.jqgrid.custom.css) (revision bbe6b21a663059e2539bc0ea5ce761445b5ae1c1) +++ lams_central/web/css/free.ui.jqgrid.custom.css (.../free.ui.jqgrid.custom.css) (revision 76e983188f512edbc2d0b5e2028f06d8c5692cb7) @@ -9,10 +9,18 @@ font-size: 1rem; } +.ui-jqgrid.ui-jqgrid-bootstrap { + box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15);/*copied from .shadow class*/ +} + .ui-jqgrid.ui-jqgrid-bootstrap .ui-jqgrid-caption { background-color: var(--bs-gray-200); } +.ui-jqgrid.ui-jqgrid-bootstrap .btn:not(.disabled) { + opacity: 0.8; +} + .ui-jqgrid .ui-jqgrid-bdiv { overflow: inherit; } @@ -21,15 +29,12 @@ border: 3px !important; padding: 0 !important; font-family: mont-bold, sans-serif; - font-size: 1.1rem; margin: 0; width: 100%; - background-color: var(--bs-gray-200) !important; - border-top: 1px solid var(--bs-gray-400) !important; + background-color: transparent !important; } .ui-jqgrid-labels th { - border-bottom: 2px solid var(--bs-secondary)!important; padding-bottom: .4rem !important; background-color: #fff; } @@ -72,17 +77,27 @@ } .ui-subgrid.ui-row-ltr .subgrid-cell, .ui-jqgrid.ui-jqgrid-bootstrap .ui-jqgrid-bootstrap-corner-bottom { - background-color: #F6F5FA; + } -.table-hover tbody { - background-color: #FFF; +.ui-jqgrid.ui-jqgrid-bootstrap .ui-jqgrid-pager { + background-color: #e5e5e5; } +.ui-jqgrid.ui-jqgrid-bootstrap>.ui-jqgrid-view { + border: none; +} + .table-hover tbody tr:hover { background-color: var(--bs-gray-200); } +.ui-jqgrid .ui-jqgrid-titlebar { + color: #fff !important; /* copied from .text-bg-secondary */ + background-color: RGBA(108, 117, 125, var(--bs-bg-opacity, 1)) !important; /* copied from .text-bg-secondary */ + --bs-bg-opacity: 0.85; +} + .ui-jqgrid .ui-jqgrid-titlebar>.ui-jqgrid-titlebar-close { right: .6rem; top: 40%; Index: lams_gradebook/web/gradebookMonitorContent.jsp =================================================================== diff -u -r9f749a4b64195373d93faaa5353895713e3a7c09 -r76e983188f512edbc2d0b5e2028f06d8c5692cb7 --- lams_gradebook/web/gradebookMonitorContent.jsp (.../gradebookMonitorContent.jsp) (revision 9f749a4b64195373d93faaa5353895713e3a7c09) +++ lams_gradebook/web/gradebookMonitorContent.jsp (.../gradebookMonitorContent.jsp) (revision 76e983188f512edbc2d0b5e2028f06d8c5692cb7) @@ -90,7 +90,9 @@ /* Expands all subgrids of the given jqGrid. */ - function expandAllRows(jqGridId) { + function expandAllRows(jqGridId, button) { + $(button).removeClass("collapsed"); + let jqGrid = $('#' + jqGridId), ids = jqGrid.getDataIDs(); $.each(ids, function(){ @@ -893,14 +895,19 @@