diff --git a/blocks/recentlyaccesseditems/templates/view-cards.mustache b/blocks/recentlyaccesseditems/templates/view-cards.mustache index 33ff9e8ec45..eddf48bac7d 100644 --- a/blocks/recentlyaccesseditems/templates/view-cards.mustache +++ b/blocks/recentlyaccesseditems/templates/view-cards.mustache @@ -34,7 +34,8 @@ "name": "Forum", "timeaccess": 1539848498, "userid": 2, - "viewurl": "http://moodlesite/mod/forum?id=64" + "viewurl": "http://moodlesite/mod/forum?id=64", + "purpose": "assessment" } ] } @@ -45,7 +46,7 @@
-
+
{{{icon}}}
diff --git a/blocks/timeline/templates/event-list-item.mustache b/blocks/timeline/templates/event-list-item.mustache index 6979e39fea5..95684bf1f12 100644 --- a/blocks/timeline/templates/event-list-item.mustache +++ b/blocks/timeline/templates/event-list-item.mustache @@ -54,7 +54,7 @@ {{#userdate}} {{timesort}}, {{#str}} strftimetime24, core_langconfig {{/str}} {{/userdate}} -
+
{{#icon}} {{#iconurl}} {{alttext}} diff --git a/calendar/templates/upcoming_mini.mustache b/calendar/templates/upcoming_mini.mustache index eb94c27acc8..4e34b7f47aa 100644 --- a/calendar/templates/upcoming_mini.mustache +++ b/calendar/templates/upcoming_mini.mustache @@ -44,7 +44,7 @@ }} data-eventtype-{{normalisedeventtype}}="1"{{! }} data-region="event-item"{{! }}> -
+
{{#icon}} {{#iconurl}} {{alttext}} diff --git a/course/format/templates/local/content/cm/cmicon.mustache b/course/format/templates/local/content/cm/cmicon.mustache index ed273800a74..31ecc99fe5b 100644 --- a/course/format/templates/local/content/cm/cmicon.mustache +++ b/course/format/templates/local/content/cm/cmicon.mustache @@ -35,8 +35,8 @@ {{#url}} {{#uservisible}} {{#cleanstr}} activityicon, moodle, {{{pluginname}}} {{/cleanstr}} {{/uservisible}} {{^uservisible}} -
+
{{#cleanstr}} activityicon, moodle, {{{pluginname}}} {{/cleanstr}} diff --git a/course/modedit.php b/course/modedit.php index c8d07c5f0fd..5e8a611f080 100644 --- a/course/modedit.php +++ b/course/modedit.php @@ -230,7 +230,7 @@ if ($mform->is_cancelled()) { $PAGE->activityheader->disable(); echo $OUTPUT->header(); - echo $OUTPUT->heading_with_help($pageheading, '', $module->name, 'monologo'); + echo $OUTPUT->heading_with_help($pageheading, '', $module->name); $mform->display(); diff --git a/course/templates/activityinstance.mustache b/course/templates/activityinstance.mustache index 18342323f30..86a32a7384b 100644 --- a/course/templates/activityinstance.mustache +++ b/course/templates/activityinstance.mustache @@ -24,7 +24,7 @@ "activities": [{ "cmid": "4", "modname": "Test activity", - "icon": "https://raw.githubusercontent.com/moodle/moodle/master/mod/feedback/pix/monologo.png", + "icon": "https://raw.githubusercontent.com/moodle/moodle/master/mod/feedback/pix/monologo.svg", "completionstatus": { "string": "Manual", "icon": "https://raw.githubusercontent.com/moodle/moodle/master/pix/i/completion-manual-enabled.png" diff --git a/course/templates/bulkactivitycompletion.mustache b/course/templates/bulkactivitycompletion.mustache index 5714a66b476..8d7f2a25c91 100644 --- a/course/templates/bulkactivitycompletion.mustache +++ b/course/templates/bulkactivitycompletion.mustache @@ -29,7 +29,7 @@ "activities": [{ "cmid": "4", "modname": "Test activity", - "icon": "https://raw.githubusercontent.com/moodle/moodle/master/mod/feedback/pix/monologo.png", + "icon": "https://raw.githubusercontent.com/moodle/moodle/master/mod/feedback/pix/monologo.svg", "completionstatus": { "string": "Manual", "icon": "https://raw.githubusercontent.com/moodle/moodle/master/pix/i/completion-manual-enabled.png" diff --git a/course/templates/defaultactivitycompletion.mustache b/course/templates/defaultactivitycompletion.mustache index 1485ecfe216..d2a64d21855 100644 --- a/course/templates/defaultactivitycompletion.mustache +++ b/course/templates/defaultactivitycompletion.mustache @@ -27,7 +27,7 @@ "id": "10", "formattedname": "Assignment", "canmanage": true, - "icon": "https://raw.githubusercontent.com/moodle/moodle/master/mod/assign/pix/monologo.png", + "icon": "https://raw.githubusercontent.com/moodle/moodle/master/mod/assign/pix/monologo.svg", "completionstatus": { "string": "Manual", "icon": "https://raw.githubusercontent.com/moodle/moodle/master/pix/i/completion-manual-enabled.png" diff --git a/course/templates/editbulkactivitycompletion.mustache b/course/templates/editbulkactivitycompletion.mustache index f8f91dbe0a8..8fb858df7d1 100644 --- a/course/templates/editbulkactivitycompletion.mustache +++ b/course/templates/editbulkactivitycompletion.mustache @@ -26,7 +26,7 @@ "activities": [{ "cmid": "4", "modname": "Test activity", - "icon": "https://raw.githubusercontent.com/moodle/moodle/master/mod/feedback/pix/monologo.png" + "icon": "https://raw.githubusercontent.com/moodle/moodle/master/mod/feedback/pix/monologo.svg" }] } }} diff --git a/course/templates/editdefaultcompletion.mustache b/course/templates/editdefaultcompletion.mustache index ee6b0346f98..30f0c519619 100644 --- a/course/templates/editdefaultcompletion.mustache +++ b/course/templates/editdefaultcompletion.mustache @@ -26,7 +26,7 @@ "modules": [{ "id": "10", "formattedname": "Assignment", - "icon": "https://raw.githubusercontent.com/moodle/moodle/master/mod/assign/pix/monologo.png" + "icon": "https://raw.githubusercontent.com/moodle/moodle/master/mod/assign/pix/monologo.svg" }] } }} diff --git a/course/templates/local/activitychooser/item.mustache b/course/templates/local/activitychooser/item.mustache index 1fcc46a3a88..889fa492b83 100644 --- a/course/templates/local/activitychooser/item.mustache +++ b/course/templates/local/activitychooser/item.mustache @@ -35,7 +35,7 @@
+ {{purpose}} {{#branded}}isbranded{{/branded}}"> {{{icon}}}
{{title}}
diff --git a/course/upgrade.txt b/course/upgrade.txt index 8b906375d1c..dfebd3f3ce1 100644 --- a/course/upgrade.txt +++ b/course/upgrade.txt @@ -22,6 +22,12 @@ information provided here is intended especially for developers. * New format actions classes. Those classes will eventually replace all course/lib.php content editing functions. All new methods are distributed in three classes formats can extend. Method can be accessed using static methods (see doc block of core_courseformat\formatactions for more information). +* The monologo activity icons have been improved and .png files have been removed (although the API still supports them). +The background for these icons has been removed and the color is used now for outlining their shapes. +About the categories supported by the FEATURE_MOD_PURPOSE: + * A new category has been added: MOD_PURPOSE_INTERACTIVECONTENT. + * The MOD_PURPOSE_INTERFACE category has been deprecated. The styles associated with this category have been removed. +The colors for all these purposes and the filters applied to outline them are defined in theme/boost/scss/moodle/variables.scss === 4.3 === * The `core_course_renderer::course_section_cm_completion` method has been removed, and can no longer be used diff --git a/grade/report/grader/styles.css b/grade/report/grader/styles.css index 6c5c75fbaa3..c6cbc032582 100644 --- a/grade/report/grader/styles.css +++ b/grade/report/grader/styles.css @@ -57,6 +57,8 @@ .path-grade-report-grader .grade_icons .icon { margin-right: 1rem; + font-size: 14px; + width: 24px; } .path-grade-report-grader .grade_icons .icon:last-child { @@ -90,8 +92,8 @@ } .path-grade-report-grader .heading .gradeitemheader { - text-indent: -1.5rem; - padding-left: 1.5rem; + text-indent: -2rem; + padding-left: 2rem; padding-top: 6px; } diff --git a/grade/report/user/styles.css b/grade/report/user/styles.css index 580ba9bcad9..83eff20e759 100644 --- a/grade/report/user/styles.css +++ b/grade/report/user/styles.css @@ -55,13 +55,6 @@ padding-left: 0; } -.path-grade-report-user .user-grade .column-itemname .itemicon, -.grade-report-user .user-grade .column-itemname .itemicon { - font-size: 18px; - width: 18px; - height: 18px; -} - .path-grade-report-user .user-grade .baggt, .path-grade-report-user .user-grade .baggb, .grade-report-user .user-grade .baggt, diff --git a/grade/tests/behat/grade_aggregation.feature b/grade/tests/behat/grade_aggregation.feature index 7f2c820a1f0..ea728cfa725 100644 --- a/grade/tests/behat/grade_aggregation.feature +++ b/grade/tests/behat/grade_aggregation.feature @@ -9,13 +9,18 @@ Feature: We can use calculated grade totals | fullname | shortname | category | groupmode | | Course 1 | C1 | 0 | 1 | And the following "users" exist: - | username | firstname | lastname | email | idnumber | - | teacher1 | Teacher | 1 | teacher1@example.com | t1 | - | student1 | Student | 1 | student1@example.com | s1 | + | username | firstname | lastname | email | idnumber | + | teacher1 | Teacher | 1 | teacher1@example.com | t1 | + | student1 | Student | 1 | student1@example.com | s1 | + # Additional students must be enrolled in the course to ensure that the action menu for hiding grades is displayed correctly. + | student2 | Student | 2 | student2@example.com | s2 | + | student3 | Student | 3 | student3@example.com | s3 | And the following "course enrolments" exist: - | user | course | role | - | teacher1 | C1 | editingteacher | - | student1 | C1 | student | + | user | course | role | + | teacher1 | C1 | editingteacher | + | student1 | C1 | student | + | student2 | C1 | student | + | student3 | C1 | student | And the following "grade categories" exist: | fullname | course | | Sub category 1 | C1 | diff --git a/lib/moodlelib.php b/lib/moodlelib.php index 9fca13de491..1db650c1cf2 100644 --- a/lib/moodlelib.php +++ b/lib/moodlelib.php @@ -487,10 +487,16 @@ define('MOD_PURPOSE_COLLABORATION', 'collaboration'); define('MOD_PURPOSE_COMMUNICATION', 'communication'); /** Module purpose content */ define('MOD_PURPOSE_CONTENT', 'content'); -/** Module purpose interface */ -define('MOD_PURPOSE_INTERFACE', 'interface'); +/** Module purpose interactive content */ +define('MOD_PURPOSE_INTERACTIVECONTENT', 'interactivecontent'); /** Module purpose other */ define('MOD_PURPOSE_OTHER', 'other'); +/** + * Module purpose interface + * @deprecated since Moodle 4.4 + * @todo MDL-80701 Remove in Moodle 4.8 +*/ +define('MOD_PURPOSE_INTERFACE', 'interface'); /** * Security token used for allowing access diff --git a/mod/bigbluebuttonbn/db/mobile.php b/mod/bigbluebuttonbn/db/mobile.php index dd600a0e0aa..35133e35a92 100644 --- a/mod/bigbluebuttonbn/db/mobile.php +++ b/mod/bigbluebuttonbn/db/mobile.php @@ -31,7 +31,7 @@ $addons = [ 'coursebigbluebuttonbn' => [ // Handler unique name (can be anything). 'displaydata' => [ 'title' => 'pluginname', - 'icon' => $CFG->wwwroot . '/mod/bigbluebuttonbn/pix/monologo.png', + 'icon' => $CFG->wwwroot . '/mod/bigbluebuttonbn/pix/monologo.svg', 'class' => '', ], 'delegate' => 'CoreCourseModuleDelegate', // Delegate (where to display the link to the add-on). diff --git a/mod/data/tests/entries_export_test.php b/mod/data/tests/entries_export_test.php index 36df83528d5..0323fbe7f56 100644 --- a/mod/data/tests/entries_export_test.php +++ b/mod/data/tests/entries_export_test.php @@ -147,13 +147,13 @@ class entries_export_test extends \advanced_testcase { $ziparchive = new \zip_archive(); $ziparchive->open($tmpdir . '/testexportarchive.zip'); $expectedfilecontents = [ - // The test generator for mod_data uses a copy of pix/monologo.png as sample file content for the file stored in a - // file and picture field. - // So we expect that this file has to have the same content as monologo.png. + // The test generator for mod_data uses a copy of field/picture/pix/sample.png as sample file content for the + // file stored in a file and picture field. + // So we expect that this file has to have the same content as sample.png. // Also, the default value for the subdirectory in the zip archive containing the files is 'files/'. - 'files/samplefile.png' => 'mod/data/pix/monologo.png', - 'files/samplefile_1.png' => 'mod/data/pix/monologo.png', - 'files/picturefile.png' => 'mod/data/pix/monologo.png', + 'files/samplefile.png' => 'mod/data/field/picture/pix/sample.png', + 'files/samplefile_1.png' => 'mod/data/field/picture/pix/sample.png', + 'files/picturefile.png' => 'mod/data/field/picture/pix/sample.png', // By checking that the content of the exported csv is identical to the fixture file it is verified // that the filenames in the csv file correspond to the names of the exported file. // It also verifies that files with identical file names in different fields (or records) will be numbered diff --git a/mod/data/tests/generator/lib.php b/mod/data/tests/generator/lib.php index 1f5d28a7e86..559f0f0b780 100644 --- a/mod/data/tests/generator/lib.php +++ b/mod/data/tests/generator/lib.php @@ -325,7 +325,7 @@ class mod_data_generator extends testing_module_generator { get_file_storage()->create_file_from_string(['component' => 'user', 'filearea' => 'draft', 'contextid' => $usercontext->id, 'itemid' => $itemid, 'filepath' => '/', 'filename' => $filename], - file_get_contents($CFG->dirroot.'/mod/data/pix/monologo.png')); + file_get_contents($CFG->dirroot.'/mod/data/field/picture/pix/sample.png')); } $fieldname = 'field_' . $fieldid . '_file'; diff --git a/mod/h5pactivity/lib.php b/mod/h5pactivity/lib.php index f22d84f2e00..6d8a6056f9d 100644 --- a/mod/h5pactivity/lib.php +++ b/mod/h5pactivity/lib.php @@ -65,7 +65,7 @@ function h5pactivity_supports(string $feature) { case FEATURE_BACKUP_MOODLE2: return true; case FEATURE_MOD_PURPOSE: - return MOD_PURPOSE_CONTENT; + return MOD_PURPOSE_INTERACTIVECONTENT; default: return null; } diff --git a/mod/imscp/lib.php b/mod/imscp/lib.php index 1314b4288e4..77cb579e446 100644 --- a/mod/imscp/lib.php +++ b/mod/imscp/lib.php @@ -40,7 +40,8 @@ function imscp_supports($feature) { case FEATURE_GRADE_OUTCOMES: return false; case FEATURE_BACKUP_MOODLE2: return true; case FEATURE_SHOW_DESCRIPTION: return true; - case FEATURE_MOD_PURPOSE: return MOD_PURPOSE_CONTENT; + case FEATURE_MOD_PURPOSE: + return MOD_PURPOSE_INTERACTIVECONTENT; default: return null; } diff --git a/mod/lesson/lib.php b/mod/lesson/lib.php index f651cdd09d4..b2e5afe1158 100644 --- a/mod/lesson/lib.php +++ b/mod/lesson/lib.php @@ -1004,7 +1004,7 @@ function lesson_supports($feature) { case FEATURE_SHOW_DESCRIPTION: return true; case FEATURE_MOD_PURPOSE: - return MOD_PURPOSE_CONTENT; + return MOD_PURPOSE_INTERACTIVECONTENT; default: return null; } diff --git a/mod/lti/classes/reportbuilder/local/entities/tool_types.php b/mod/lti/classes/reportbuilder/local/entities/tool_types.php index 4780f4156e6..52c689bd06e 100644 --- a/mod/lti/classes/reportbuilder/local/entities/tool_types.php +++ b/mod/lti/classes/reportbuilder/local/entities/tool_types.php @@ -97,7 +97,7 @@ class tool_types extends base { $iconurl = $data->icon ?: $OUTPUT->image_url('monologo', 'lti')->out(); $iconclass = $data->icon ? ' nofilter' : ''; - $iconcontainerclass = 'activityiconcontainer smaller content'; + $iconcontainerclass = 'activityiconcontainer smaller'; $name = $data->name; $img = \html_writer::img($iconurl, get_string('courseexternaltooliconalt', 'mod_lti', $name), ['class' => 'activityicon' . $iconclass]); diff --git a/mod/lti/lib.php b/mod/lti/lib.php index 4a8d1edc360..144df5cf8aa 100644 --- a/mod/lti/lib.php +++ b/mod/lti/lib.php @@ -66,7 +66,7 @@ function lti_supports($feature) { case FEATURE_SHOW_DESCRIPTION: return true; case FEATURE_MOD_PURPOSE: - return MOD_PURPOSE_CONTENT; + return MOD_PURPOSE_OTHER; default: return null; diff --git a/mod/scorm/lib.php b/mod/scorm/lib.php index f6027665c0c..c23092032c4 100644 --- a/mod/scorm/lib.php +++ b/mod/scorm/lib.php @@ -1042,7 +1042,8 @@ function scorm_supports($feature) { case FEATURE_GRADE_OUTCOMES: return true; case FEATURE_BACKUP_MOODLE2: return true; case FEATURE_SHOW_DESCRIPTION: return true; - case FEATURE_MOD_PURPOSE: return MOD_PURPOSE_CONTENT; + case FEATURE_MOD_PURPOSE: + return MOD_PURPOSE_INTERACTIVECONTENT; default: return null; } diff --git a/pix/i/completion-auto-enabled.svg b/pix/i/completion-auto-enabled.svg index afb98273d5b..f21c79bf20e 100644 --- a/pix/i/completion-auto-enabled.svg +++ b/pix/i/completion-auto-enabled.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/pix/i/completion-auto-fail.svg b/pix/i/completion-auto-fail.svg index 3576ae305b8..5ab4b0251c9 100644 --- a/pix/i/completion-auto-fail.svg +++ b/pix/i/completion-auto-fail.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/pix/i/completion-auto-n-override.svg b/pix/i/completion-auto-n-override.svg index 6100638d09e..1a991205c17 100644 --- a/pix/i/completion-auto-n-override.svg +++ b/pix/i/completion-auto-n-override.svg @@ -1,3 +1,3 @@ -]> \ No newline at end of file +]> diff --git a/pix/i/completion-auto-n.svg b/pix/i/completion-auto-n.svg index 17349baa832..440b797fc2e 100644 --- a/pix/i/completion-auto-n.svg +++ b/pix/i/completion-auto-n.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/pix/i/completion-auto-pass.svg b/pix/i/completion-auto-pass.svg index 64fe4faa002..ee5884234a1 100644 --- a/pix/i/completion-auto-pass.svg +++ b/pix/i/completion-auto-pass.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/pix/i/completion-auto-y-override.svg b/pix/i/completion-auto-y-override.svg index 1d4a8af06c4..d6f77ab7c91 100644 --- a/pix/i/completion-auto-y-override.svg +++ b/pix/i/completion-auto-y-override.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/pix/i/completion-auto-y.svg b/pix/i/completion-auto-y.svg index 8de56d21597..15d40c7a79c 100644 --- a/pix/i/completion-auto-y.svg +++ b/pix/i/completion-auto-y.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/pix/i/completion-manual-enabled.svg b/pix/i/completion-manual-enabled.svg index b7f5170488d..e6f8644ed0e 100644 --- a/pix/i/completion-manual-enabled.svg +++ b/pix/i/completion-manual-enabled.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/pix/i/completion-manual-n.svg b/pix/i/completion-manual-n.svg index da17dd228ed..5df2a20d050 100644 --- a/pix/i/completion-manual-n.svg +++ b/pix/i/completion-manual-n.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/pix/i/completion-manual-y-override.svg b/pix/i/completion-manual-y-override.svg index 16e77b99d14..88e1717662c 100644 --- a/pix/i/completion-manual-y-override.svg +++ b/pix/i/completion-manual-y-override.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/pix/i/completion-manual-y.svg b/pix/i/completion-manual-y.svg index 23e77c82e41..ed6eae135da 100644 --- a/pix/i/completion-manual-y.svg +++ b/pix/i/completion-manual-y.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/pix/i/completion_self.svg b/pix/i/completion_self.svg index f26d8faa81a..e7a725c80a9 100644 --- a/pix/i/completion_self.svg +++ b/pix/i/completion_self.svg @@ -1,3 +1,3 @@ -]> \ No newline at end of file +]> diff --git a/theme/boost/scss/moodle/core.scss b/theme/boost/scss/moodle/core.scss index d28e9e15a65..1361235f0d2 100644 --- a/theme/boost/scss/moodle/core.scss +++ b/theme/boost/scss/moodle/core.scss @@ -381,8 +381,8 @@ img.resize { } /* Icon styles */ img.activityicon { - height: 24px; - width: 24px; + height: 32px; + width: 32px; vertical-align: middle; } @@ -1540,6 +1540,8 @@ audio.mediaplugin_html5audio { .icon { height: 2.5rem; width: 6rem; + max-height: 2.5rem; + max-width: 6rem; margin-bottom: .6rem; } } @@ -2048,6 +2050,10 @@ dd:after { } } + .quickediticon .icon { + font-size: medium; + } + .quickediticon img { opacity: 0.2; } diff --git a/theme/boost/scss/moodle/course.scss b/theme/boost/scss/moodle/course.scss index 92f3a4865ea..0eac18a9b95 100644 --- a/theme/boost/scss/moodle/course.scss +++ b/theme/boost/scss/moodle/course.scss @@ -1712,9 +1712,6 @@ $activity-add-hover: theme-color-level('primary', -10) !default; a { color: $black; text-decoration: none; - img { - filter: invert(25%) sepia(86%) saturate(1158%) hue-rotate(189deg) brightness(104%) contrast(92%); - } } .activityicon { width: 32px; diff --git a/theme/boost/scss/moodle/grade.scss b/theme/boost/scss/moodle/grade.scss index a2dde867f25..b996264b002 100644 --- a/theme/boost/scss/moodle/grade.scss +++ b/theme/boost/scss/moodle/grade.scss @@ -430,12 +430,6 @@ .itemselect { margin-right: 15px; } - - .itemicon { - font-size: 18px; - width: 18px; - height: 18px; - } } &.column-weight { diff --git a/theme/boost/scss/moodle/icons.scss b/theme/boost/scss/moodle/icons.scss index 82f92ff41f5..53827c914b6 100644 --- a/theme/boost/scss/moodle/icons.scss +++ b/theme/boost/scss/moodle/icons.scss @@ -5,8 +5,8 @@ $icon-width: 16px; $icon-height: 16px; // Size of big icons. -$icon-medium-width: 24px; -$icon-medium-height: 24px; +$icon-medium-width: 32px; +$icon-medium-height: 32px; // Size of big icons. $icon-big-width: 64px; $icon-big-height: 64px; @@ -29,9 +29,8 @@ $iconsizes: map-merge(( // stylelint-enable .icon { - font-size: $icon-height; - width: $icon-width; - height: $icon-height; + max-width: map-get($iconsizes, 4); + max-height: map-get($iconsizes, 4); margin: 0; padding: 0; box-sizing: content-box; @@ -144,7 +143,6 @@ $iconsizes: map-merge(( display: inline-flex; justify-content: center; align-items: center; - background-color: $gray-100; border-radius: 4px; padding: 0.7rem; .activityicon, @@ -153,28 +151,37 @@ $iconsizes: map-merge(( font-size: $icon-medium-width; height: $icon-medium-width; width: $icon-medium-height; + max-height: $icon-medium-width; + max-width: $icon-medium-height; } &.small { width: $activity-iconcontainer-width - 10px; height: $activity-iconcontainer-height - 10px; + max-width: $activity-iconcontainer-width - 10px; + max-height: $activity-iconcontainer-height - 10px; } &.smaller { width: $activity-iconcontainer-width - 20px; height: $activity-iconcontainer-width - 20px; + max-width: $activity-iconcontainer-width - 20px; + max-height: $activity-iconcontainer-width - 20px; .activityicon { width: $icon-medium-width; height: $icon-medium-height; + max-width: $icon-medium-width; + max-height: $icon-medium-height; } } } @each $type, $value in $activity-icon-colors { .activityiconcontainer.#{$type} { - background-color: $value; - .activityicon, - .icon { - &:not(.nofilter) { - filter: brightness(0) invert(1); + &:not(.isbranded) { + .activityicon, + .icon { + &:not(.nofilter) { + filter: $value; + } } } } diff --git a/theme/boost/scss/moodle/variables.scss b/theme/boost/scss/moodle/variables.scss index 41744a67ad8..51341d4c3c3 100644 --- a/theme/boost/scss/moodle/variables.scss +++ b/theme/boost/scss/moodle/variables.scss @@ -40,22 +40,35 @@ $primary-light-hover: theme-color-level('primary', -10) !default; $activity-iconcontainer-height: 52px; $activity-iconcontainer-width: 52px; -$activity-icon-administration-bg: #5d63f6 !default; -$activity-icon-assessment-bg: #eb66a2 !default; -$activity-icon-collaboration-bg: #f7634d !default; -$activity-icon-communication-bg: #11a676 !default; -$activity-icon-content-bg: #399be2 !default; -$activity-icon-interface-bg: #a378ff !default; +$activity-icon-administration-bg: #da58ef !default; +$activity-icon-assessment-bg: #f90086 !default; +$activity-icon-collaboration-bg: #5b40ff !default; +$activity-icon-communication-bg: #eb6200 !default; +$activity-icon-content-bg: #0099ad !default; +$activity-icon-interactivecontent-bg: #8d3d1b !default; + +$activity-icon-administration-filter: + invert(45%) sepia(46%) saturate(3819%) hue-rotate(260deg) brightness(101%) contrast(87%) !default; +$activity-icon-assessment-filter: + invert(36%) sepia(98%) saturate(6969%) hue-rotate(315deg) brightness(90%) contrast(119%) !default; +$activity-icon-collaboration-filter: + invert(25%) sepia(54%) saturate(6226%) hue-rotate(245deg) brightness(100%) contrast(102%) !default; +$activity-icon-communication-filter: + invert(48%) sepia(74%) saturate(4887%) hue-rotate(11deg) brightness(102%) contrast(101%) !default; +$activity-icon-content-filter: + invert(49%) sepia(52%) saturate(4675%) hue-rotate(156deg) brightness(89%) contrast(102%) !default; +$activity-icon-interactivecontent-filter: + invert(25%) sepia(63%) saturate(1152%) hue-rotate(344deg) brightness(94%) contrast(91%) !default; $activity-icon-colors: () !default; $activity-icon-colors: map-merge( ( - "administration": $activity-icon-administration-bg, - "assessment": $activity-icon-assessment-bg, - "collaboration": $activity-icon-collaboration-bg, - "communication": $activity-icon-communication-bg, - "content": $activity-icon-content-bg, - "interface": $activity-icon-interface-bg + "administration": $activity-icon-administration-filter, + "assessment": $activity-icon-assessment-filter, + "collaboration": $activity-icon-collaboration-filter, + "communication": $activity-icon-communication-filter, + "content": $activity-icon-content-filter, + "interactivecontent": $activity-icon-interactivecontent-filter, ), $activity-icon-colors ); diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css index 6d0c3d0f82a..06cbfe8dccf 100644 --- a/theme/boost/style/moodle.css +++ b/theme/boost/style/moodle.css @@ -23270,8 +23270,8 @@ img.resize { /* Icon styles */ img.activityicon { - height: 24px; - width: 24px; + height: 32px; + width: 32px; vertical-align: middle; } @@ -24499,6 +24499,8 @@ audio.mediaplugin_html5audio { .modchooser .modal-footer .moodlenet-logo .icon { height: 2.5rem; width: 6rem; + max-height: 2.5rem; + max-width: 6rem; margin-bottom: 0.6rem; } @@ -24970,6 +24972,9 @@ dd:after { .inplaceeditable.inplaceeditingon select { margin-bottom: 0; } +.inplaceeditable .quickediticon .icon { + font-size: medium; +} .inplaceeditable .quickediticon img { opacity: 0.2; } @@ -26061,9 +26066,8 @@ body.behat-site .action-menu .dropdown-subpanel-content.show { } .icon { - font-size: 16px; - width: 16px; - height: 16px; + max-width: 24px; + max-height: 24px; margin: 0; padding: 0; box-sizing: content-box; @@ -26073,9 +26077,9 @@ body.behat-site .action-menu .dropdown-subpanel-content.show { margin-right: 0; } .icon.iconsize-medium { - font-size: 24px; - width: 24px; - height: 24px; + font-size: 32px; + width: 32px; + height: 32px; } .icon.iconsize-big { width: 64px; @@ -26197,76 +26201,65 @@ body.behat-site .action-menu .dropdown-subpanel-content.show { display: inline-flex; justify-content: center; align-items: center; - background-color: #f8f9fa; border-radius: 4px; padding: 0.7rem; } .activityiconcontainer .activityicon, .activityiconcontainer .icon { margin: 0; - font-size: 24px; - height: 24px; - width: 24px; + font-size: 32px; + height: 32px; + width: 32px; + max-height: 32px; + max-width: 32px; } .activityiconcontainer.small { width: 42px; height: 42px; + max-width: 42px; + max-height: 42px; } .activityiconcontainer.smaller { width: 32px; height: 32px; + max-width: 32px; + max-height: 32px; } .activityiconcontainer.smaller .activityicon { - width: 24px; - height: 24px; + width: 32px; + height: 32px; + max-width: 32px; + max-height: 32px; } -.activityiconcontainer.administration { - background-color: #5d63f6; -} -.activityiconcontainer.administration .activityicon:not(.nofilter), -.activityiconcontainer.administration .icon:not(.nofilter) { - filter: brightness(0) invert(1); +.activityiconcontainer.administration:not(.isbranded) .activityicon:not(.nofilter), +.activityiconcontainer.administration:not(.isbranded) .icon:not(.nofilter) { + filter: invert(45%) sepia(46%) saturate(3819%) hue-rotate(260deg) brightness(101%) contrast(87%); } -.activityiconcontainer.assessment { - background-color: #eb66a2; -} -.activityiconcontainer.assessment .activityicon:not(.nofilter), -.activityiconcontainer.assessment .icon:not(.nofilter) { - filter: brightness(0) invert(1); +.activityiconcontainer.assessment:not(.isbranded) .activityicon:not(.nofilter), +.activityiconcontainer.assessment:not(.isbranded) .icon:not(.nofilter) { + filter: invert(36%) sepia(98%) saturate(6969%) hue-rotate(315deg) brightness(90%) contrast(119%); } -.activityiconcontainer.collaboration { - background-color: #f7634d; -} -.activityiconcontainer.collaboration .activityicon:not(.nofilter), -.activityiconcontainer.collaboration .icon:not(.nofilter) { - filter: brightness(0) invert(1); +.activityiconcontainer.collaboration:not(.isbranded) .activityicon:not(.nofilter), +.activityiconcontainer.collaboration:not(.isbranded) .icon:not(.nofilter) { + filter: invert(25%) sepia(54%) saturate(6226%) hue-rotate(245deg) brightness(100%) contrast(102%); } -.activityiconcontainer.communication { - background-color: #11a676; -} -.activityiconcontainer.communication .activityicon:not(.nofilter), -.activityiconcontainer.communication .icon:not(.nofilter) { - filter: brightness(0) invert(1); +.activityiconcontainer.communication:not(.isbranded) .activityicon:not(.nofilter), +.activityiconcontainer.communication:not(.isbranded) .icon:not(.nofilter) { + filter: invert(48%) sepia(74%) saturate(4887%) hue-rotate(11deg) brightness(102%) contrast(101%); } -.activityiconcontainer.content { - background-color: #399be2; -} -.activityiconcontainer.content .activityicon:not(.nofilter), -.activityiconcontainer.content .icon:not(.nofilter) { - filter: brightness(0) invert(1); +.activityiconcontainer.content:not(.isbranded) .activityicon:not(.nofilter), +.activityiconcontainer.content:not(.isbranded) .icon:not(.nofilter) { + filter: invert(49%) sepia(52%) saturate(4675%) hue-rotate(156deg) brightness(89%) contrast(102%); } -.activityiconcontainer.interface { - background-color: #a378ff; -} -.activityiconcontainer.interface .activityicon:not(.nofilter), -.activityiconcontainer.interface .icon:not(.nofilter) { - filter: brightness(0) invert(1); +.activityiconcontainer.interactivecontent:not(.isbranded) .activityicon:not(.nofilter), +.activityiconcontainer.interactivecontent:not(.isbranded) .icon:not(.nofilter) { + filter: invert(25%) sepia(63%) saturate(1152%) hue-rotate(344deg) brightness(94%) contrast(91%); } .icon-box { @@ -26281,17 +26274,17 @@ body.behat-site .action-menu .dropdown-subpanel-content.show { } .icon-box .icon { margin: 0; - height: 24px; - width: 24px; + height: 32px; + width: 32px; } :root { - --activityadministration: #5d63f6; - --activityassessment: #eb66a2; - --activitycollaboration: #f7634d; - --activitycommunication: #11a676; - --activitycontent: #399be2; - --activityinterface: #a378ff; + --activityadministration: invert(45%) sepia(46%) saturate(3819%) hue-rotate(260deg) brightness(101%) contrast(87%); + --activityassessment: invert(36%) sepia(98%) saturate(6969%) hue-rotate(315deg) brightness(90%) contrast(119%); + --activitycollaboration: invert(25%) sepia(54%) saturate(6226%) hue-rotate(245deg) brightness(100%) contrast(102%); + --activitycommunication: invert(48%) sepia(74%) saturate(4887%) hue-rotate(11deg) brightness(102%) contrast(101%); + --activitycontent: invert(49%) sepia(52%) saturate(4675%) hue-rotate(156deg) brightness(89%) contrast(102%); + --activityinteractivecontent: invert(25%) sepia(63%) saturate(1152%) hue-rotate(344deg) brightness(94%) contrast(91%); } /* admin.less */ @@ -29785,9 +29778,6 @@ span.editinstructions .alert-link { color: #000; text-decoration: none; } -.defaultactivitycompletion-item a img { - filter: invert(25%) sepia(86%) saturate(1158%) hue-rotate(189deg) brightness(104%) contrast(92%); -} .defaultactivitycompletion-item .activityicon { width: 32px; height: 32px; @@ -35629,11 +35619,6 @@ p.arrow_button { .path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr td.column-name .itemselect { margin-right: 15px; } -.path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr td.column-name .itemicon { - font-size: 18px; - width: 18px; - height: 18px; -} .path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr td.column-weight { min-width: 15em; } diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css index b14164ed5de..d6adb76f1e5 100644 --- a/theme/classic/style/moodle.css +++ b/theme/classic/style/moodle.css @@ -23270,8 +23270,8 @@ img.resize { /* Icon styles */ img.activityicon { - height: 24px; - width: 24px; + height: 32px; + width: 32px; vertical-align: middle; } @@ -24499,6 +24499,8 @@ audio.mediaplugin_html5audio { .modchooser .modal-footer .moodlenet-logo .icon { height: 2.5rem; width: 6rem; + max-height: 2.5rem; + max-width: 6rem; margin-bottom: 0.6rem; } @@ -24970,6 +24972,9 @@ dd:after { .inplaceeditable.inplaceeditingon select { margin-bottom: 0; } +.inplaceeditable .quickediticon .icon { + font-size: medium; +} .inplaceeditable .quickediticon img { opacity: 0.2; } @@ -26061,9 +26066,8 @@ body.behat-site .action-menu .dropdown-subpanel-content.show { } .icon { - font-size: 16px; - width: 16px; - height: 16px; + max-width: 24px; + max-height: 24px; margin: 0; padding: 0; box-sizing: content-box; @@ -26073,9 +26077,9 @@ body.behat-site .action-menu .dropdown-subpanel-content.show { margin-right: 0; } .icon.iconsize-medium { - font-size: 24px; - width: 24px; - height: 24px; + font-size: 32px; + width: 32px; + height: 32px; } .icon.iconsize-big { width: 64px; @@ -26197,76 +26201,65 @@ body.behat-site .action-menu .dropdown-subpanel-content.show { display: inline-flex; justify-content: center; align-items: center; - background-color: #f8f9fa; border-radius: 4px; padding: 0.7rem; } .activityiconcontainer .activityicon, .activityiconcontainer .icon { margin: 0; - font-size: 24px; - height: 24px; - width: 24px; + font-size: 32px; + height: 32px; + width: 32px; + max-height: 32px; + max-width: 32px; } .activityiconcontainer.small { width: 42px; height: 42px; + max-width: 42px; + max-height: 42px; } .activityiconcontainer.smaller { width: 32px; height: 32px; + max-width: 32px; + max-height: 32px; } .activityiconcontainer.smaller .activityicon { - width: 24px; - height: 24px; + width: 32px; + height: 32px; + max-width: 32px; + max-height: 32px; } -.activityiconcontainer.administration { - background-color: #5d63f6; -} -.activityiconcontainer.administration .activityicon:not(.nofilter), -.activityiconcontainer.administration .icon:not(.nofilter) { - filter: brightness(0) invert(1); +.activityiconcontainer.administration:not(.isbranded) .activityicon:not(.nofilter), +.activityiconcontainer.administration:not(.isbranded) .icon:not(.nofilter) { + filter: invert(45%) sepia(46%) saturate(3819%) hue-rotate(260deg) brightness(101%) contrast(87%); } -.activityiconcontainer.assessment { - background-color: #eb66a2; -} -.activityiconcontainer.assessment .activityicon:not(.nofilter), -.activityiconcontainer.assessment .icon:not(.nofilter) { - filter: brightness(0) invert(1); +.activityiconcontainer.assessment:not(.isbranded) .activityicon:not(.nofilter), +.activityiconcontainer.assessment:not(.isbranded) .icon:not(.nofilter) { + filter: invert(36%) sepia(98%) saturate(6969%) hue-rotate(315deg) brightness(90%) contrast(119%); } -.activityiconcontainer.collaboration { - background-color: #f7634d; -} -.activityiconcontainer.collaboration .activityicon:not(.nofilter), -.activityiconcontainer.collaboration .icon:not(.nofilter) { - filter: brightness(0) invert(1); +.activityiconcontainer.collaboration:not(.isbranded) .activityicon:not(.nofilter), +.activityiconcontainer.collaboration:not(.isbranded) .icon:not(.nofilter) { + filter: invert(25%) sepia(54%) saturate(6226%) hue-rotate(245deg) brightness(100%) contrast(102%); } -.activityiconcontainer.communication { - background-color: #11a676; -} -.activityiconcontainer.communication .activityicon:not(.nofilter), -.activityiconcontainer.communication .icon:not(.nofilter) { - filter: brightness(0) invert(1); +.activityiconcontainer.communication:not(.isbranded) .activityicon:not(.nofilter), +.activityiconcontainer.communication:not(.isbranded) .icon:not(.nofilter) { + filter: invert(48%) sepia(74%) saturate(4887%) hue-rotate(11deg) brightness(102%) contrast(101%); } -.activityiconcontainer.content { - background-color: #399be2; -} -.activityiconcontainer.content .activityicon:not(.nofilter), -.activityiconcontainer.content .icon:not(.nofilter) { - filter: brightness(0) invert(1); +.activityiconcontainer.content:not(.isbranded) .activityicon:not(.nofilter), +.activityiconcontainer.content:not(.isbranded) .icon:not(.nofilter) { + filter: invert(49%) sepia(52%) saturate(4675%) hue-rotate(156deg) brightness(89%) contrast(102%); } -.activityiconcontainer.interface { - background-color: #a378ff; -} -.activityiconcontainer.interface .activityicon:not(.nofilter), -.activityiconcontainer.interface .icon:not(.nofilter) { - filter: brightness(0) invert(1); +.activityiconcontainer.interactivecontent:not(.isbranded) .activityicon:not(.nofilter), +.activityiconcontainer.interactivecontent:not(.isbranded) .icon:not(.nofilter) { + filter: invert(25%) sepia(63%) saturate(1152%) hue-rotate(344deg) brightness(94%) contrast(91%); } .icon-box { @@ -26281,17 +26274,17 @@ body.behat-site .action-menu .dropdown-subpanel-content.show { } .icon-box .icon { margin: 0; - height: 24px; - width: 24px; + height: 32px; + width: 32px; } :root { - --activityadministration: #5d63f6; - --activityassessment: #eb66a2; - --activitycollaboration: #f7634d; - --activitycommunication: #11a676; - --activitycontent: #399be2; - --activityinterface: #a378ff; + --activityadministration: invert(45%) sepia(46%) saturate(3819%) hue-rotate(260deg) brightness(101%) contrast(87%); + --activityassessment: invert(36%) sepia(98%) saturate(6969%) hue-rotate(315deg) brightness(90%) contrast(119%); + --activitycollaboration: invert(25%) sepia(54%) saturate(6226%) hue-rotate(245deg) brightness(100%) contrast(102%); + --activitycommunication: invert(48%) sepia(74%) saturate(4887%) hue-rotate(11deg) brightness(102%) contrast(101%); + --activitycontent: invert(49%) sepia(52%) saturate(4675%) hue-rotate(156deg) brightness(89%) contrast(102%); + --activityinteractivecontent: invert(25%) sepia(63%) saturate(1152%) hue-rotate(344deg) brightness(94%) contrast(91%); } /* admin.less */ @@ -29785,9 +29778,6 @@ span.editinstructions .alert-link { color: #000; text-decoration: none; } -.defaultactivitycompletion-item a img { - filter: invert(25%) sepia(86%) saturate(1158%) hue-rotate(189deg) brightness(104%) contrast(92%); -} .defaultactivitycompletion-item .activityicon { width: 32px; height: 32px; @@ -35629,11 +35619,6 @@ p.arrow_button { .path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr td.column-name .itemselect { margin-right: 15px; } -.path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr td.column-name .itemicon { - font-size: 18px; - width: 18px; - height: 18px; -} .path-grade-edit-tree .gradetree-wrapper .setup-grades.generaltable tr td.column-weight { min-width: 15em; }