Merge remote-tracking branch 'origin/tqtc/lts-5.15.8' into tqtc/lts-5.15-opensourcev5.15.8-lts-lgpl

Change-Id: I569a2246c9e8d70430e8c5405b9f3df2218078ee

2 files changed, 26 insertions, 28 deletions

diff --git a/doc/global/template/style/offline.css b/doc/global/template/style/offline.css
index d2c1841834..c6bc6a9673 100644
--- a/doc/global/template/style/offline.css
+++ b/doc/global/template/style/offline.css
@@ -112,39 +112,18 @@ a[href*="http://"], a[href*="ftp://"], a[href*="https://"] {
 NOTE styles
 -------------------------------
 */
-
-.notetitle, .tiptitle, .fastpathtitle {
-    font-weight: bold
-}
-
-.attentiontitle, .cautiontitle, .dangertitle, .importanttitle, .remembertitle, .restrictiontitle {
-    font-weight: bold
+.admonition {
+    padding: 5px 0 5px 40px;
+    border: #ccc 1px solid;
 }
 
-.note, .tip, .fastpath {
-    background: #F2F2F2 url(../images/ico_note.png);
-    background-repeat: no-repeat;
-    background-position: top left;
-    padding: 5px;
-    padding-left: 40px;
-    padding-bottom: 10px;
-    border: #999 1px dotted;
-    color: #666666;
-    margin: 5px;
+.admonition.note, .admonition.important {
+    background: #f2f2f2 3px 6px no-repeat url(../images/ico_note.png);
 }
 
-.attention, .caution, .danger, .important, .remember, .restriction {
-    background: #F2F2F2 url(../images/ico_note_attention.png);
-    background-repeat: no-repeat;
-    background-position: top left;
-    padding: 5px;
-    padding-left: 40px;
-    padding-bottom: 10px;
-    border: #999 1px dotted;
-    color: #666666;
-    margin: 5px;
+.admonition.warning {
+    background: #f2f2f2 3px 6px no-repeat url(../images/ico_note_attention.png);
 }
-
 /*
 -------------------------------
 Top navigation
diff --git a/doc/global/template/style/online.css b/doc/global/template/style/online.css
index 48fe0bfc02..0c8ed5c5a8 100644
--- a/doc/global/template/style/online.css
+++ b/doc/global/template/style/online.css
@@ -992,6 +992,25 @@ pre, .LegaleseLeft {
   color:#fff;
   white-space: pre-wrap
 }
+div.admonition {
+  margin:1.5em 0 1.5em;
+  padding:12px;
+}
+div.admonition.note {
+  background-color:#c5d3f4;
+  border-left:5px solid #7a9ae5;
+}
+div.admonition.warning {
+  background-color:#ffe4e4;
+  border-left:5px solid #ff8383;
+}
+div.admonition.important {
+  background-color:#fef9f3;
+  border-left:5px solid #f6cb97;
+}
+.mainContent .admonition p {
+  margin:0;
+}
 pre .str,code .str {
   color:#aaaaaa
 }