L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-69111-39' of git://github.com/bmbrands/moodle into MOODLE_39_STABLE

Browse Source
This commit is contained in:
Jun Pataleta
2020-08-06 11:36:48 +08:00
parent 9b48e7420e 7c3522f902
commit 7cc4f8883a
7 changed files with 51 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/forum/templates/local/grades/local/grader/grading.mustache
+2 -2
View File
@@ -92,8 +92,8 @@
{{> mod_forum/local/grades/local/grader/user_picker_placeholder }}
</div>
</div>
<div class="body-container position-relative d-flex flex-column overflow-auto" data-region="body-container">
<div class="grader-grading-panel-display pt-3 overflow-auto" data-region="grading-panel-container">
<div class="body-container position-relative d-flex flex-column" data-region="body-container">
<div class="grader-grading-panel-display pt-3" data-region="grading-panel-container">
<h4 class="mb-0 h5 px-3 font-weight-normal">
{{#pix}} i/grading, core {{/pix}}{{#str}} gradingmodulename, core_grades, {{moduleName}} {{/str}}
</h4>
mod/forum/templates/local/grades/local/grader/navigation.mustache
+7 -7
View File
@@ -34,7 +34,7 @@
"moduleName": "Chef the Forum"
}
}}
<nav id="nav-container-{{uniqid}}" class="grader-grading_navigation navbar" aria-label="{{#str}} forumgradingnavigation, mod_forum {{/str}}">
<nav id="nav-container-{{uniqid}}" class="grader-grading_navigation navbar px-0 px-sm-3" aria-label="{{#str}} forumgradingnavigation, mod_forum {{/str}}">
<div class="d-none d-sm-flex align-items-center">
<a href="{{{courseUrl}}}" class="btn btn-link px-2 colour-inherit">
<h5 class="d-inline px-0 mb-0">{{courseName}}</h5>
@@ -47,7 +47,7 @@
<h5 class="d-inline px-2 mb-0 font-weight-bold">{{#str}}grading, forum{{/str}}</h5>
</div>
<div class="ml-auto">
<div class="ml-1 ml-sm-auto">
<button
class="btn btn-icon icon-no-margin drawer-button mr-1 active"
data-action="expand-grading-drawer"
@@ -60,7 +60,7 @@
<span class="dir-rtl-hide" aria-hidden="true">{{#pix}} show-grader-panel, mod_forum, {{#str}} showgraderpanel, mod_forum {{/str}} {{/pix}}</span>
</button>
<button
class="btn btn-icon icon-no-margin drawer-button mr-1"
class="btn btn-icon icon-no-margin drawer-button mr-1 d-none d-sm-inline-block"
aria-label="{{#str}} hidegraderpanel, mod_forum {{/str}}"
data-action="collapse-grading-drawer"
aria-controls="grading-drawer-{{uniqid}}"
@@ -71,21 +71,21 @@
<span aria-hidden="true">{{#pix}} hide-grader-panel, mod_forum, {{#str}} hidegraderpanel, mod_forum {{/str}} {{/pix}}</span>
</button>
<button
class="btn btn-primary font-weight-bold ml-2 px-4"
class="btn btn-primary font-weight-bold ml-sm-2 px-4"
data-action="savegrade"
>
{{#str}} save {{/str}}
</button>
<button
class="btn btn-secondary font-weight-bold ml-2 px-4"
class="btn btn-secondary font-weight-bold ml-1 ml-sm-2 px-4"
aria-label="{{#str}} closegrader, mod_forum {{/str}}"
data-action="closegrader"
type="button"
>
{{#str}} close, mod_forum {{/str}}
</button>
<div class="btn-group">
<button
<div class="btn-group d-none d-sm-inline-block">
<button
class="btn btn-icon text-muted icon-no-margin icon-size-3 ml-2"
type="button"
id="grader-actions-menu-{{uniqid}}"
mod/forum/templates/local/grades/local/grader/user_picker.mustache
+1 -1
View File
@@ -37,7 +37,7 @@
<div class="d-flex align-items-center user-picker-container mb-2 py-2">
<div aria-live="polite" data-region="user_picker/current_user" class="sr-only"></div>
<div class="d-flex align-items-center" data-region="user_picker/user"></div>
<div class="d-flex align-items-center overflow-hidden" data-region="user_picker/user"></div>
<div class="ml-auto flex-shrink-0">
<nav aria-label="{{#str}} usernavigation, mod_forum {{/str}}">
<ul class="pagination mb-0">
mod/forum/templates/local/grades/local/grader/user_picker/user.mustache
+1 -1
View File
@@ -45,7 +45,7 @@
aria-hidden="true"
>
{{/profileimage}}
<div>
<div class="overflow-hidden">
<h5
class="mb-0 font-weight-bold user-full-name text-truncate"
data-region="name"
theme/boost/scss/moodle/modules.scss
+14 -4
View File
@@ -487,12 +487,15 @@ $grading-content-show-content-button-padding-left: calc(#{map-get($spacers, 2) *
}
.path-mod-forum .unified-grader {
.navbar {
max-height: none;
z-index: 1;
@include media-breakpoint-up(xs) {
.navbar {
max-height: none;
z-index: 1;
}
}
.body-container {
overflow: auto;
&.hidden {
display: none !important; /* stylelint-disable-line declaration-no-important */
}
@@ -504,8 +507,8 @@ $grading-content-show-content-button-padding-left: calc(#{map-get($spacers, 2) *
}
.grader-grading-panel {
position: absolute;
top: 0;
position: absolute;
height: 100%;
z-index: 0;
width: $grading-drawer-width;
@@ -911,6 +914,13 @@ $grading-content-show-content-button-padding-left: calc(#{map-get($spacers, 2) *
.path-mod-forum .unified-grader {
.grader-grading-panel {
width: 100%;
position: fixed;
height: calc(100vh - 50px);
overflow: scroll;
top: 50px;
}
.body-container {
overflow: visible;
}
}
}
theme/boost/style/moodle.css
+13 -5
View File
@@ -16957,17 +16957,19 @@ select {
max-height: none;
z-index: 1; }
.path-mod-forum .unified-grader .body-container.hidden {
display: none !important;
/* stylelint-disable-line declaration-no-important */ }
.path-mod-forum .unified-grader .body-container {
overflow: auto; }
.path-mod-forum .unified-grader .body-container.hidden {
display: none !important;
/* stylelint-disable-line declaration-no-important */ }
.path-mod-forum .unified-grader .userpicture {
height: 60px;
width: 60px; }
.path-mod-forum .unified-grader .grader-grading-panel {
position: absolute;
top: 0;
position: absolute;
height: 100%;
z-index: 0;
width: 430px; }
@@ -17218,7 +17220,13 @@ select {
@media (max-width: 575.98px) {
.path-mod-forum .unified-grader .grader-grading-panel {
width: 100%; } }
width: 100%;
position: fixed;
height: calc(100vh - 50px);
overflow: scroll;
top: 50px; }
.path-mod-forum .unified-grader .body-container {
overflow: visible; } }
.maincalendar .calendarmonth td,
.maincalendar .calendarmonth th {
theme/classic/style/moodle.css
+13 -5
View File
@@ -17186,17 +17186,19 @@ select {
max-height: none;
z-index: 1; }
.path-mod-forum .unified-grader .body-container.hidden {
display: none !important;
/* stylelint-disable-line declaration-no-important */ }
.path-mod-forum .unified-grader .body-container {
overflow: auto; }
.path-mod-forum .unified-grader .body-container.hidden {
display: none !important;
/* stylelint-disable-line declaration-no-important */ }
.path-mod-forum .unified-grader .userpicture {
height: 60px;
width: 60px; }
.path-mod-forum .unified-grader .grader-grading-panel {
position: absolute;
top: 0;
position: absolute;
height: 100%;
z-index: 0;
width: 430px; }
@@ -17447,7 +17449,13 @@ select {
@media (max-width: 575.98px) {
.path-mod-forum .unified-grader .grader-grading-panel {
width: 100%; } }
width: 100%;
position: fixed;
height: calc(100vh - 50px);
overflow: scroll;
top: 50px; }
.path-mod-forum .unified-grader .body-container {
overflow: visible; } }
.maincalendar .calendarmonth td,
.maincalendar .calendarmonth th {