Commit 6607806c4056db700631cc218d1ebc5875fb0eca

Merge branch 'master' of git.pantoto.org:mouchak/mouchak
  • Diff rendering mode:
  • inline
  • side by side

mouchak/templates/base.html

16 <link rel="stylesheet" href="{{url_for('static', filename='css/normalize.css')}}">16 <link rel="stylesheet" href="{{url_for('static', filename='css/normalize.css')}}">
17 <link rel="stylesheet" href="{{url_for('static', filename='css/bootstrap.min.css')}}" media="screen">17 <link rel="stylesheet" href="{{url_for('static', filename='css/bootstrap.min.css')}}" media="screen">
18 <link rel="stylesheet" href="{{url_for('static', filename='css/mouchak.css')}}">18 <link rel="stylesheet" href="{{url_for('static', filename='css/mouchak.css')}}">
19 <link rel="stylesheet" href="{{url_for('static', filename='css/main.css')}}">
20 <script src="{{url_for('static', filename='js/lib/modernizr-2.6.2.min.js')}}"></script>19 <script src="{{url_for('static', filename='js/lib/modernizr-2.6.2.min.js')}}"></script>
2120
22 <!--TODO: make this optional, only when there is a map plugin in the site. There21 <!--TODO: make this optional, only when there is a map plugin in the site. There

mouchak/templates/index.html

1{% extends "base.html" %}1{% extends "base.html" %}
22
3{% block head %}3{% block head %}
4 <link rel="stylesheet" href="{{url_for('static', filename='css/main.css')}}">
4 <title> {{ title }} </title>5 <title> {{ title }} </title>
5{% endblock %}6{% endblock %}
67