Merge branch 'MDL-66999-master' of git://github.com/bmbrands/moodle

This commit is contained in:
Adrian Greeve 2019-12-23 14:26:39 +08:00
commit f00542c485
69 changed files with 1487 additions and 2168 deletions

View file

@ -34,7 +34,6 @@ $breadcrumb-divider-rtl: "◀" !default;
@import "moodle/templates";
@import "moodle/undo";
@import "moodle/debug";
@import "moodle/expendable";
@import "moodle/sticky-footer";
@import "moodle/popover-region";
@import "moodle/tool_usertours";

View file

@ -61,47 +61,10 @@
display: none;
}
.statusok {
@extend .tag;
@extend .tag-success;
}
.statuswarning {
@extend .tag;
@extend .tag-warning;
}
.statusserious,
.statuscritical {
@extend .tag;
@extend .tag-danger;
}
#page-admin-report-capability-index #capabilitysearch {
width: 30em;
}
#page-admin-report-backups-index .backup-error,
#page-admin-report-backups-index .backup-unfinished {
@extend .tag-danger;
}
#page-admin-report-backups-index .backup-skipped,
#page-admin-report-backups-index .backup-ok,
#page-admin-report-backups-index .backup-notyetrun,
#page-admin-report-backups-index .backup-queued {
@extend .tag-success;
}
#page-admin-report-backups-index .backup-warning {
@extend .tag-warning;
}
#page-admin-qtypes .disabled,
#page-admin-qbehaviours .disabled {
@extend .text-muted;
}
#page-admin-qtypes #qtypes div,
#page-admin-qtypes #qtypes form,
#page-admin-qbehaviours #qbehaviours div,
@ -184,24 +147,6 @@
text-align: left;
}
#page-admin-index .releasenoteslink,
#page-admin-index .adminwarning,
#page-admin-index .adminerror {
@extend .alert;
}
#page-admin-index .adminwarning {
@extend .alert-warning;
}
#page-admin-index .adminerror {
@extend .alert-danger;
}
#page-admin-index .releasenoteslink {
@extend .alert-info;
}
#page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo span {
display: block;
}
@ -210,10 +155,6 @@
margin-bottom: 0.5em;
}
#page-admin-index .updateplugin .updatepluginconfirmexternal {
@extend .tag-warning;
}
#page-admin-user-user_bulk #users .fgroup {
white-space: nowrap;
}
@ -470,19 +411,6 @@
text-align: center;
}
#page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity200 .info.release {
@extend .tag-info;
}
#page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity100 .info.release,
#page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity150 .info.release {
@extend .tag-warning;
}
#page-admin-index .adminwarning.availableupdatesinfo .moodleupdateinfo.maturity50 .info.release {
@extend .tag-danger;
}
// Plugins overview page at admin/plugins.php
#page-admin-plugins {
#plugins-overview-panel {
@ -524,7 +452,7 @@
.pluginname {
.componentname {
font-size: $font-size-sm;
@extend .text-muted;
color: $text-muted;
margin-left: 22px;
}
}
@ -532,7 +460,7 @@
.version {
.versionnumber {
font-size: $font-size-sm;
@extend .text-muted;
color: $text-muted;
}
}
@ -549,7 +477,7 @@
.requiredby {
font-size: $font-size-sm;
@extend .text-muted;
color: $text-muted;
}
}
}
@ -559,7 +487,7 @@
// Plugins check page displayed during upgrade.
#plugins-check-page {
.page-description {
@extend .text-muted;
color: $text-muted;
}
// Check for updates.
@ -598,7 +526,7 @@
// Plugins check table.
#plugins-check {
.requires-ok {
@extend .text-muted;
color: $text-muted;
}
.status-missing,
@ -610,7 +538,7 @@
.displayname {
.plugindir {
@extend .text-muted;
color: $text-muted;
font-size: $font-size-sm;
}
}
@ -652,7 +580,7 @@
#plugins-check-available-dependencies {
.displayname .component {
font-size: $font-size-sm;
@extend .text-muted;
color: $text-muted;
}
.info .actions {
@ -730,12 +658,6 @@
}
}
.uninstalldeleteconfirmexternal {
@extend .alert-warning;
padding: 0.5em 1em;
margin: 5px 0 10px 0;
}
#page-admin-index .upgradepluginsinfo {
text-align: center;
}
@ -750,12 +672,6 @@
font-size: $font-size-sm;
}
#page-admin-mnet-peers .mform .deletedhostinfo {
@extend .form-control-danger;
padding: 4px;
margin-bottom: 5px;
}
#core-cache-plugin-summaries table,
#core-cache-store-summaries table {
width: 100%;
@ -784,28 +700,12 @@
right: 0;
overflow: hidden;
z-index: $zindex-dropdown;
&.error {
@extend .form-control-danger;
}
&.warning {
@extend .form-control-warning;
}
}
#adminsettings .form-overridden {
@extend .alert-info;
}
.modal.modal-in-page {
z-index: 0;
}
#overriderolestable .overriddenpermission {
@extend .table-warning;
}
#page-admin-search {
.adminpagetitle {
margin-bottom: 0;
@ -818,8 +718,6 @@
padding: 0;
margin: 0 0 1.5rem 0;
li {
@extend .text-muted;
@extend .small;
+ li:before {
padding-right: 0.5rem;
padding-left: 0.5rem;

View file

@ -123,7 +123,7 @@
margin-bottom: $spacer-y;
.backup_stage {
@extend .text-muted;
color: $text-muted;
&.backup_stage_current {
font-weight: bold;

View file

@ -2,41 +2,51 @@
// Well -> Panel -> Card. We skipped panel (BS3) so lets just support well and card.
.well {
@extend .card;
border: $border-width solid $border-color;
padding: $card-spacer-x;
}
// Some things just got renamed.
.img-responsive {
@extend .img-fluid;
@include img-fluid;
}
.text-error {
@extend .text-danger;
color: map-get($theme-colors, 'danger');
}
.btn-default {
@extend .btn-secondary;
@include button-variant(map-get($theme-colors, 'secondary'), map-get($theme-colors, 'secondary'));
}
.label {
@extend .tag;
@include tag-variant($tag-default-bg);
display: inline-block;
padding: $badge-padding-y $badge-padding-x;
@include font-size($badge-font-size);
font-weight: $badge-font-weight;
line-height: 1;
text-align: center;
white-space: nowrap;
vertical-align: baseline;
@include border-radius($badge-border-radius);
@include transition($badge-transition);
@include badge-variant($tag-default-bg);
}
.label-success {
@include tag-variant($tag-success-bg);
@include badge-variant($tag-success-bg);
}
.label-info {
@include tag-variant($tag-info-bg);
@include badge-variant($tag-info-bg);
}
.label-warning {
@include tag-variant($tag-warning-bg);
@include badge-variant($tag-warning-bg);
}
.label-important {
@include tag-variant($tag-danger-bg);
@include badge-variant($tag-danger-bg);
}
// Floats.

View file

@ -215,13 +215,6 @@ $bs4aspacers: map-merge((
}
}
// Adding compatibility for col-xs-* classes.
@for $i from 1 through $grid-columns {
.col-xs-#{$i} {
@extend .col-#{$i};
}
}
input[disabled] {
cursor: not-allowed;
}

View file

@ -13,14 +13,6 @@
p.arrow_button {
margin-top: 5em;
text-align: center;
#remove {
margin: 3em auto 5em;
}
input {
@extend .btn-block;
}
}
#addcontrols {
@ -37,7 +29,7 @@ p.arrow_button {
#addcontrols,
#removecontrols {
input {
@extend .btn-block;
width: 100%;
margin: auto;
}
}
@ -47,8 +39,6 @@ p.arrow_button {
}
.btn.btn-icon {
@extend .btn-link;
height: ($icon-width + 20px);
width: ($icon-width + 20px);
font-size: $icon-width;

View file

@ -213,12 +213,6 @@ $calendarEventUserColor: #dce7ec !default; // Pale blue.
border-color: $calendarEventUserColor;
}
.calendar-controls {
.current {
@extend .h2;
}
}
.calendartable {
td,
li {
@ -275,7 +269,7 @@ $calendarEventUserColor: #dce7ec !default; // Pale blue.
td {
&.weekend {
@extend .text-muted;
color: $text-muted;
}
a {

View file

@ -24,7 +24,7 @@
}
// Override the default padding added by function $OUTPUT->box();
#chat-input-area.py-3 {
@extend .p-0;
padding: 0 !important; /* stylelint-disable-line declaration-no-important */
}
#chat-input-area table.generaltable,
#chat-input-area table.generaltable td.cell {

View file

@ -85,7 +85,7 @@ a.dimmed_text:visited,
.usersuspended a:visited,
.dimmed_category,
.dimmed_category a {
@extend .text-muted;
color: $text-muted;
}
.unlist,
@ -118,16 +118,16 @@ a.dimmed_text:visited,
.red,
.notifyproblem {
@extend .text-warning;
color: map-get($theme-colors, 'warning');
}
.green,
.notifysuccess {
@extend .text-success;
color: map-get($theme-colors, 'success');
}
.highlight {
@extend .text-info;
color: map-get($theme-colors, 'info');
}
.fitem.advanced .text-info {
@ -389,6 +389,7 @@ a.skip:active {
width: auto;
min-width: 80%;
margin: 0 auto;
display: block;
}
.groupmanagementtable #removeselect_wrapper,
@ -592,7 +593,7 @@ table.mod_index {
* Completion progress report
*/
.completion-expired {
@extend .text-warning;
color: map-get($theme-colors, 'warning');
}
.completion-expected {
@ -689,7 +690,7 @@ span.flagged-tag,
tr.flagged-tag,
span.flagged-tag a,
tr.flagged-tag a {
@extend .text-warning;
color: map-get($theme-colors, 'warning');
}
.tag-management-table td,
@ -766,7 +767,7 @@ tr.flagged-tag a {
}
.tag_feed .media .muted a {
@extend .text-muted;
color: $text-muted;
}
.tag_cloud {
@ -988,22 +989,6 @@ tr.flagged-tag a {
margin-left: 3px;
}
#page-enrol-users {
.enrol_user_buttons {
text-align: right;
}
#filterform {
@extend .card;
@extend .card-block;
}
}
#page-enrol-users .enrol-users-page-action input {
margin-left: 0;
}
.corelightbox {
background-color: #ccc;
position: absolute;
@ -1155,12 +1140,10 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
display: block;
}
.moodle-dialogue-base .moodle-dialogue-wrap.moodle-dialogue-content {
@extend .modal-content;
}
.moodle-dialogue-base .moodle-dialogue-wrap .moodle-dialogue-hd {
@extend .modal-header;
display: flex;
padding: 1rem 1rem;
border-bottom: 1px solid #dee2e6;
}
.moodle-dialogue-base .moodle-dialogue-wrap .moodle-dialogue-hd.yui3-widget-hd {
@ -1173,7 +1156,6 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
}
.moodle-dialogue-base .moodle-dialogue-wrap .moodle-dialogue-hd h1 {
@extend .modal-title;
font-size: 1.5rem;
}
@ -1182,12 +1164,24 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
left: 0;
right: auto;
*/
padding: $spacer;
padding: 0;
position: relative;
margin-left: auto;
}
.moodle-dialogue-base .closebutton {
@extend .close;
padding: $modal-header-padding;
margin: (-$modal-header-padding-y) (-$modal-header-padding-x) (-$modal-header-padding-y) auto;
position: relative;
background-color: transparent;
border: 0;
background-image: none;
box-shadow: none;
opacity: 0.7;
&:hover,
&:active {
opacity: 1;
}
&::after {
content: "×";
}
@ -1195,6 +1189,9 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
.moodle-dialogue-base .moodle-dialogue .moodle-dialogue-bd {
padding: 0.5rem;
body {
background-color: $body-bg;
}
}
.moodle-dialogue-base .moodle-dialogue-fullscreen .moodle-dialogue-content {
@ -1229,7 +1226,7 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
}
.moodle-dialogue-exception .param-stacktrace .stacktrace-line {
@extend .text-warning;
color: map-get($theme-colors, 'warning');
font-size: $font-size-sm;
}
@ -1239,10 +1236,6 @@ body#page-lib-editor-tinymce-plugins-moodlemedia-preview {
border-bottom: 1px solid #eee;
}
.moodle-dialogue-base .moodle-dialogue .moodle-dialogue-content .moodle-dialogue-ft {
@extend .modal-footer;
}
.moodle-dialogue-base .moodle-dialogue .moodle-dialogue-content .moodle-dialogue-ft:empty {
display: none;
}
@ -1555,13 +1548,6 @@ body.jsenabled .formlisting {
display: block;
}
/* Badges styles */
table.collection {
@extend .table;
@extend .table-bordered;
@extend .table-striped;
}
a.criteria-action {
padding: 0 3px;
float: right;
@ -1684,15 +1670,15 @@ ul.badges {
}
.connected {
@extend .text-success;
color: map-get($theme-colors, 'success');
}
.notconnected {
@extend .text-danger;
color: map-get($theme-colors, 'danger');
}
.connecting {
@extend .text-warning;
color: map-get($theme-colors, 'warning');
}
#page-badges-award .recipienttable tr td {

View file

@ -106,7 +106,7 @@ body:not(.editing) .sitetopic ul.section {
}
.stealth {
@extend .text-muted;
color: $text-muted;
}
a.stealth,
a.stealth:hover {
@ -259,7 +259,7 @@ body:not(.editing) .sitetopic ul.section {
}
.course-content .section-summary .section-summary-activities .activity-count {
@extend .text-muted;
color: $text-muted;
font-size: $font-size-sm;
margin: 3px;
white-space: nowrap;
@ -323,7 +323,7 @@ body:not(.editing) .sitetopic ul.section {
.sectionname > span,
.content > div.summary,
.activity .activityinstance {
@extend .text-muted;
color: $text-muted;
}
}
@ -905,11 +905,11 @@ span.editinstructions {
}
// The category or course is hidden.
&[data-visible="0"] {
@extend .text-muted;
color: $text-muted;
> div {
> a {
@extend .text-muted;
color: $text-muted;
}
.item-actions {
@ -1057,7 +1057,7 @@ span.editinstructions {
text-align: center;
&.dimmed {
@extend .text-muted;
color: $text-muted;
margin: 0.4rem 1rem 0.45rem;
}
}

View file

@ -1,15 +1,8 @@
table#explaincaps,
table#defineroletable,
table.grading-report,
table#listdirectories,
table.rolecaps,
table.userenrolment,
form#movecourses table,
#page-admin-course-index .editcourse,
.forumheaderlist,
table.flexible,
.generaltable {
@extend .table-striped;
tbody tr:nth-of-type(#{$table-striped-order}) {
background-color: $table-accent-bg;
}
}
table {
@ -28,17 +21,23 @@ table {
#page-admin-user table,
.environmenttable,
.category_subcategories,
.rcs-results,
table#listdirectories {
@extend .table-sm;
.rcs-results {
th,
td {
padding: $table-cell-padding-sm;
}
}
table.grading-report,
.forumheaderlist,
.generaltable,
table.flexible,
.category_subcategories,
table#modules,
table#permissions {
@extend .table-hover;
tbody tr {
@include hover {
color: $table-hover-color;
background-color: $table-hover-bg;
}
}
}

View file

@ -115,12 +115,15 @@
}
.fp-viewbar:not(.disabled) a.checked {
@extend .btn-secondary.active;
background-color: darken(map-get($theme-colors, 'secondary'), 10%);
color: color-yiq(darken(map-get($theme-colors, 'secondary'), 10%));
border-color: darken(map-get($theme-colors, 'secondary'), 12.5%);
}
.fp-viewbar.disabled a {
@extend .btn.disabled;
@extend .btn-secondary.disabled;
pointer-events: none;
opacity: $btn-disabled-opacity;
@include box-shadow(none);
}
.file-picker .fp-clear-left {
@ -621,7 +624,7 @@ a.ygtvspacer:hover {
}
.fitem.disabled .fp-btn-choose {
@extend .text-muted;
color: $text-muted;
}
.fitem.disabled .filepicker-filelist .filepicker-filename {

View file

@ -90,7 +90,7 @@ input#id_externalurl {
.form-defaultinfo,
.form-label .form-shortname {
@extend .text-muted;
color: $text-muted;
}
.form-label .form-shortname {
@ -107,7 +107,7 @@ input#id_externalurl {
}
.formsettingheading .form-horizontal {
@extend .text-muted;
color: $text-muted;
}
// Moodle doesn't differentiate between what Bootstrap calls
@ -115,7 +115,7 @@ input#id_externalurl {
// uneditable looks ugly, styling both as form help is fairly
// subtle in it's impact. Going for the latter as the best option.
.no-felement.fstatic {
@extend .text-muted;
color: $text-muted;
padding-top: 5px;
}
@ -123,15 +123,6 @@ input#id_externalurl {
font-weight: bold;
}
// Pale grey container for submit buttons.
.form-buttons,
.path-admin .buttons,
.fp-content-center form + div,
div.backup-section + form {
@extend .form-group;
padding-left: 0;
}
.form-item .form-setting .defaultsnext > input {
display: inline-block;
}
@ -471,20 +462,20 @@ textarea[data-auto-rows] {
.input-group {
&.form-inset {
.form-inset-item {
@extend .position-absolute;
position: absolute;
padding-top: calc(#{$input-padding-y} + #{$input-border-width});
z-index: 3;
}
&.form-inset-left {
.form-control {
@extend .pl-4;
padding-left: $spacer * 1.5;
}
}
&.form-inset-right {
.form-control {
@extend .pr-4;
padding-right: $spacer * 1.5;
}
.form-inset-item {
right: 0;

View file

@ -70,8 +70,6 @@
margin-bottom: 1em;
.action {
@extend .btn;
@extend .btn-lg;
display: inline-block;
position: relative;
vertical-align: top;
@ -190,7 +188,6 @@
vertical-align: middle;
input {
@extend .btn;
background-position: 0 0;
height: 30px;
margin-right: 5px;
@ -201,7 +198,6 @@
.addcriterion {
margin-left: 5px;
@extend .btn;
padding: 0;
input {

View file

@ -293,7 +293,7 @@ $author-image-margin-sm: 8px;
/** Don't show the discussion locked alert in this mode because it's already indicated with a badge. */
.alert.discussionlocked {
@extend .sr-only;
@include sr-only();
}
/** Fix muted text contrast ratios for accessibility. */
@ -312,7 +312,7 @@ $author-image-margin-sm: 8px;
/** Make the tag list text screen reader visible only */
.tag_list > b {
@extend .sr-only;
@include sr-only();
}
:target > .focus-target {
@ -1323,7 +1323,9 @@ $popout-header-height: 4rem;
.path-mod-assign [data-region="grade-panel"] .popout > .col-md-3 {
@extend .modal-header;
display: flex;
align-items: flex-start;
justify-content: space-between;
font-size: $popout-header-font-size;
}
@ -1383,8 +1385,12 @@ $popout-header-height: 4rem;
}
.assignfeedback_editpdf_widget .label {
@extend .alert;
@extend .alert-info;
position: relative;
padding: $alert-padding-y $alert-padding-x;
margin-bottom: $alert-margin-bottom;
border: $alert-border-width solid transparent;
@include border-radius($alert-border-radius);
@include alert-variant(theme-color-level('info', $alert-bg-level), theme-color-level('info', $alert-border-level), theme-color-level('info', $alert-color-level)); /* stylelint-disable-line max-line-length */
}
.assignfeedback_editpdf_menu {

View file

@ -174,10 +174,6 @@
}
}
.highlight {
@extend .text-dark;
}
label {
margin: 0;
display: block;
@ -293,15 +289,19 @@ body.path-question-type {
.que .formulation,
.que .outcome,
.que .comment {
@extend .alert;
position: relative;
padding: $alert-padding-y $alert-padding-x;
margin-bottom: $alert-margin-bottom;
border: $alert-border-width solid transparent;
@include border-radius($alert-border-radius);
}
.que .outcome,
.que .comment {
@extend .alert-warning;
@include alert-variant(theme-color-level('warning', $alert-bg-level), theme-color-level('warning', $alert-border-level), theme-color-level('warning', $alert-color-level)); /* stylelint-disable-line max-line-length */
}
.que .formulation {
@extend .alert-info;
@include alert-variant(theme-color-level('info', $alert-bg-level), theme-color-level('info', $alert-border-level), theme-color-level('info', $alert-color-level)); /* stylelint-disable-line max-line-length */
}
.que.multichoice .answer div.r0 .icon.fa-check,
@ -339,11 +339,7 @@ body.path-question-type {
}
.que .comment {
@extend .alert-success;
}
.que .history {
@extend .card;
@include alert-variant(theme-color-level('success', $alert-bg-level), theme-color-level('success', $alert-border-level), theme-color-level('success', $alert-color-level)); /* stylelint-disable-line max-line-length */
}
.que .ablock {
@ -366,7 +362,6 @@ body.path-question-type {
}
.que .correctness {
@extend .tag;
&.correct {
background-color: $state-success-text;
}
@ -384,7 +379,7 @@ body.path-question-type {
}
.que .validationerror {
@extend .text-danger;
color: map-get($theme-colors, 'danger');
}
// copied from .formFieldState in mixin.less
// and made more specific

View file

@ -1,6 +1,48 @@
table.flexible,
.generaltable {
@extend .table;
width: 100%;
margin-bottom: $spacer;
color: $table-color;
background-color: $table-bg; // Reset for nesting within parents with `background-color`.
th,
td {
padding: $table-cell-padding;
vertical-align: top;
border-top: $table-border-width solid $table-border-color;
}
thead th {
vertical-align: bottom;
border-bottom: (2 * $table-border-width) solid $table-border-color;
}
tbody + tbody {
border-top: (2 * $table-border-width) solid $table-border-color;
}
tbody tr:nth-of-type(#{$table-striped-order}) {
background-color: $table-accent-bg;
}
&.table-sm {
th,
td {
padding: $table-cell-padding-sm;
}
}
tbody tr {
@include hover {
color: $table-hover-color;
background-color: $table-hover-bg;
}
}
}
table {
caption {
font-size: 24px;
font-weight: bold;
line-height: 42px;
text-align: left;
caption-side: top;
}
}
// fancier table styles moved to expendable.less
// to shift after 4096 selector break

View file

@ -15,18 +15,6 @@
.userprofile .profile_tree {
column-count: 2;
section {
@extend .card;
@extend .card-body;
display: inline-block;
width: 100%;
margin-bottom: 1rem;
h3 {
@extend .lead;
}
}
}
// This rule overrides the automatic no-overflow on the participants table. It kills the auto-complete.
@ -217,10 +205,6 @@
}
}
.groupinfobox {
@extend .card;
}
.groupinfobox .left {
padding: 10px;
width: 100px;

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long