Gentoo Archives: gentoo-commits

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/devmanual:master commit in: /
Date: Fri, 06 Mar 2020 16:30:57
Message-Id: 1583512023.6fb169cf04e84a0b91708630e832ac0c5c1ecd8d.ulm@gentoo
1 commit: 6fb169cf04e84a0b91708630e832ac0c5c1ecd8d
2 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Feb 29 22:56:58 2020 +0000
4 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
5 CommitDate: Fri Mar 6 16:27:03 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=6fb169cf
7
8 devbook.xsl: Bring admonitions in line with the wiki.
9
10 Use alert-info, alert-warning, and alert-danger for note, important,
11 and warning, respectively. This is also the scheme used in the wiki:
12 https://wiki.gentoo.org/wiki/Gentoo_Wiki:Guidelines#Block-level_layout_elements
13
14 Yellow background for important and red for warning also agrees with
15 the colours formerly used with GuideXML:
16 https://web.archive.org/web/20150314192204/http://www.gentoo.org/doc/en/xml-guide.xml#doc_chap2_sect3
17
18 Closes: https://bugs.gentoo.org/711164
19 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
20
21 devbook.xsl | 22 +++++++++++-----------
22 1 file changed, 11 insertions(+), 11 deletions(-)
23
24 diff --git a/devbook.xsl b/devbook.xsl
25 index ea15885..1605663 100644
26 --- a/devbook.xsl
27 +++ b/devbook.xsl
28 @@ -233,30 +233,30 @@
29 <dd><xsl:apply-templates/></dd>
30 </xsl:template>
31
32 - <xsl:template match="important">
33 + <xsl:template match="note">
34 <div class="alert alert-info" role="alert">
35 - <strong>Important:</strong>
36 + <strong>Note:</strong>
37 <xsl:apply-templates/>
38 </div>
39 </xsl:template>
40
41 - <xsl:template match="note">
42 - <div class="alert alert-success" role="alert">
43 - <strong>Note:</strong>
44 + <xsl:template match="important">
45 + <div class="alert alert-warning" role="alert">
46 + <strong>Important:</strong>
47 <xsl:apply-templates/>
48 </div>
49 </xsl:template>
50
51 - <xsl:template match="todo">
52 - <div class="alert alert-success" role="alert">
53 - <strong>Todo:</strong>
54 + <xsl:template match="warning">
55 + <div class="alert alert-danger" role="alert">
56 + <strong>Warning:</strong>
57 <xsl:apply-templates/>
58 </div>
59 </xsl:template>
60
61 - <xsl:template match="warning">
62 - <div class="alert alert-warning" role="alert">
63 - <strong>Warning:</strong>
64 + <xsl:template match="todo">
65 + <div class="alert alert-info" role="alert">
66 + <strong>Todo:</strong>
67 <xsl:apply-templates/>
68 </div>
69 </xsl:template>