Added Bootstrap 4.0.0-alpha 6, new images and mockups for the new layout.

[people/shoehn/ipfire.org.git] / templates / base.html

diff --git a/templates/base.html b/templates/base.html
index da1a85023e97de18f77f2d8b8207f6dbbe23e9c4..091b7834c93b34bfd82957f980b910623f6bff3d 100644 (file)
--- a/templates/base.html
+++ b/templates/base.html
@@ -12,10 +12,11 @@
                <meta name="description" content="{{ _("IPFire is a free firewall distribution based on Linux.") }}" />
 
                <!-- styling stuff -->
-               <link rel="stylesheet" type="text/css" href="{{ static_url("css/bootstrap.min.css") }}" />
-               <link rel="stylesheet" type="text/css" href="{{ static_url("css/font-awesome.min.css") }}" />
-               <link rel="stylesheet" type="text/css" href="{{ static_url("css/style.css") }}" />
-               <link href="//fonts.googleapis.com/css?family=Ubuntu:400,700" rel="stylesheet" type="text/css">
+               <!-- live site -->
+               <!-- <link rel="stylesheet" type="text/css" href="{{ static_url("css/style.css") }}" /> -->
+               
+               <!-- local development -->
+               <link rel="stylesheet" type="text/css" href="http://static.ipfire:8891/css/style.css" />
                <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
                {% if rss_url %}
@@ -46,7 +47,7 @@
                                                        {% end %}
                                                </a>
                                        </span>
-                               </div>                                  
+                               </div>
                                <div class="collapse navbar-collapse navbar-right navbar-main-collapse" id="navbar">
                                        {% block menu %}
                                                {% module Menu() %}
@@ -183,9 +184,16 @@
                        </footer>
                {% end block %}
 
+
+               <!--
                <script src="{{ static_url("js/jquery.js") }}"></script>
                <script src="{{ static_url("js/jquery.easing.js") }}"></script>
                <script src="{{ static_url("js/bootstrap.min.js") }}"></script>
                <script src="{{ static_url("js/site.js") }}"></script>
+               -->
+               
+               <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+               <!-- local development -->
+               <script src="http://static.ipfire:8891/js/script.min.js"></script>
        </body>
 </html>