diff --git a/core/includes/theme.inc b/core/includes/theme.inc index 0d0e739..76b33c7 100644 --- a/core/includes/theme.inc +++ b/core/includes/theme.inc @@ -1707,7 +1707,7 @@ function theme_status_messages($variables) { 'warning' => t('Warning message'), ); foreach (drupal_get_messages($display) as $type => $messages) { - $output .= "
\n"; + $output .= "
\n"; if (!empty($status_heading[$type])) { $output .= '

' . $status_heading[$type] . "

\n"; } diff --git a/core/misc/message-16-error.png b/core/misc/message-16-error.png index 486390c..002ad49 100644 --- a/core/misc/message-16-error.png +++ b/core/misc/message-16-error.png @@ -1,7 +1,7 @@ PNG  - IHDRaIDATxڥ?HBQƣr #p(2hAk -!GP2ISiъ -:W_O"sw^gH^3כT(Ppc"31!h>_af Epd!H ߯! LNj Mp7<ǃpl2LIlo#6; a!vp˅r4 -u -RpNE>yHnlG.RWR B?%a<a2#=4}DrOu_ TWXTPjmA(`%xZZjKjFUtNjX'';GWXCW83p~zo$B{;rtAjX) |!uwsֆhx-=2ةQ-riIMQ(r?6{L~_ͧGIENDB` \ No newline at end of file + IHDRaIDATxڭ= +@SoahV)"Ѩ-Ũz-7 oaxXhvvfxlU +p6ϋ +\m)  i v:b[;[2SPm$>$*Pͩ™fdQHm sT0LLc +4I$ʻv]" S%;Kr)ZM2~H|Z~ Bo֢Eܞ]IENDB` \ No newline at end of file diff --git a/core/misc/message-16-ok.png b/core/misc/message-16-ok.png index 9edebe6..c208b56 100644 --- a/core/misc/message-16-ok.png +++ b/core/misc/message-16-ok.png @@ -1,7 +1,4 @@ PNG  - IHDRaFIDATxڥKSaǍ( K9sc?D<8v1s[8""j<ۜrg 6kV&M]+[Taԅo}>|x}:fr1݄ΤNy8 Mt; ]it_C{G :H˲ -tS n¾i1?1C@6j -<]ԼCC``qP*z>uzw k?tڏH1Biv TQE]p_ʀI38{׎mA|bʨ}" -^ojR ۸>w 1x:W:ѾE\^7$ -L OȱrI(x-n8@f r^yL#gEphtKRp.‹1RDvK[vJMeQHV?TyP):Z~6{FvȦeB1G8N2>\E꓂ Zt1f3Y&D'O||$4ƨ"&!@2)%@][}C;wN]-``0Q9O[x>PdIENDB` \ No newline at end of file + IHDR k=kIDATxڝ SD.+BVHl +*~ +8>Q4k˭1^.Z]k(P h@sGN -cx h4Xѯ{QT0 -qPk|anrp#+2oa52[|i -v^ةYd=sU,0 (N{0K_]ˇ"d͇(Td-hS@Q©`.Ci܀Xr`(\?I`n1¯tT7aIQ=l0;n)[`£4gIENDB` \ No newline at end of file + IHDRa{IDATxڝ Œ̵` B:1,<̢JFLQs$UIyk9+ !: +b3JV`}HlAg\Q .IENDB` \ No newline at end of file diff --git a/core/modules/system/system.theme-rtl.css b/core/modules/system/system.theme-rtl.css index b2ee453..651f14e 100644 --- a/core/modules/system/system.theme-rtl.css +++ b/core/modules/system/system.theme-rtl.css @@ -95,11 +95,21 @@ ul.menu { /** * RTL Styles for system messages. */ - -div.messages { - background-position: 99% 8px; - padding: 10px 50px 10px 10px; +.messages { + border-width: 1px 8px 1px 1px; + background-position-x: 99%; + padding-left: 20px; + padding-right: 35px; + text-align: right; +} +.messages--status { + background-position-x: 99.3%; + border-color: #c9e1bd #77b259 #c9e1bd #c9e1bd; } -div.messages ul { - margin: 0 1em 0 0; +.messages--warning { + border-color: #f4daa6 #e09600 #f4daa6 #f4daa6; } +.messages--error { + border-color: #f9c9bf #e62600 #f9c9bf #f9c9bf; +} + diff --git a/core/modules/system/system.theme.css b/core/modules/system/system.theme.css index 3219a8f..0cf0e02 100644 --- a/core/modules/system/system.theme.css +++ b/core/modules/system/system.theme.css @@ -428,62 +428,60 @@ ul.tabs { /** * Styles for system messages. */ -div.messages { - background-position: 8px 8px; /* LTR */ - background-repeat: no-repeat; +.messages { + background: no-repeat 10px 19px; /* LTR */ border: 1px solid; - margin: 6px 0; - padding: 10px 10px 10px 50px; /* LTR */ + border-width: 1px 1px 1px 8px; /* LTR */ + border-radius: 2px; + padding: 15px 20px 15px 35px; /* LTR */ word-wrap: break-word; overflow-wrap: break-word; } -.messages.status { - background-image: url(../../misc/message-24-ok.png); - border-color: #be7; +.messages + .messages { + margin-top: 1.538em; } -.messages.status, + +/* @TODO Separate tables and messages styling */ +.messages--status { + border-color: #c9e1bd #c9e1bd #c9e1bd #77b259; /* LTR */ + background-image: url(../../misc/message-16-ok.png); + background-position-x: 12px; /* LTR */ +} +.messages--status, .ok { - color: #234600; + color: #325e1c; } -.messages.status, +.messages--status, table tr.ok { - background-color: #f8fff0; + background-color: #f3faef; } -.messages.warning { - background-image: url(../../misc/message-24-warning.png); - border-color: #ed5; +.messages--warning { + background-image: url(../../misc/message-16-warning.png); + border-color: #f4daa6 #f4daa6 #f4daa6 #e09600; /* LTR */ } -.messages.warning, +.messages--warning, .warning { - color: #840; + color: #734c00; } -.messages.warning, +.messages--warning, table tr.warning { - background-color: #fffce5; + background-color: #fdf8ed; } -.messages.error { - background-image: url(../../misc/message-24-error.png); - border-color: #ed541d; +.messages--error { + background-image: url(../../misc/message-16-error.png); + border-color: #f9c9bf #f9c9bf #f9c9bf #e62600; /* LTR */ } -.messages.error, +.messages--error, .error { - color: #8c2e0b; + color: #a51b00; } -.messages.error, +.messages--error, table tr.error { - background-color: #fef5f1; -} -.messages.error p.error { - color: #333; -} - -div.messages ul { - margin: 0 0 0 1em; /* LTR */ - padding: 0; + background-color: #fcf4f2; } -div.messages ul li { - list-style-image: none; +.messages--error p.error { + color: #a51b00; }