From 793fe8ac40ab02a4a88a3615aa1743fa81ec654f Mon Sep 17 00:00:00 2001 From: Sara Arjona Date: Thu, 18 Jul 2024 13:42:02 +0200 Subject: [PATCH] MDL-82497 theme: Update icons for consistency Some places where using the wrong icon and now that they have changed, they need to be updated. For instance: - i/settings (cog) should be used for settings or configure. - t/edit (pen) should be used for editing --- .../templates/bankcontent/toolbar.mustache | 2 +- .../local/content/frontpagesection.mustache | 2 +- course/lib.php | 2 +- course/tests/behat/activity_chooser.feature | 4 ++-- lib/blocklib.php | 2 +- ...essage_drawer_view_overview_header.mustache | 2 +- .../local/systemreports/reports_list.php | 2 +- theme/boost/scss/moodle/blocks.scss | 5 ++++- theme/boost/scss/moodle/forms.scss | 5 +++++ theme/boost/scss/moodle/popover-region.scss | 5 ----- theme/boost/scss/moodle/reportbuilder.scss | 1 - theme/boost/scss/moodle/user.scss | 4 ++++ theme/boost/style/moodle.css | 18 +++++++++++++----- theme/classic/style/moodle.css | 18 +++++++++++++----- 14 files changed, 47 insertions(+), 25 deletions(-) diff --git a/contentbank/templates/bankcontent/toolbar.mustache b/contentbank/templates/bankcontent/toolbar.mustache index b377674e368d0..06ce0ccdd1357 100644 --- a/contentbank/templates/bankcontent/toolbar.mustache +++ b/contentbank/templates/bankcontent/toolbar.mustache @@ -72,5 +72,5 @@ data-action="viewgrid"> diff --git a/course/format/templates/local/content/frontpagesection.mustache b/course/format/templates/local/content/frontpagesection.mustache index f17865fa51d4e..126e745c7ed9d 100644 --- a/course/format/templates/local/content/frontpagesection.mustache +++ b/course/format/templates/local/content/frontpagesection.mustache @@ -32,7 +32,7 @@ {{#showsettings}}
- {{#pix}} t/edit, moodle {{/pix}} + {{#pix}} i/settings, moodle {{/pix}}
{{/showsettings}} diff --git a/course/lib.php b/course/lib.php index 7115a7c78ce43..950f784a48e48 100644 --- a/course/lib.php +++ b/course/lib.php @@ -1466,7 +1466,7 @@ function course_get_cm_edit_actions(cm_info $mod, $indent = -1, $sr = null) { if ($hasmanageactivities) { $actions['update'] = new action_menu_link_secondary( new moodle_url($baseurl, array('update' => $mod->id)), - new pix_icon('t/edit', '', 'moodle', array('class' => 'iconsmall')), + new pix_icon('i/settings', '', 'moodle', ['class' => 'iconsmall']), $str->editsettings, array('class' => 'editing_update', 'data-action' => 'update') ); diff --git a/course/tests/behat/activity_chooser.feature b/course/tests/behat/activity_chooser.feature index ad6b9115fb13c..cc8731a470652 100644 --- a/course/tests/behat/activity_chooser.feature +++ b/course/tests/behat/activity_chooser.feature @@ -302,7 +302,7 @@ Feature: Display and choose from the available activities in course # Confirm more help link exists Then "More help" "link" should exist # Confirm that corresponding help icon exist - And ".fa-info-circle" "css_element" should exist + And ".fa-book" "css_element" should exist # Confirm that link opens in new window And "Opens in new window" "link" should be visible # Confirm the same behaviour for weekly format course @@ -313,6 +313,6 @@ Feature: Display and choose from the available activities in course # Confirm more help link exists And "More help" "link" should exist # Confirm that corresponding help icon exist - And ".fa-info-circle" "css_element" should exist + And ".fa-book" "css_element" should exist # Confirm that link opens in new window And "Opens in new window" "link" should be visible diff --git a/lib/blocklib.php b/lib/blocklib.php index 127aba33e1d5c..92ead8f8b7b6c 100644 --- a/lib/blocklib.php +++ b/lib/blocklib.php @@ -1342,7 +1342,7 @@ public function edit_controls($block) { $controls[] = new action_menu_link_secondary( $editactionurl, - new pix_icon('t/edit', $str, 'moodle', array('class' => 'iconsmall', 'title' => '')), + new pix_icon('i/settings', $str, 'moodle', ['class' => 'iconsmall', 'title' => '']), $str, [ 'class' => 'editing_edit', diff --git a/message/templates/message_drawer_view_overview_header.mustache b/message/templates/message_drawer_view_overview_header.mustache index 17ca572ea9326..e1c3337919cec 100644 --- a/message/templates/message_drawer_view_overview_header.mustache +++ b/message/templates/message_drawer_view_overview_header.mustache @@ -58,7 +58,7 @@ aria-label="{{#str}} settings, core_message {{/str}}" role="button" > - {{#pix}} t/edit, core {{/pix}} + {{#pix}} i/settings, core {{/pix}} {{/caneditownmessageprofile}} diff --git a/reportbuilder/classes/local/systemreports/reports_list.php b/reportbuilder/classes/local/systemreports/reports_list.php index 37daf09e70292..9cf21f88da2fe 100644 --- a/reportbuilder/classes/local/systemreports/reports_list.php +++ b/reportbuilder/classes/local/systemreports/reports_list.php @@ -282,7 +282,7 @@ protected function add_actions(): void { // Edit details action. $this->add_action((new action( new moodle_url('#'), - new pix_icon('t/edit', ''), + new pix_icon('i/settings', ''), ['data-action' => 'report-edit', 'data-report-id' => ':id'], false, new lang_string('editreportdetails', 'core_reportbuilder') diff --git a/theme/boost/scss/moodle/blocks.scss b/theme/boost/scss/moodle/blocks.scss index 47f825822b9e5..5b5657bb6a176 100644 --- a/theme/boost/scss/moodle/blocks.scss +++ b/theme/boost/scss/moodle/blocks.scss @@ -24,9 +24,12 @@ .block .block-controls { .dropdown-toggle { - /* So that the caret takes the colour of the icon. */ + /* So that the icon takes the colour of the icon. */ color: $body-color; } + .dropdown-toggle::after { + display: none; + } } $blocks-column-width: 360px !default; diff --git a/theme/boost/scss/moodle/forms.scss b/theme/boost/scss/moodle/forms.scss index 03218acb8947b..0e2bd9c768c1e 100644 --- a/theme/boost/scss/moodle/forms.scss +++ b/theme/boost/scss/moodle/forms.scss @@ -212,6 +212,11 @@ div#dateselector-calendar-panel { display: none; } +.availability-field img { + width: 16px; + height: 16px; +} + .availability-eye { clear: left; float: left; diff --git a/theme/boost/scss/moodle/popover-region.scss b/theme/boost/scss/moodle/popover-region.scss index 89e03e1538ee5..98272f07f2c75 100644 --- a/theme/boost/scss/moodle/popover-region.scss +++ b/theme/boost/scss/moodle/popover-region.scss @@ -178,11 +178,6 @@ $content-header-footer-height: $region-header-height + $region-footer-height; .icon { font-weight: bolder; } - .notification-image { - .icon { - font-weight: 400; - } - } } } diff --git a/theme/boost/scss/moodle/reportbuilder.scss b/theme/boost/scss/moodle/reportbuilder.scss index 94722435518ca..2d97d8d1c5f6a 100644 --- a/theme/boost/scss/moodle/reportbuilder.scss +++ b/theme/boost/scss/moodle/reportbuilder.scss @@ -315,7 +315,6 @@ $rb-sortable-list-drag-color: lighten($primary, 40%); .toggle-card-button { i.toggle-card-icon { color: $gray-600; - font-size: 1.5em; font-weight: 700; } // Toggle icons using standard bootstrap collapse. diff --git a/theme/boost/scss/moodle/user.scss b/theme/boost/scss/moodle/user.scss index 7e088bf02a4e4..1f8a788e15075 100644 --- a/theme/boost/scss/moodle/user.scss +++ b/theme/boost/scss/moodle/user.scss @@ -253,6 +253,10 @@ #userselector_options .collapsibleregioncaption { font-weight: bold; + img { + width: 16px; + height: 16px; + } } #userselector_options p { diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css index 809a0dd85c82c..79da4c06d5e09 100644 --- a/theme/boost/style/moodle.css +++ b/theme/boost/style/moodle.css @@ -27043,9 +27043,12 @@ img.icon { } .block .block-controls .dropdown-toggle { - /* So that the caret takes the colour of the icon. */ + /* So that the icon takes the colour of the icon. */ color: #1d2125; } +.block .block-controls .dropdown-toggle::after { + display: none; +} [data-region=blocks-column] { width: 360px; @@ -32905,6 +32908,10 @@ body.path-question-type .mform fieldset.hidden { #userselector_options .collapsibleregioncaption { font-weight: bold; } +#userselector_options .collapsibleregioncaption img { + width: 16px; + height: 16px; +} #userselector_options p { margin: 0.2em 0; @@ -33252,6 +33259,11 @@ div#dateselector-calendar-panel { display: none; } +.availability-field img { + width: 16px; + height: 16px; +} + .availability-eye { clear: left; float: left; @@ -36738,9 +36750,6 @@ body { .navbar-nav .popover-region .icon { font-weight: bolder; } -.navbar-nav .popover-region .notification-image .icon { - font-weight: 400; -} .navbar .popover-region.collapsed .popover-region-container { opacity: 0; @@ -38345,7 +38354,6 @@ div.editor_atto_toolbar button .icon { } .reportbuilder-toggle-card .toggle-card-button i.toggle-card-icon { color: #6a737b; - font-size: 1.5em; font-weight: 700; } .reportbuilder-toggle-card .toggle-card-button .collapsed-icon-container { diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css index 09edccf9e8310..3a2141d035190 100644 --- a/theme/classic/style/moodle.css +++ b/theme/classic/style/moodle.css @@ -27043,9 +27043,12 @@ img.icon { } .block .block-controls .dropdown-toggle { - /* So that the caret takes the colour of the icon. */ + /* So that the icon takes the colour of the icon. */ color: #1d2125; } +.block .block-controls .dropdown-toggle::after { + display: none; +} [data-region=blocks-column] { width: 360px; @@ -32905,6 +32908,10 @@ body.path-question-type .mform fieldset.hidden { #userselector_options .collapsibleregioncaption { font-weight: bold; } +#userselector_options .collapsibleregioncaption img { + width: 16px; + height: 16px; +} #userselector_options p { margin: 0.2em 0; @@ -33252,6 +33259,11 @@ div#dateselector-calendar-panel { display: none; } +.availability-field img { + width: 16px; + height: 16px; +} + .availability-eye { clear: left; float: left; @@ -36672,9 +36684,6 @@ body { .navbar-nav .popover-region .icon { font-weight: bolder; } -.navbar-nav .popover-region .notification-image .icon { - font-weight: 400; -} .navbar .popover-region.collapsed .popover-region-container { opacity: 0; @@ -38279,7 +38288,6 @@ div.editor_atto_toolbar button .icon { } .reportbuilder-toggle-card .toggle-card-button i.toggle-card-icon { color: #6a737b; - font-size: 1.5em; font-weight: 700; } .reportbuilder-toggle-card .toggle-card-button .collapsed-icon-container {