From c6300ec095b160e9a93c868b3eaaa78a36aa8765 Mon Sep 17 00:00:00 2001
From: Alex Legler <alex@a3li.li>
Date: Sun, 13 Dec 2015 13:34:11 +0100
Subject: Update to latest Tyrian base template version

---
 views/layout.erb | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/views/layout.erb b/views/layout.erb
index fef26fa..d7683dc 100644
--- a/views/layout.erb
+++ b/views/layout.erb
@@ -18,30 +18,33 @@
           <div class="row">
             <div class="site-title-buttons">
               <div class="btn-group btn-group-sm">
-                <a href="http://get.gentoo.org/" role="button" class="btn get-gentoo"><span class="fa fa-download"></span> <strong>Get Gentoo!</strong></a>
+                <a href="https://get.gentoo.org/" role="button" class="btn get-gentoo"><span class="fa fa-fw fa-download"></span> <strong>Get Gentoo!</strong></a>
                 <div class="btn-group btn-group-sm">
                   <a class="btn gentoo-org-sites dropdown-toggle" data-toggle="dropdown" data-target="#" href="#">
-                    <span class="glyphicon glyphicon-globe"></span> gentoo.org sites <span class="caret"></span>
+                    <span class="fa fa-fw fa-map-o"></span> <span class="hidden-xs">gentoo.org sites</span> <span class="caret"></span>
                   </a>
-                  <ul class="dropdown-menu">
-                    <li><a href="http://www.gentoo.org/" title="Main Gentoo website"><span class="fa fa-home fa-fw"></span> gentoo.org</a></li>
-                    <li><a href="http://wiki.gentoo.org/" title="Find and contribute documentation"><span class="fa fa-file-text fa-fw"></span> Wiki</a></li>
+                  <ul class="dropdown-menu dropdown-menu-right">
+                    <li><a href="https://www.gentoo.org/" title="Main Gentoo website"><span class="fa fa-home fa-fw"></span> gentoo.org</a></li>
+                    <li><a href="https://wiki.gentoo.org/" title="Find and contribute documentation"><span class="fa fa-file-text-o fa-fw"></span> Wiki</a></li>
                     <li><a href="https://bugs.gentoo.org/" title="Report issues and find common issues"><span class="fa fa-bug fa-fw"></span> Bugs</a></li>
-                    <li><a href="http://forums.gentoo.org/" title="Discuss with the community"><span class="fa fa-comments-o fa-fw"></span> Forums</a></li>
-                    <li><a href="http://packages.gentoo.org/" title="Find software for your Gentoo"><span class="fa fa-hdd-o fa-fw"></span> Packages</a></li>
+                    <li><a href="https://forums.gentoo.org/" title="Discuss with the community"><span class="fa fa-comments-o fa-fw"></span> Forums</a></li>
+                    <li><a href="https://packages.gentoo.org/" title="Find software for your Gentoo"><span class="fa fa-hdd-o fa-fw"></span> Packages</a></li>
                     <li class="divider"></li>
-                    <li><a href="http://overlays.gentoo.org/" title="Collaborate on maintaining packages"><span class="fa fa-code-fork fa-fw"></span> Overlays</a></li>
-                    <li><a href="http://planet.gentoo.org/" title="Find out what's going on in the developer community"><span class="fa fa-rss fa-fw"></span> Planet</a></li>
-                    <li><a href="http://archives.gentoo.org/" title="Read up on past discussions"><span class="fa fa-archive fa-fw"></span> Archives</a></li>
-                    <li><a href="http://sources.gentoo.org/" title="Browse our source code"><span class="fa fa-code fa-fw"></span> Sources</a></li>
+                    <li><a href="https://planet.gentoo.org/" title="Find out what's going on in the developer community"><span class="fa fa-rss fa-fw"></span> Planet</a></li>
+                    <li><a href="https://archives.gentoo.org/" title="Read up on past discussions"><span class="fa fa-archive fa-fw"></span> Archives</a></li>
+                    <li><a href="https://sources.gentoo.org/" title="Browse our source code"><span class="fa fa-code fa-fw"></span> Sources</a></li>
                     <li class="divider"></li>
-                    <li><a href="http://infra-status.gentoo.org/" title="Get updates on the services provided by Gentoo"><span class="fa fa-tasks fa-fw"></span> Infra Status</a></li>
+                    <li><a href="https://infra-status.gentoo.org/" title="Get updates on the services provided by Gentoo"><span class="fa fa-server fa-fw"></span> Infra Status</a></li>
                   </ul>
                 </div>
               </div>
             </div>
             <div class="logo">
-              <img src="https://1b9a50f4f9de4348cd9f-e703bc50ba0aa66772a874f8c7698be7.ssl.cf5.rackcdn.com/site-logo.png" data-at2x="https://1b9a50f4f9de4348cd9f-e703bc50ba0aa66772a874f8c7698be7.ssl.cf5.rackcdn.com/site-logo@2x.png" alt="Gentoo Linux Logo" />
+              <a href="/" title="Back to the homepage" class="site-logo">
+                <object data="assets/site-logo.svg" type="image/svg+xml">
+                  <img src="assets/site-logo.png" alt="Gentoo Linux Logo">
+                </object>
+              </a>
               <span class="site-label">Archives</span>
             </div>
           </div>
@@ -99,7 +102,7 @@
           </div>
           <div class="col-xs-12 col-md-3">
             <h3 class="footerhead">Questions or comments?</h3>
-            Please feel free to <a href="http://www.gentoo.org/main/en/contact.xml">contact us</a>.
+            Please feel free to <a href="https://www.gentoo.org/inside-gentoo/contact/">contact us</a>.
           </div>
         </div>
         <div class="row">
@@ -111,12 +114,12 @@
             </ul>
           </div>
           <div class="col-xs-10 col-sm-9 col-md-10">
-            <strong>&copy; 2001&ndash;2015 Gentoo Foundation, Inc.</strong><br />
+            <strong>&copy; 2001&ndash;2015 Gentoo Foundation, Inc.</strong><br>
             <small>
               Gentoo is a trademark of the Gentoo Foundation, Inc.
               The contents of this document, unless otherwise expressly stated, are licensed under the
               <a href="http://creativecommons.org/licenses/by-sa/3.0/" rel="license">CC-BY-SA-3.0</a> license.
-              The <a href="http://www.gentoo.org/main/en/name-logo.xml">Gentoo Name and Logo Usage Guidelines</a> apply.
+              The <a href="https://www.gentoo.org/inside-gentoo/foundation/name-logo-guidelines.html">Gentoo Name and Logo Usage Guidelines</a> apply.
             </small>
           </div>
         </div>
@@ -125,7 +128,6 @@
 
     <script src="https://1b9a50f4f9de4348cd9f-e703bc50ba0aa66772a874f8c7698be7.ssl.cf5.rackcdn.com/jquery.min.js"></script>
     <script src="https://1b9a50f4f9de4348cd9f-e703bc50ba0aa66772a874f8c7698be7.ssl.cf5.rackcdn.com/bootstrap.min.js"></script>
-    <script src="https://1b9a50f4f9de4348cd9f-e703bc50ba0aa66772a874f8c7698be7.ssl.cf5.rackcdn.com/retina.min.js"></script>
     <script src="/js/quoting.js"></script>
   </body>
-</html>
\ No newline at end of file
+</html>
-- 
cgit v1.2.3-65-gdbad