Merge remote-tracking branch 'origin/touchdown'
Conflicts: static/css/quay.css static/js/controllers.js test/data/test.db
This commit is contained in:
commit
c338b7d621
33 changed files with 1296 additions and 242 deletions
|
@ -77,7 +77,7 @@ b._i.push([a,e,d])};b.__SV=1.2}})(document,window.mixpanel||[]);
|
|||
mixpanel.init("{{ mixpanel_key }}", { track_pageview : false, debug: {{ is_debug }} });</script><!-- end Mixpanel -->
|
||||
{% endif %}
|
||||
</head>
|
||||
<body>
|
||||
<body ng-class="pageClass">
|
||||
<div ng-class="!fixFooter ? 'wrapper' : ''">
|
||||
<nav class="navbar navbar-default header-bar" role="navigation"></nav>
|
||||
|
||||
|
|
Reference in a new issue