Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Ulrich Müller" <ulm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-doc/devmanual/files/
Date: Mon, 27 Jan 2020 22:40:58
Message-Id: 1580164842.e1747fe452d0d0f14e89ca6e332c720f6c71f5d3.ulm@gentoo
1 commit: e1747fe452d0d0f14e89ca6e332c720f6c71f5d3
2 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 27 22:40:02 2020 +0000
4 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 27 22:40:42 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1747fe4
7
8 app-doc/devmanual: Use a less intrusive patch for offline fallback.
9
10 Package-Manager: Portage-2.3.85, Repoman-2.3.20
11 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
12
13 app-doc/devmanual/files/devmanual-fallback.patch | 75 ++++--------------------
14 1 file changed, 10 insertions(+), 65 deletions(-)
15
16 diff --git a/app-doc/devmanual/files/devmanual-fallback.patch b/app-doc/devmanual/files/devmanual-fallback.patch
17 index 9e86cca39c8..76cefe2547e 100644
18 --- a/app-doc/devmanual/files/devmanual-fallback.patch
19 +++ b/app-doc/devmanual/files/devmanual-fallback.patch
20 @@ -3,18 +3,17 @@ https://bugs.gentoo.org/617724
21
22 --- a/devbook.xsl
23 +++ b/devbook.xsl
24 -@@ -451,9 +451,7 @@
25 +@@ -451,8 +451,7 @@
26 </xsl:variable>
27 <meta name="viewport" content="width=device-width, initial-scale=1.0" />
28 <meta name="description" content="The Gentoo Devmanual is a technical manual which covers topics such as writing ebuilds and eclasses, and policies that developers should be abiding by." />
29 - <link href="https://assets.gentoo.org/tyrian/bootstrap.min.css" rel="stylesheet" media="screen" />
30 - <link href="https://assets.gentoo.org/tyrian/tyrian.min.css" rel="stylesheet" media="screen" />
31 -- <link rel="stylesheet" href="{$relative_path_depth_recursion}devmanual.css" type="text/css" />
32 + <link rel="stylesheet" href="{$relative_path_depth_recursion}fallback.css" type="text/css" />
33 + <link rel="stylesheet" href="{$relative_path_depth_recursion}devmanual.css" type="text/css" />
34 <link rel="icon" href="https://www.gentoo.org/favicon.ico" type="image/x-icon" />
35 </head>
36 - <body>
37 -@@ -486,9 +484,6 @@
38 +@@ -486,9 +485,6 @@
39 </div>
40 <div class="logo">
41 <a href="/" title="Back to the homepage" class="site-logo">
42 @@ -24,75 +23,19 @@ https://bugs.gentoo.org/617724
43 </a>
44 <span class="site-label">Development Guide</span>
45 </div>
46 -@@ -530,45 +525,7 @@
47 - </div>
48 - </div>
49 - </nav>
50 -- <nav class="navbar navbar-grey navbar-stick" id="devmanual-actions" role="navigation">
51 -- <div class="container">
52 -- <div class="row">
53 -- <div class="navbar-header">
54 -- <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#gw-toolbar">
55 -- <span class="sr-only">Toggle navigation</span>
56 -- <span class="icon-bar"></span>
57 -- <span class="icon-bar"></span>
58 -- <span class="icon-bar"></span>
59 -- </button>
60 -- </div>
61 -- <div class="collapse navbar-collapse" id="gw-toolbar">
62 -- <div class="input-group">
63 -- <input type="search" name="search" placeholder="Search" title="Search Gentoo Developer Manual [f]" accesskey="f" id="searchInput" class="form-control" onclick="fetchDocuments()"/>
64 -- <div class="input-group-btn">
65 -- <input type="submit" name="fulltext" value="Search" title="Search the pages for this text" id="mw-searchButton" class="searchButton btn btn-default" onclick="search()"/>
66 -- </div>
67 -- </div>
68 -- </div>
69 -- </div>
70 -- </div>
71 -- </nav>
72 - </header>
73 -- <div id="searchResults" class="modal fade" role="dialog">
74 -- <div class="modal-dialog">
75 -- <div class="modal-content">
76 -- <div class="modal-header">
77 -- <button type="button" class="close" data-dismiss="modal">x</button>
78 -- <h4 class="modal-title">Search Results</h4>
79 -- </div>
80 -- <div class="modal-body">
81 -- <p>No results found.</p>
82 -- </div>
83 -- <div class="modal-footer">
84 -- <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
85 -- </div>
86 -- </div>
87 -- </div>
88 -- </div>
89 - <div class="container">
90 - <div class="row">
91 - <div class="col-md010">
92 -@@ -613,19 +570,7 @@
93 +@@ -613,9 +609,6 @@
94 </div>
95 </div>
96 </footer>
97 - <script src="https://assets.gentoo.org/tyrian/jquery.min.js"></script>
98 - <script src="https://assets.gentoo.org/tyrian/bootstrap.min.js"></script>
99 - <script src="https://assets.gentoo.org/lunr/lunr.min.js"></script>
100 -- <xsl:variable name="relative_path_depth" select="string-length(/guide/@self)-string-length(translate(/guide/@self, '/' , ''))"/>
101 -- <xsl:variable name="relative_path_depth_recursion">
102 -- <xsl:call-template name="str:repeatString">
103 -- <xsl:with-param name="count" select="$relative_path_depth"/>
104 -- <xsl:with-param name="append">../</xsl:with-param>
105 -- </xsl:call-template>
106 -- </xsl:variable>
107 -- <script><xsl:text>var documentsSrc = "</xsl:text><xsl:value-of select="$relative_path_depth_recursion"/><xsl:text>documents.js"</xsl:text></script>
108 -- <script src="{$relative_path_depth_recursion}search.js"></script>
109 - </body>
110 - </html>
111 - </xsl:template>
112 -
113 + <xsl:variable name="relative_path_depth" select="string-length(/guide/@self)-string-length(translate(/guide/@self, '/' , ''))"/>
114 + <xsl:variable name="relative_path_depth_recursion">
115 + <xsl:call-template name="str:repeatString">
116 --- /dev/null
117 +++ b/fallback.css
118 -@@ -0,0 +1,20 @@
119 +@@ -0,0 +1,22 @@
120 +body {
121 + margin: 40px auto;
122 + max-width: 650px;
123 @@ -108,6 +51,8 @@ https://bugs.gentoo.org/617724
124 +
125 +.divider,
126 +.footerlinks,
127 ++.input-group,
128 ++.modal-dialog,
129 +.navbar-toggle,
130 +.site-title,
131 +.tyrian-navbar {
Report Message
Find on MARC Find on Google Groups