Skip to content
This repository has been archived by the owner on Dec 2, 2022. It is now read-only.

Commit

Permalink
Refix #780 - Certain grades not appearing in gradebook.
Browse files Browse the repository at this point in the history
  • Loading branch information
@gjb2048
gjb2048 committed Nov 16, 2016
1 parent 79ebaaa commit 2a48fcc
Show file tree
Hide file tree
Showing 10 changed files with 463 additions and 189 deletions.
4 changes: 4 additions & 0 deletions CHANGES.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
New in 3.1.1.4
==============
- REFIX: Issue #780: Certain grades not appearing in gradebook.

New in 3.1.1.3
==============
- FIX: Issue #780: Certain grades not appearing in gradebook.
Expand Down
38 changes: 33 additions & 5 deletions less/essential-alternative.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1180,13 +1180,41 @@
}
}

&.path-grade-report-user .user-grade.generaltable {
.leveleven, .levelodd {
color: ~"[[setting:alternativethemetextcolor@{index}]]";
a, a:visited {
&.path-grade-report-user .user-grade,
&.path-grade-edit-tree .setup-grades {
&.generaltable > tbody {
> tr:nth-child(odd) > th,
> tr:nth-child(odd) > td {
&.leveleven, &.levelodd {
color: ~"[[setting:alternativethemetextcolor@{index}]]";
a:not(.btn):not([role="menuitem"]),
a:not(.btn):not([role="menuitem"]):visited,
a.toggle-display,
a.toggle-display:visited {
color: ~"[[setting:alternativethemeurlcolor@{index}]]";
}
a:not(.btn):not([role="menuitem"]):hover,
a:not(.btn):not([role="menuitem"]):focus,
a:not(.btn):not([role="menuitem"]):active,
a.toggle-display:hover,
a.toggle-display:focus,
a.toggle-display:active {
color: ~"[[setting:alternativethemehovercolor@{index}]]";
}
}
}
tr:hover > td,
tr:hover > td > h3,
tr:hover > th {
color: ~"[[setting:alternativethemetextcolor@{index}]]";
}
tr:hover > td a:not(.btn):not([role="menuitem"]),
tr:hover > td a:not(.btn):not([role="menuitem"]):visited {
color: ~"[[setting:alternativethemeurlcolor@{index}]]";
}
a:hover, a:focus, a:active {
tr:hover > td a:not(.btn):not([role="menuitem"]):hover,
tr:hover > td a:not(.btn):not([role="menuitem"]):focus,
tr:hover > td a:not(.btn):not([role="menuitem"]):active {
color: ~"[[setting:alternativethemehovercolor@{index}]]";
}
}
Expand Down
21 changes: 21 additions & 0 deletions less/essential/grade.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,25 @@
width: 100%;
}
}

// Revert selectors in settings/tables.less.
.path-grade-report-user .user-grade,
.path-grade-edit-tree .setup-grades {
&.generaltable > tbody tr > td {
&.leveleven, &.levelodd {
a:not(.btn):not([role="menuitem"]),
a:not(.btn):not([role="menuitem"]):visited,
a:not(.btn):not([role="menuitem"]):hover,
a:not(.btn):not([role="menuitem"]):focus,
a:not(.btn):not([role="menuitem"]):active,
a.toggle-display,
a.toggle-display:visited,
a.toggle-display:hover,
a.toggle-display:focus,
a.toggle-display:active {
background-color: transparent;
}
}
}
}
/* @end */
38 changes: 33 additions & 5 deletions less/essential/settings/grade.less
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,40 @@
/* @group Grade */

.path-grade-report-user .user-grade.generaltable {
.leveleven, .levelodd {
color: ~"[[setting:themetextcolor]]";
a, a:visited {
.path-grade-report-user .user-grade,
.path-grade-edit-tree .setup-grades {
&.generaltable > tbody {
> tr:nth-child(odd) > th,
> tr:nth-child(odd) > td {
&.leveleven, &.levelodd {
color: ~"[[setting:themetextcolor]]";
a:not(.btn):not([role="menuitem"]),
a:not(.btn):not([role="menuitem"]):visited,
a.toggle-display,
a.toggle-display:visited {
color: ~"[[setting:themeurlcolor]]";
}
a:not(.btn):not([role="menuitem"]):hover,
a:not(.btn):not([role="menuitem"]):focus,
a:not(.btn):not([role="menuitem"]):active,
a.toggle-display:hover,
a.toggle-display:focus,
a.toggle-display:active {
color: ~"[[setting:themehovercolor]]";
}
}
}
tr:hover > td,
tr:hover > td > h3,
tr:hover > th {
color: ~"[[setting:themetextcolor]]";
}
tr:hover > td a:not(.btn):not([role="menuitem"]),
tr:hover > td a:not(.btn):not([role="menuitem"]):visited {
color: ~"[[setting:themeurlcolor]]";
}
a:hover, a:focus, a:active {
tr:hover > td a:not(.btn:not([role="menuitem"])):hover,
tr:hover > td a:not(.btn):not([role="menuitem"]):focus,
tr:hover > td a:not(.btn):not([role="menuitem"]):active {
color: ~"[[setting:themehovercolor]]";
}
}
Expand Down
25 changes: 18 additions & 7 deletions less/essential/settings/tables.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,25 @@ table.flexible,
> tr:nth-child(odd) > th {
color: ~"[[setting:themestripetextcolour]]";
background-color: ~"[[setting:themestripebackgroundcolour]]";
a:not(.btn), a:not(.btn):hover, a:not(.btn):focus, a:not(.btn):visited,
a.toggle-display, a.toggle-display:hover, a.toggle-display:focus, a.toggle-display:visited {
a:not(.btn):not([role="menuitem"]),
a:not(.btn):not([role="menuitem"]):hover,
a:not(.btn):not([role="menuitem"]):focus,
a:not(.btn):not([role="menuitem"]):visited,
a.toggle-display,
a.toggle-display:visited,
a.toggle-display:hover,
a.toggle-display:focus,
a.toggle-display:active {
color: ~"[[setting:themestripeurlcolour]]";
}
}
> tr:nth-child(odd) > td {
.@{fa-css-prefix}, .@{fa-css-prefix}:hover, .@{fa-css-prefix}:focus {
color: ~"[[setting:themestripetextcolour]]";
}
a[role="menuitem"] .@{fa-css-prefix}, .@{fa-css-prefix}:hover, .@{fa-css-prefix}:focus {
color: inherit;
}
img {
&.userpicture, &.profilepicture {
background-color: rgba(255, 255, 255, 0.8);
Expand Down Expand Up @@ -123,16 +133,17 @@ table.flexible,
table#modules,
table#permissions {
> tbody {
tr:hover > td,
tr:hover > td,
tr:hover > td > h3,
tr:hover > th {
color: ~"[[setting:themestripetextcolour]]";
background-color: ~"[[setting:themestripebackgroundcolour]]";
}
tr:hover > td a:not(.btn),
tr:hover > td a:not(.btn):hover,
tr:hover > td a:not(.btn):focus,
tr:hover > td a:not(.btn):visited {
tr:hover > td a:not(.btn):not([role="menuitem"]),
tr:hover > td a:not(.btn):not([role="menuitem"]):visited,
tr:hover > td a:not(.btn):not([role="menuitem"]):hover,
tr:hover > td a:not(.btn):not([role="menuitem"]):focus,
tr:hover > td a:not(.btn):not([role="menuitem"]):active {
color: ~"[[setting:themestripeurlcolour]]";
background-color: ~"[[setting:themestripebackgroundcolour]]";
}
Expand Down
13 changes: 13 additions & 0 deletions less/moodle-fixes/dock.less
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
// @package theme_essential.
// @copyright 2016 Gareth J Barnard.
// @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later.

/* Moodle fixes dock begin */
#dockeditempanel {
.dockeditempanel_hd {
h2 {
float: none;
}
}
}
/* Moodle fixes dock end */
2 changes: 1 addition & 1 deletion style/essential-alternative.css
View file

Large diffs are not rendered by default.

Loading

0 comments on commit 2a48fcc

Please sign in to comment.