From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1141090-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 96EB1138350
	for <garchives@archives.gentoo.org>; Mon, 27 Jan 2020 22:40:58 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id BCC25E08CD;
	Mon, 27 Jan 2020 22:40:57 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 90DF0E08CD
	for <gentoo-commits@lists.gentoo.org>; Mon, 27 Jan 2020 22:40:56 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 6DB2E34E4A9
	for <gentoo-commits@lists.gentoo.org>; Mon, 27 Jan 2020 22:40:55 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 25CA5105
	for <gentoo-commits@lists.gentoo.org>; Mon, 27 Jan 2020 22:40:54 +0000 (UTC)
From: "Ulrich Müller" <ulm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" <ulm@gentoo.org>
Message-ID: <1580164842.e1747fe452d0d0f14e89ca6e332c720f6c71f5d3.ulm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-doc/devmanual/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-doc/devmanual/files/devmanual-fallback.patch
X-VCS-Directories: app-doc/devmanual/files/
X-VCS-Committer: ulm
X-VCS-Committer-Name: Ulrich Müller
X-VCS-Revision: e1747fe452d0d0f14e89ca6e332c720f6c71f5d3
X-VCS-Branch: master
Date: Mon, 27 Jan 2020 22:40:54 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 0d3dea92-ea2a-4116-a46d-406a64f09638
X-Archives-Hash: 3a9b0272820e7f3e662c0f21d96f8017

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 {