Merge branch '1.0'

This commit is contained in:
Matthias Radestock committed 2015-06-24 17:26:19 +01:00
commit 9a6afcd236
4 files changed
+5910 -17

No files matched your search

+19 -8
View File
@@ -2,38 +2,49 @@
<div class="section footer">
<div class="container">
<div class="row clearfix">
<div class="col-md-3 col-md-offset-2 column">
<div class="col-sm-3 col-md-2">
<b>Company</b><br>
<a href="http://weave.works/about.html">About Weave</a><br>
<!-- <a href="#">Meet the Team</a><br> -->
<a href="http://weave.works/team.html">Meet the Team</a><br>
<!-- <a href="#">Careers</a><br> -->
<a href="http://blog.weave.works">Blog</a><br>
<br>
<a href="http://weave.works/articles/">Learn More</a><br>
</div>
<div class="col-sm-3 col-md-2">
<b>Community</b><br>
<a href="http://weave.works/help/index.html#partners">Partners</a><br>
<a href="http://github.com/weaveworks">Code</a><br>
</div>
<div class="col-md-3 column">
<div class="col-sm-3 col-md-2">
<b>Documentation</b><br>
<a href="http://docs.weave.works">Docs</a><br>
<a href="http://weave.works/guides/">Getting Started Guides</a><br>
<a href="http://weave.works/help/index.html">Help and Support</a><br>
<a href="http://blog.weave.works">Blog</a><br>
</div>
<div class="col-md-3 column">
<div class="col-sm-3 col-md-2">
<b>Get in Touch</b><br>
<a href="mailto:help@weave.works">help@weave.works</a><br>
<div class="hidden-md hidden-lg">
<a href="mailto:help@weave.works">help@weave.works</a><br>
</div>
<a href="http://twitter.com/weaveworks">Twitter</a><br>
<a href="http://github.com/weaveworks">Github</a><br>
<a href="http://slideshare.net/weaveworks">Slideshare</a><br>
<a href="https://www.linkedin.com/company/weaveworks">Linkedin</a><br>
<a href="https://plus.google.com/+WeaveWorksInc/">GooglePlus</a><br>
</div>
<div class="col-md-3 hidden-xs hidden-sm">
<b>Talk to a human</b>
<div align="center">
<br>
<a href="mailto:help@weave.works" class="btn btn-lg">Drop us a line</a>
</div>
</div>
</div>
<div class="row clearfix weavefooter">
<div class="row">
<br>
<br>
<div class="col-md-4 col-md-offset-2">
<div class="col-sm-4">
<p class="copyright">&copy; Weaveworks 2014 &dash; 2015</p>
</div>
</div>
+8 -6
View File
@@ -1,9 +1,10 @@
<div class="section header navbaronly">
<nav class="navbar navbar-inverse">
<div class="section section-header navbaronly">
<div class="navbar navbar-inverse">
<div class="container">
<div><!-- class="navbar-header"> -->
<a class="navbar-brand" href="http://weave.works/"><img src="http://weave.works/img/weave-logo.png"></a>
</div>
<div class="navbar-header">
<a class="navbar-brand" href="http://weave.works/"><img src="http://weave.works/img/weave-logo.png"></a>
</div>
<div class="nav-wrapper">
<ul class="nav navbar-nav navbar-right">
<li>
<a href="http://docs.weave.works">Docs</a>
@@ -18,6 +19,7 @@
<a href="http://weave.works/help/index.html">Help &amp; Support</a>
</li>
</ul>
</div>
</div>
</nav>
</div>
</div>
+3 -3
View File
@@ -19,7 +19,7 @@
<!-- CSS
–––––––––––––––––––––––––––––––––––––––––––––––––– -->
<link rel="stylesheet" type="text/css" href="http://weave.works/less/custom.css">
<link rel="stylesheet" type="text/css" href="assets/custom.css">
<!-- Favicon
–––––––––––––––––––––––––––––––––––––––––––––––––– -->
@@ -33,8 +33,8 @@
<div class="content">
{% include header-navbaronly.html %}
<div class="container">
<div class="col-md-10 col-md-offset-1">
<div class="container markdown-page">
<div class="col-md-8 col-md-offset-2">
{{ content }}
</div>
</div>
File diff suppressed because it is too large. Load diff