Skip to content
Permalink
Browse files
upgrade everything
Signed-off-by: Chris Warrick <kwpolska@gmail.com>
  • Loading branch information
Kwpolska committed Jan 21, 2015
1 parent 5184874 commit 267e8db1076736bf1c77cb91a0fef5775cd45ba8
Showing with 22 additions and 21 deletions.
  1. +14 −13 requirements.txt
  2. +8 −8 templates/base.html
@@ -1,15 +1,16 @@
Flask==0.10.1
Flask-SQLAlchemy==1.0
Jinja2==2.7.2
MarkupSafe==0.18
SQLAlchemy==0.9.1
Werkzeug==0.9.4
docopt==0.6.1
gunicorn==18.0
ipython==1.1.0
itsdangerous==0.23
mandrill==1.0.53
newrelic==2.10.0.8
psycopg2==2.5.2
requests==2.2.0
Flask-SQLAlchemy==2.0
Jinja2==2.7.3
MarkupSafe==0.23
SQLAlchemy==0.9.8
Werkzeug==0.9.6
docopt==0.6.2
gunicorn==19.1.1
ipython==2.3.1
itsdangerous==0.24
lxml==3.4.1
mandrill==1.0.57
newrelic==2.42.0.35
psycopg2==2.5.4
requests==2.5.1
wsgiref==0.1.2
@@ -78,7 +78,7 @@

<meta name="author" content="Roberto Alsina, Chris Warrick">
</head>
<body>
<body><a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>

<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
<div class="container">
@@ -123,9 +123,7 @@
</li>
</ul>
</div>

</div>

</nav>

<nav class="navbar navbar-fixed-top navbar-default navbar-nusers" role="navigation">
@@ -159,9 +157,12 @@
</div>
</nav>
<!-- End of Menubar -->
<div class="container-fluid" id="container-fluid">
<!--Body content-->
<div class="row-fluid">


<div class="container" id="content" role="main">
<div class="body-content">
<!--Body content-->
<div class="row">
<h1>{% block title2 %}{{ title }}{% endblock title2 %}</h1>
{% block subtitle %}{% endblock %}
{% for category, message in get_flashed_messages(with_categories=true) %}
@@ -174,7 +175,6 @@ <h1>{% block title2 %}{{ title }}{% endblock title2 %}</h1>

{% block content %}
{% endblock %}
</div>
<footer>
Contents © 2012-2015 <a href="mailto:users@getnikola.com">Roberto Alsina
and Chris Warrick</a>  |  <a
@@ -185,7 +185,7 @@ <h1>{% block title2 %}{{ title }}{% endblock title2 %}</h1>
{% endif %}

</footer>

</div>
<script src="http://getnikola.com/assets/js/all-nocdn.js" type="text/javascript"></script>
<script src="https://login.persona.org/include.js"></script>
<script type="text/javascript">

0 comments on commit 267e8db

Please sign in to comment.