glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' of github.com:metamaps/metamaps_gen002 into develop

Browse source
This commit is contained in:
Connor Turland 2014-12-02 13:32:48 -05:00
commit 48cab05d7c
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/assets/stylesheets/clean.css
View file

@ -735,7 +735,7 @@
} }
.homeTitle { .homeTitle {
font-size: 63px; font-size: 64px;
line-height: 48px; line-height: 48px;
text-align: center; text-align: center;
margin-bottom: 20px; margin-bottom: 20px;
@ -809,6 +809,7 @@
} }
.callToAction .learnMoreCTA { .callToAction .learnMoreCTA {
background-color: #4fb5c0; background-color: #4fb5c0;
margin-bottom: 12px;
} }
.callToAction .learnMoreCTA:hover { .callToAction .learnMoreCTA:hover {
background-color: #419599; background-color: #419599;

10
app/views/main/home.html.erb
View file

@ -8,9 +8,9 @@
<% content_for :title, "Home | Metamaps" %> <% content_for :title, "Home | Metamaps" %>
<div id="yield"> <div id="yield">
<div class="homeWrapper homeText"> <div class="homeWrapper homeText">
<div class="homeTitle">Make sense with Metamaps.</div> <div class="homeTitle">Make Sense with Metamaps</div>
<div class="homeIntro"> <div class="homeIntro">
<span class="green din-medium">METAMAPS.CC</span> is a free and open source platform that supports real-time sense-making, distributed collaboration, and collective intelligence within individuals, communities, and organizations. We are currently in an <span class="din-medium">invite-only beta.</span> <span class="green din-medium">METAMAPS.CC</span> is a free and open source platform that supports real-time sense-making, distributed collaboration, and the creative intelligence of individuals, organizations and communities. We are currently in an <span class="din-medium">invite-only beta.</span>
</div> </div>
</div> </div>
<div class="fullWidthWrapper withVideo"> <div class="fullWidthWrapper withVideo">
@ -18,10 +18,10 @@
<iframe class="homeVideo" src="//player.vimeo.com/video/113154814" width="560" height="315" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe> <iframe class="homeVideo" src="//player.vimeo.com/video/113154814" width="560" height="315" frameborder="0" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
<div class="callToAction"> <div class="callToAction">
<h3>Who finds it useful?</h3> <h3>Who finds it useful?</h3>
<p>Designers, inventors, artists, educators, strategists, consultants, facilitators, organizers, systems thinkers, changemakers, analysts, students, researchers... maybe you!</p> <p>Designers, inventors, artists, educators, strategists, consultants, facilitators, entrepreneurs, systems thinkers, changemakers, analysts, students, researchers... maybe you!</p>
<a href="/request" class="requestInviteCTA" data-bypass="true">REQUEST INVITE</a>
<a href="/explore/featured" class="exploreFeaturedCTA">EXPLORE FEATURED MAPS</a>
<button type="button" class="button learnMoreCTA" onclick="Metamaps.GlobalUI.openLightbox('about');">LEARN MORE</button> <button type="button" class="button learnMoreCTA" onclick="Metamaps.GlobalUI.openLightbox('about');">LEARN MORE</button>
<a href="/explore/featured" class="exploreFeaturedCTA">EXPLORE FEATURED MAPS</a>
<a href="/request" class="requestInviteCTA" data-bypass="true">REQUEST INVITE</a>
</div> </div>
<div class="clearfloat"></div> <div class="clearfloat"></div>
</div> </div>