Merge branch 'MDL-80364' of https://github.com/pedrojordao/moodle

moodle · Feb 29, 2024 · 1c11531 · 1c11531
2 parents 3020fac + 25125bb
commit 1c11531
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 7 deletions.
diff --git a/message/output/popup/templates/notification_area_content_area_header.mustache b/message/output/popup/templates/notification_area_content_area_header.mustache
@@ -36,6 +36,6 @@
     }
 
 }}
-<div class="image-container"><img src="{{{iconurl}}}" alt="{{#str}}notificationimage, message{{/str}}"/></div>
+<div class="image-container">{{#pix}} e/text_highlight, core, {{#str}} notificationimage, message {{/str}} {{/pix}}</div>
 <div class="subject-container">{{subject}}</div>
 <div class="timestamp">{{timecreatedpretty}}</div>
diff --git a/message/output/popup/templates/notification_content_item.mustache b/message/output/popup/templates/notification_content_item.mustache
@@ -65,7 +65,7 @@
 
         <div class="content-item-body">
             <div class="notification-image">
-                <img src="{{{iconurl}}}" alt="{{#str}}notificationimage, message{{/str}}"/>
+                {{#pix}} e/text_highlight, core, {{#str}} notificationimage, message {{/str}} {{/pix}}
             </div>
             <div class="notification-message">{{shortenedsubject}}</div>
         </div>

diff --git a/theme/boost/scss/moodle/popover-region.scss b/theme/boost/scss/moodle/popover-region.scss
@@ -6,7 +6,7 @@ $region-header-height: 25px;
 $region-footer-height: 30px;
 $content-item-hover-colour-bg: $primary;
 $content-item-hover-colour-text: $white;
-$content-item-selected-colour-bg: #4f94cd;
+$content-item-selected-colour-bg: #3279b3;
 $content-item-unread-colour: #f4f4f4;
 $content-header-footer-height: $region-header-height + $region-footer-height;
 
@@ -178,6 +178,11 @@ $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/style/moodle.css b/theme/boost/style/moodle.css
@@ -36340,6 +36340,9 @@ 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;
@@ -36439,9 +36442,9 @@ body {
   width: calc(100% - 24px);
 }
 .content-item-container.selected {
-  background-color: #4f94cd;
+  background-color: #3279b3;
   color: #fff;
-  border-color: #4f94cd;
+  border-color: #3279b3;
 }
 .content-item-container.selected .content-item-footer .timestamp {
   color: #fff;

diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
@@ -36274,6 +36274,9 @@ 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;
@@ -36373,9 +36376,9 @@ body {
   width: calc(100% - 24px);
 }
 .content-item-container.selected {
-  background-color: #4f94cd;
+  background-color: #3279b3;
   color: #fff;
-  border-color: #4f94cd;
+  border-color: #3279b3;
 }
 .content-item-container.selected .content-item-footer .timestamp {
   color: #fff;