homepage updates. updated the 'last updated' text. fixed map cards

This commit is contained in:
Connor Turland 2014-11-26 14:49:01 -05:00
parent a003e203af
commit 36aeead2aa
8 changed files with 33 additions and 17 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

View file

@ -89,10 +89,20 @@ Metamaps.Backbone.Map = Backbone.Model.extend({
function capitalize(string) { function capitalize(string) {
return string.charAt(0).toUpperCase() + string.slice(1); return string.charAt(0).toUpperCase() + string.slice(1);
} }
var n = this.get('name');
var d = this.get('desc');
var maxNameLength = 32;
var maxDescLength = 118;
var truncatedName = n ? (n.length > maxNameLength ? n.substring(0, maxNameLength) + "..." : n) : "";
var truncatedDesc = d ? (d.length > maxDescLength ? d.substring(0, maxDescLength) + "..." : d) : "";
var obj = { var obj = {
id: this.id, id: this.id,
name: this.get('name'), name: truncatedName,
desc: this.get('desc'), fullName: n,
desc: truncatedDesc,
permission: this.get("permission") ? capitalize(this.get("permission")) : "Commons", permission: this.get("permission") ? capitalize(this.get("permission")) : "Commons",
editPermission: this.authorizeToEdit(Metamaps.Active.Mapper) ? 'canEdit' : 'cannotEdit', editPermission: this.authorizeToEdit(Metamaps.Active.Mapper) ? 'canEdit' : 'cannotEdit',
contributor_count_number: '<span class="cCountColor">' + this.get('contributor_count') + '</span>', contributor_count_number: '<span class="cCountColor">' + this.get('contributor_count') + '</span>',

View file

@ -1596,6 +1596,7 @@ float: left;
.wrapper div.mapInfoDesc span { .wrapper div.mapInfoDesc span {
float: none !important; float: none !important;
padding-bottom: 10px; padding-bottom: 10px;
word-wrap: break-word;
} }
.infoStatIcon { .infoStatIcon {
float: left; float: left;

View file

@ -841,6 +841,7 @@ font-family: 'din-regular', helvetica, sans-serif;
background: #424242; background: #424242;
border-radius:2px; border-radius:2px;
margin:16px 16px 16px 19px; margin:16px 16px 16px 19px;
box-shadow: 0px 3px 3px rgba(0,0,0,0.23), 0 3px 3px rgba(0,0,0,0.16);
} }
.mapCard { .mapCard {
@ -864,8 +865,10 @@ font-family: 'din-regular', helvetica, sans-serif;
} }
.mapCard .title { .mapCard .title {
word-wrap: break-word;
font-size:18px; font-size:18px;
line-height:22px; line-height:22px;
height: 44px;
display:block; display:block;
padding: 0 16px; padding: 0 16px;
text-align: center; text-align: center;
@ -895,11 +898,11 @@ font-family: 'din-regular', helvetica, sans-serif;
-webkit-flex: 1; /* Chrome */ -webkit-flex: 1; /* Chrome */
-ms-flex: 1; /* IE 10 */ -ms-flex: 1; /* IE 10 */
flex: 1; /* NEW, Spec - Opera 12.1, Firefox 20+ */ flex: 1; /* NEW, Spec - Opera 12.1, Firefox 20+ */
overflow-y:auto;
padding:0 16px 8px; padding:0 16px 8px;
font-family: helvetica, sans-serif; font-family: helvetica, sans-serif;
font-style: italic; font-style: italic;
font-size: 12px; font-size: 12px;
word-wrap: break-word;
} }
.mCS_no_scrollbar { .mCS_no_scrollbar {
padding-right: 5px; padding-right: 5px;

View file

@ -724,20 +724,20 @@
} }
.homeWrapper { .homeWrapper {
width: 880px; width: 800px;
margin: 0 auto; margin: 0 auto;
color: #424242; color: #424242;
} }
.homeTitle { .homeTitle {
font-size: 69px; font-size: 63px;
line-height: 48px; line-height: 48px;
text-align: center; text-align: center;
margin-bottom: 20px; margin-bottom: 20px;
} }
.homeIntro { .homeIntro {
font-size: 23px; font-size: 22px;
line-height: 26px; line-height: 26px;
text-align: justify; text-align: justify;
margin: 32px 0 20px; margin: 32px 0 20px;
@ -759,7 +759,7 @@
.homeWrapper .callToAction { .homeWrapper .callToAction {
float: left; float: left;
width: 220px; width: 216px;
padding: 24px 0 24px 24px; padding: 24px 0 24px 24px;
color: #F5F5F5; color: #F5F5F5;
} }
@ -767,11 +767,11 @@
font-size: 24px; font-size: 24px;
} }
.callToAction p { .callToAction p {
margin: 16px 0; margin: 8px 0 16px;
font-size: 14px; font-size: 13px;
line-height: 16px; line-height: 16px;
font-family: 'din-regular', helvetica, sans-serif; font-family: 'din-regular', helvetica, sans-serif;
text-align: justify; text-align: left;
} }
.callToAction a, .callToAction button { .callToAction a, .callToAction button {
display: block; display: block;
@ -810,11 +810,13 @@
} }
.fullWidthWrapper.withPartners { .fullWidthWrapper.withPartners {
background: url(homepage-bg.png) no-repeat center -300px; background: url(homepage-bg.png) no-repeat center -332px;
background-size: 1430px 1072px;
} }
.homeWrapper.homePartners { .homeWrapper.homePartners {
padding-bottom: 100px; padding: 64px 0 100px;
height: 200px; height: 96px;
background: url(partner_logos.png) no-repeat 0 64px;
} }
.github-fork-ribbon-wrapper { .github-fork-ribbon-wrapper {

View file

@ -19,7 +19,7 @@
<div id="rightAboutParms"> <div id="rightAboutParms">
<p>PRIVATE BETA</p> <p>PRIVATE BETA</p>
<p>2.6</p> <p>2.6</p>
<p>Aug 31, 2014</p> <p>Nov 29, 2014</p>
</div> </div>
<div class="clearfloat"> <div class="clearfloat">
</div> </div>

View file

@ -50,14 +50,14 @@
<a href="/maps/{{id}}"> <a href="/maps/{{id}}">
<div class="permission {{editPermission}}"> <!-- must be canEdit or cannotEdit --> <div class="permission {{editPermission}}"> <!-- must be canEdit or cannotEdit -->
<div class="mapCard"> <div class="mapCard">
<span class="title"> <span class="title" title="{{fullName}}">
{{name}} {{name}}
</span> </span>
<div class="mapScreenshot"> <div class="mapScreenshot">
{{{screenshot}}} {{{screenshot}}}
</div> </div>
<div class="scroll"> <div class="scroll">
<div class="desc"> <div class="desc">
{{desc}} {{desc}}
<div class="clearfloat"></div> <div class="clearfloat"></div>
</div> </div>

View file

@ -18,7 +18,7 @@
<img class="homeVideo" src="/assets/video-screen.png" width="560" height="350" /> <img class="homeVideo" src="/assets/video-screen.png" width="560" height="350" />
<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, organizers, systems thinkers, changemakers, analysts, students, researchers... maybe you!</p>
<a href="/request" class="requestInviteCTA" data-bypass="true">REQUEST INVITE</a> <a href="/request" class="requestInviteCTA" data-bypass="true">REQUEST INVITE</a>
<a href="/explore/featured" class="exploreFeaturedCTA">EXPLORE FEATURED MAPS</a> <a href="/explore/featured" class="exploreFeaturedCTA">EXPLORE FEATURED MAPS</a>
<button type="button" class="button learnMoreCTA">LEARN MORE</button> <button type="button" class="button learnMoreCTA">LEARN MORE</button>