* [gentoo-commits] repo/gentoo:master commit in: app-doc/devmanual/files/
@ 2020-01-27 22:40 Ulrich Müller
0 siblings, 0 replies; only message in thread
From: Ulrich Müller @ 2020-01-27 22:40 UTC (permalink / raw
To: gentoo-commits
commit: e1747fe452d0d0f14e89ca6e332c720f6c71f5d3
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 27 22:40:02 2020 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 27 22:40:42 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1747fe4
app-doc/devmanual: Use a less intrusive patch for offline fallback.
Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
app-doc/devmanual/files/devmanual-fallback.patch | 75 ++++--------------------
1 file changed, 10 insertions(+), 65 deletions(-)
diff --git a/app-doc/devmanual/files/devmanual-fallback.patch b/app-doc/devmanual/files/devmanual-fallback.patch
index 9e86cca39c8..76cefe2547e 100644
--- a/app-doc/devmanual/files/devmanual-fallback.patch
+++ b/app-doc/devmanual/files/devmanual-fallback.patch
@@ -3,18 +3,17 @@ https://bugs.gentoo.org/617724
--- a/devbook.xsl
+++ b/devbook.xsl
-@@ -451,9 +451,7 @@
+@@ -451,8 +451,7 @@
</xsl:variable>
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<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." />
- <link href="https://assets.gentoo.org/tyrian/bootstrap.min.css" rel="stylesheet" media="screen" />
- <link href="https://assets.gentoo.org/tyrian/tyrian.min.css" rel="stylesheet" media="screen" />
-- <link rel="stylesheet" href="{$relative_path_depth_recursion}devmanual.css" type="text/css" />
+ <link rel="stylesheet" href="{$relative_path_depth_recursion}fallback.css" type="text/css" />
+ <link rel="stylesheet" href="{$relative_path_depth_recursion}devmanual.css" type="text/css" />
<link rel="icon" href="https://www.gentoo.org/favicon.ico" type="image/x-icon" />
</head>
- <body>
-@@ -486,9 +484,6 @@
+@@ -486,9 +485,6 @@
</div>
<div class="logo">
<a href="/" title="Back to the homepage" class="site-logo">
@@ -24,75 +23,19 @@ https://bugs.gentoo.org/617724
</a>
<span class="site-label">Development Guide</span>
</div>
-@@ -530,45 +525,7 @@
- </div>
- </div>
- </nav>
-- <nav class="navbar navbar-grey navbar-stick" id="devmanual-actions" role="navigation">
-- <div class="container">
-- <div class="row">
-- <div class="navbar-header">
-- <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#gw-toolbar">
-- <span class="sr-only">Toggle navigation</span>
-- <span class="icon-bar"></span>
-- <span class="icon-bar"></span>
-- <span class="icon-bar"></span>
-- </button>
-- </div>
-- <div class="collapse navbar-collapse" id="gw-toolbar">
-- <div class="input-group">
-- <input type="search" name="search" placeholder="Search" title="Search Gentoo Developer Manual [f]" accesskey="f" id="searchInput" class="form-control" onclick="fetchDocuments()"/>
-- <div class="input-group-btn">
-- <input type="submit" name="fulltext" value="Search" title="Search the pages for this text" id="mw-searchButton" class="searchButton btn btn-default" onclick="search()"/>
-- </div>
-- </div>
-- </div>
-- </div>
-- </div>
-- </nav>
- </header>
-- <div id="searchResults" class="modal fade" role="dialog">
-- <div class="modal-dialog">
-- <div class="modal-content">
-- <div class="modal-header">
-- <button type="button" class="close" data-dismiss="modal">x</button>
-- <h4 class="modal-title">Search Results</h4>
-- </div>
-- <div class="modal-body">
-- <p>No results found.</p>
-- </div>
-- <div class="modal-footer">
-- <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-- </div>
-- </div>
-- </div>
-- </div>
- <div class="container">
- <div class="row">
- <div class="col-md010">
-@@ -613,19 +570,7 @@
+@@ -613,9 +609,6 @@
</div>
</div>
</footer>
- <script src="https://assets.gentoo.org/tyrian/jquery.min.js"></script>
- <script src="https://assets.gentoo.org/tyrian/bootstrap.min.js"></script>
- <script src="https://assets.gentoo.org/lunr/lunr.min.js"></script>
-- <xsl:variable name="relative_path_depth" select="string-length(/guide/@self)-string-length(translate(/guide/@self, '/' , ''))"/>
-- <xsl:variable name="relative_path_depth_recursion">
-- <xsl:call-template name="str:repeatString">
-- <xsl:with-param name="count" select="$relative_path_depth"/>
-- <xsl:with-param name="append">../</xsl:with-param>
-- </xsl:call-template>
-- </xsl:variable>
-- <script><xsl:text>var documentsSrc = "</xsl:text><xsl:value-of select="$relative_path_depth_recursion"/><xsl:text>documents.js"</xsl:text></script>
-- <script src="{$relative_path_depth_recursion}search.js"></script>
- </body>
- </html>
- </xsl:template>
-
+ <xsl:variable name="relative_path_depth" select="string-length(/guide/@self)-string-length(translate(/guide/@self, '/' , ''))"/>
+ <xsl:variable name="relative_path_depth_recursion">
+ <xsl:call-template name="str:repeatString">
--- /dev/null
+++ b/fallback.css
-@@ -0,0 +1,20 @@
+@@ -0,0 +1,22 @@
+body {
+ margin: 40px auto;
+ max-width: 650px;
@@ -108,6 +51,8 @@ https://bugs.gentoo.org/617724
+
+.divider,
+.footerlinks,
++.input-group,
++.modal-dialog,
+.navbar-toggle,
+.site-title,
+.tyrian-navbar {
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2020-01-27 22:40 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-01-27 22:40 [gentoo-commits] repo/gentoo:master commit in: app-doc/devmanual/files/ Ulrich Müller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox