Merge branch 'master' of github.com:chaospott/site

This commit is contained in:
Timm Szigat 2014-10-27 19:33:50 +01:00
commit 8346340166
2 changed files with 0 additions and 2 deletions

View File

@ -12,7 +12,6 @@
</div> </div>
</div> </div>
</div> </div>
<hr>
{{ content }} {{ content }}
{% include footer.html %} {% include footer.html %}
</div> </div>

View File

@ -17,7 +17,6 @@ body, .jumbotron {
/* background-color:#350505; */ /* background-color:#350505; */
background-color:#d2d4bc; background-color:#d2d4bc;
border:none; border:none;
opacity: 0.9;
} }
ul.navbar-nav li { ul.navbar-nav li {