Merge branch 'master' into edge

This commit is contained in:
Rushabh Mehta
2013-03-08 11:09:48 +05:30
30 changed files with 829 additions and 173 deletions

View File

@@ -6,7 +6,7 @@
<div class="container">
<div class="outer">
<div class="navbar{% if top_bar_background=="Black" %} navbar-inverse{% endif %}"
style="margin-bottom: 0px;">
style="">
<div class="navbar-inner">
<a class="brand" href="index">{{ brand_html }}</a>
<div class="container">