moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-09 10:56:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Huong Nguyen 2024-02-29 10:44:39 +07:00
commit 1c11531ab7
5 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
message/output/popup/templates/notification_area_content_area_header.mustache
View file

@ -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="subject-container">{{subject}}</div>
<div class="timestamp">{{timecreatedpretty}}</div> <div class="timestamp">{{timecreatedpretty}}</div>

2
message/output/popup/templates/notification_content_item.mustache
View file

@ -65,7 +65,7 @@
<div class="content-item-body"> <div class="content-item-body">
<div class="notification-image"> <div class="notification-image">
<img src="{{{iconurl}}}" alt="{{#str}}notificationimage, message{{/str}}"/> {{#pix}} e/text_highlight, core, {{#str}} notificationimage, message {{/str}} {{/pix}}
</div> </div>
<div class="notification-message">{{shortenedsubject}}</div> <div class="notification-message">{{shortenedsubject}}</div>
</div> </div>

7
theme/boost/scss/moodle/popover-region.scss
View file

@ -6,7 +6,7 @@ $region-header-height: 25px;
$region-footer-height: 30px; $region-footer-height: 30px;
$content-item-hover-colour-bg: $primary; $content-item-hover-colour-bg: $primary;
$content-item-hover-colour-text: $white; $content-item-hover-colour-text: $white;
$content-item-selected-colour-bg: #4f94cd; $content-item-selected-colour-bg: #3279b3;
$content-item-unread-colour: #f4f4f4; $content-item-unread-colour: #f4f4f4;
$content-header-footer-height: $region-header-height + $region-footer-height; $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 { .icon {
font-weight: bolder; font-weight: bolder;
} }
.notification-image {
.icon {
font-weight: 400;
}
}
} }
} }

7
theme/boost/style/moodle.css
View file

@ -36340,6 +36340,9 @@ body {
.navbar-nav .popover-region .icon { .navbar-nav .popover-region .icon {
font-weight: bolder; font-weight: bolder;
} }
.navbar-nav .popover-region .notification-image .icon {
font-weight: 400;
}
.navbar .popover-region.collapsed .popover-region-container { .navbar .popover-region.collapsed .popover-region-container {
opacity: 0; opacity: 0;
@ -36439,9 +36442,9 @@ body {
width: calc(100% - 24px); width: calc(100% - 24px);
} }
.content-item-container.selected { .content-item-container.selected {
background-color: #4f94cd; background-color: #3279b3;
color: #fff; color: #fff;
border-color: #4f94cd; border-color: #3279b3;
} }
.content-item-container.selected .content-item-footer .timestamp { .content-item-container.selected .content-item-footer .timestamp {
color: #fff; color: #fff;

7
theme/classic/style/moodle.css
View file

@ -36274,6 +36274,9 @@ body {
.navbar-nav .popover-region .icon { .navbar-nav .popover-region .icon {
font-weight: bolder; font-weight: bolder;
} }
.navbar-nav .popover-region .notification-image .icon {
font-weight: 400;
}
.navbar .popover-region.collapsed .popover-region-container { .navbar .popover-region.collapsed .popover-region-container {
opacity: 0; opacity: 0;
@ -36373,9 +36376,9 @@ body {
width: calc(100% - 24px); width: calc(100% - 24px);
} }
.content-item-container.selected { .content-item-container.selected {
background-color: #4f94cd; background-color: #3279b3;
color: #fff; color: #fff;
border-color: #4f94cd; border-color: #3279b3;
} }
.content-item-container.selected .content-item-footer .timestamp { .content-item-container.selected .content-item-footer .timestamp {
color: #fff; color: #fff;