Skip to content

Commit

Permalink
Merge branch 'master' into clean-source
Browse files Browse the repository at this point in the history
Conflicts:
	src/layouts/default.html.eco
  • Loading branch information
almereyda committed May 1, 2015
2 parents 26725b4 + 36b9d07 commit 6c7f88d
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions src/render/index.html.eco
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,31 @@ tags: ['news','blog','overview']
</div>
<div class="row">
<div class="col-sm-3">
<a href="http://demo.transformap.co/greenmap.html#3/0/180">
<div class="map-card">
<%- @partial('map-1') %>
</div>
</a>
</div>
<div class="col-sm-3">
<a href="http://demo.transformap.co/identities.html#3/0/180">
<div class="map-card">
<%- @partial('map-2') %>
</div>
</div>
<div class="col-sm-3">
<a href="http://demo.transformap.co/regional.html#3/0/180">
<div class="map-card">
<%- @partial('map-3') %>
</div>
</a>
</div>
<div class="col-sm-3">
<a href="http://demo.transformap.co/organic.html#3/0/180">
<div class="map-card">
<%- @partial('map-4') %>
</div>
</a>
</div>
</div>
<p class="attribution">
Expand Down

0 comments on commit 6c7f88d

Please sign in to comment.