commit:     6fb169cf04e84a0b91708630e832ac0c5c1ecd8d
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 29 22:56:58 2020 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Mar  6 16:27:03 2020 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=6fb169cf

devbook.xsl: Bring admonitions in line with the wiki.

Use alert-info, alert-warning, and alert-danger for note, important,
and warning, respectively. This is also the scheme used in the wiki:
https://wiki.gentoo.org/wiki/Gentoo_Wiki:Guidelines#Block-level_layout_elements

Yellow background for important and red for warning also agrees with
the colours formerly used with GuideXML:
https://web.archive.org/web/20150314192204/http://www.gentoo.org/doc/en/xml-guide.xml#doc_chap2_sect3

Closes: https://bugs.gentoo.org/711164
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 devbook.xsl | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/devbook.xsl b/devbook.xsl
index ea15885..1605663 100644
--- a/devbook.xsl
+++ b/devbook.xsl
@@ -233,30 +233,30 @@
     <dd><xsl:apply-templates/></dd>
   </xsl:template>
 
-  <xsl:template match="important">
+  <xsl:template match="note">
     <div class="alert alert-info" role="alert">
-    <strong>Important:</strong>
+    <strong>Note:</strong>
     <xsl:apply-templates/>
     </div>
   </xsl:template>
 
-  <xsl:template match="note">
-    <div class="alert alert-success" role="alert">
-    <strong>Note:</strong>
+  <xsl:template match="important">
+    <div class="alert alert-warning" role="alert">
+    <strong>Important:</strong>
     <xsl:apply-templates/>
     </div>
   </xsl:template>
 
-  <xsl:template match="todo">
-    <div class="alert alert-success" role="alert">
-    <strong>Todo:</strong>
+  <xsl:template match="warning">
+    <div class="alert alert-danger" role="alert">
+    <strong>Warning:</strong>
     <xsl:apply-templates/>
     </div>
   </xsl:template>
 
-  <xsl:template match="warning">
-    <div class="alert alert-warning" role="alert">
-    <strong>Warning:</strong>
+  <xsl:template match="todo">
+    <div class="alert alert-info" role="alert">
+    <strong>Todo:</strong>
     <xsl:apply-templates/>
     </div>
   </xsl:template>

Reply via email to