Commit 718cb293 authored by Shamim Rezaie's avatar Shamim Rezaie
Browse files

Merge branch 'MDL-75055-master' of https://github.com/junpataleta/moodle

parents 81ba0563 453c3ac4
...@@ -34,9 +34,14 @@ ...@@ -34,9 +34,14 @@
* announce Whether the notification should be announced to screen readers. * announce Whether the notification should be announced to screen readers.
Example context (json): Example context (json):
{ "message": "Your pants are on fire!", "closebutton": 1, "announce": 1, "extraclasses": "foo bar"} {
"message": "<p>Hello <a href=\"#\">World!</a></p><p>Your pants are on fire!</p>",
"closebutton": 1,
"announce": 1,
"extraclasses": "foo bar"
}
}} }}
<div class="alert {{$alertclass}}alert-secondary{{/alertclass}} alert-block fade in {{ extraclasses }}" {{! <div class="alert {{$alertclass}}alert-secondary{{/alertclass}} alert-block fade in {{ extraclasses }} {{#closebutton}}alert-dismissible{{/closebutton}}" {{!
}}{{# announce }} role="alert" data-aria-autofocus="true"{{/ announce }}> }}{{# announce }} role="alert" data-aria-autofocus="true"{{/ announce }}>
{{{ message }}} {{{ message }}}
{{# closebutton }}{{! {{# closebutton }}{{!
......
...@@ -2678,8 +2678,15 @@ $picker-emojis-per-row: 7 !default; ...@@ -2678,8 +2678,15 @@ $picker-emojis-per-row: 7 !default;
} }
@each $color, $value in $theme-colors { @each $color, $value in $theme-colors {
.alert-#{$color} a { .alert-#{$color} {
color: darken(theme-color-level($color, $alert-color-level), 10%); a {
color: darken(theme-color-level($color, $alert-color-level), 10%);
}
// Darken the close button text colour inside notification alerts for better contrast.
.close {
color: darken(theme-color-level($color, $alert-color-level), 20%);
opacity: 0.6;
}
} }
} }
.alert a { .alert a {
......
...@@ -12007,27 +12007,59 @@ input[disabled] { ...@@ -12007,27 +12007,59 @@ input[disabled] {
.alert-primary a { .alert-primary a {
color: #041d34; } color: #041d34; }
   
.alert-primary .close {
color: #000305;
opacity: 0.6; }
.alert-secondary a { .alert-secondary a {
color: #525557; } color: #525557; }
   
.alert-secondary .close {
color: #393b3d;
opacity: 0.6; }
.alert-success a, .environmenttable .ok a { .alert-success a, .environmenttable .ok a {
color: #0c1b0b; } color: #0c1b0b; }
   
.alert-success .close, .environmenttable .ok .close {
color: black;
opacity: 0.6; }
.alert-info a { .alert-info a {
color: #00171b; } color: #00171b; }
   
.alert-info .close {
color: black;
opacity: 0.6; }
.alert-warning a, .environmenttable .warn a { .alert-warning a, .environmenttable .warn a {
color: #573e1c; } color: #573e1c; }
   
.alert-warning .close, .environmenttable .warn .close {
color: #302310;
opacity: 0.6; }
.alert-danger a, .environmenttable .error a { .alert-danger a, .environmenttable .error a {
color: #3d0f0a; } color: #3d0f0a; }
   
.alert-danger .close, .environmenttable .error .close {
color: #110403;
opacity: 0.6; }
.alert-light a { .alert-light a {
color: #686868; } color: #686868; }
   
.alert-light .close {
color: #4e4e4f;
opacity: 0.6; }
.alert-dark a { .alert-dark a {
color: #040505; } color: #040505; }
   
.alert-dark .close {
color: black;
opacity: 0.6; }
.alert a { .alert a {
font-weight: 700; } font-weight: 700; }
   
......
...@@ -12007,27 +12007,59 @@ input[disabled] { ...@@ -12007,27 +12007,59 @@ input[disabled] {
.alert-primary a { .alert-primary a {
color: #041d34; } color: #041d34; }
   
.alert-primary .close {
color: #000305;
opacity: 0.6; }
.alert-secondary a { .alert-secondary a {
color: #525557; } color: #525557; }
   
.alert-secondary .close {
color: #393b3d;
opacity: 0.6; }
.alert-success a, .environmenttable .ok a { .alert-success a, .environmenttable .ok a {
color: #0c1b0b; } color: #0c1b0b; }
   
.alert-success .close, .environmenttable .ok .close {
color: black;
opacity: 0.6; }
.alert-info a { .alert-info a {
color: #00171b; } color: #00171b; }
   
.alert-info .close {
color: black;
opacity: 0.6; }
.alert-warning a, .environmenttable .warn a { .alert-warning a, .environmenttable .warn a {
color: #573e1c; } color: #573e1c; }
   
.alert-warning .close, .environmenttable .warn .close {
color: #302310;
opacity: 0.6; }
.alert-danger a, .environmenttable .error a { .alert-danger a, .environmenttable .error a {
color: #3d0f0a; } color: #3d0f0a; }
   
.alert-danger .close, .environmenttable .error .close {
color: #110403;
opacity: 0.6; }
.alert-light a { .alert-light a {
color: #686868; } color: #686868; }
   
.alert-light .close {
color: #4e4e4f;
opacity: 0.6; }
.alert-dark a { .alert-dark a {
color: #040505; } color: #040505; }
   
.alert-dark .close {
color: black;
opacity: 0.6; }
.alert a { .alert a {
font-weight: 700; } font-weight: 700; }
   
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment