add new theme

[mlpccg-meta.git] / meta / templates / base.html
diff --git a/meta/templates/base.html b/meta/templates/base.html

index 4015d3f..bd95703 100644 (file)
--- a/meta/templates/base.html
+++ b/meta/templates/base.html
@@ -11,22 +11,23 @@
          <meta name="viewport" content="width=device-width, initial-scale=1">
  
          <link rel="stylesheet" href="{{STATIC_URL}}css/bootstrap.min.css">
+        <!-- <link rel="stylesheet" href="{{STATIC_URL}}css/bootstrap-theme.min.css"> -->
+
          <style>
              body {
                  padding-top: 50px;
                  padding-bottom: 20px;
              }
          </style>
-        <link rel="stylesheet" href="{{STATIC_URL}}css/bootstrap-theme.min.css">
-        <link rel="stylesheet" href="{{STATIC_URL}}css/main.css">
  
+        <link rel="stylesheet" href="{{STATIC_URL}}css/main.css">
          <script src="{{STATIC_URL}}js/vendor/modernizr-2.6.2-respond-1.1.0.min.js"></script>
      </head>
      <body>
          <!--[if lt IE 7]>
              <p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
          <![endif]-->
-    <div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
+    <div class="navbar navbar-default navbar-fixed-top" role="navigation">
        <div class="container">
          <div class="navbar-header">
            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
@@ -35,7 +36,7 @@
              <span class="icon-bar"></span>
              <span class="icon-bar"></span>
            </button>
-          <a class="navbar-brand" href="#">meta is magic</a>
+          <a class="navbar-brand" href="{% url 'meta.views.index' %}">meta is magic</a>
          </div>
          <!-- <div class="navbar-collapse collapse"> -->
          <!--   <form class="navbar-form navbar-right" role="form"> -->
@@ -55,8 +56,11 @@
  
      <div class="container">
        {% block content %}{% endblock %}
-      <hr>
+    </div>
+
+    {% block jumbotron_end %}<hr/>{% endblock %}
  
+    <div class="container">
        <footer>
          <p>&copy; Yukkuri Games, 2014</p>
        </footer>
@@ -64,6 +68,7 @@
      <!-- <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script> -->
      <script src="{{STATIC_URL}}js/vendor/jquery-1.11.0.min.js"></script>
      <script src="{{STATIC_URL}}js/vendor/bootstrap.min.js"></script>
+    <script src="{{STATIC_URL}}js/vendor/typeahead.bundle.min.js"></script>
      <script src="{{STATIC_URL}}js/main.js"></script>
      </body>
  </html>