diff --git a/app/assets/images/partner_logos.png b/app/assets/images/partner_logos.png new file mode 100644 index 00000000..7b1e9441 Binary files /dev/null and b/app/assets/images/partner_logos.png differ diff --git a/app/assets/javascripts/src/Metamaps.Backbone.js b/app/assets/javascripts/src/Metamaps.Backbone.js index 0eec6e61..2909f5d8 100644 --- a/app/assets/javascripts/src/Metamaps.Backbone.js +++ b/app/assets/javascripts/src/Metamaps.Backbone.js @@ -89,10 +89,20 @@ Metamaps.Backbone.Map = Backbone.Model.extend({ function capitalize(string) { 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 = { id: this.id, - name: this.get('name'), - desc: this.get('desc'), + name: truncatedName, + fullName: n, + desc: truncatedDesc, permission: this.get("permission") ? capitalize(this.get("permission")) : "Commons", editPermission: this.authorizeToEdit(Metamaps.Active.Mapper) ? 'canEdit' : 'cannotEdit', contributor_count_number: '' + this.get('contributor_count') + '', diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 8cd71a74..df4bba62 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -1596,6 +1596,7 @@ float: left; .wrapper div.mapInfoDesc span { float: none !important; padding-bottom: 10px; + word-wrap: break-word; } .infoStatIcon { float: left; diff --git a/app/assets/stylesheets/base.css b/app/assets/stylesheets/base.css index 2285bbe3..7eb39b9e 100644 --- a/app/assets/stylesheets/base.css +++ b/app/assets/stylesheets/base.css @@ -841,6 +841,7 @@ font-family: 'din-regular', helvetica, sans-serif; background: #424242; border-radius:2px; 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 { @@ -864,8 +865,10 @@ font-family: 'din-regular', helvetica, sans-serif; } .mapCard .title { + word-wrap: break-word; font-size:18px; line-height:22px; + height: 44px; display:block; padding: 0 16px; text-align: center; @@ -895,11 +898,11 @@ font-family: 'din-regular', helvetica, sans-serif; -webkit-flex: 1; /* Chrome */ -ms-flex: 1; /* IE 10 */ flex: 1; /* NEW, Spec - Opera 12.1, Firefox 20+ */ - overflow-y:auto; padding:0 16px 8px; font-family: helvetica, sans-serif; font-style: italic; font-size: 12px; + word-wrap: break-word; } .mCS_no_scrollbar { padding-right: 5px; diff --git a/app/assets/stylesheets/clean.css b/app/assets/stylesheets/clean.css index 24a659fc..22b6fab4 100644 --- a/app/assets/stylesheets/clean.css +++ b/app/assets/stylesheets/clean.css @@ -724,20 +724,20 @@ } .homeWrapper { - width: 880px; + width: 800px; margin: 0 auto; color: #424242; } .homeTitle { - font-size: 69px; + font-size: 63px; line-height: 48px; text-align: center; margin-bottom: 20px; } .homeIntro { - font-size: 23px; + font-size: 22px; line-height: 26px; text-align: justify; margin: 32px 0 20px; @@ -759,7 +759,7 @@ .homeWrapper .callToAction { float: left; - width: 220px; + width: 216px; padding: 24px 0 24px 24px; color: #F5F5F5; } @@ -767,11 +767,11 @@ font-size: 24px; } .callToAction p { - margin: 16px 0; - font-size: 14px; + margin: 8px 0 16px; + font-size: 13px; line-height: 16px; font-family: 'din-regular', helvetica, sans-serif; - text-align: justify; + text-align: left; } .callToAction a, .callToAction button { display: block; @@ -810,11 +810,13 @@ } .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 { - padding-bottom: 100px; - height: 200px; + padding: 64px 0 100px; + height: 96px; + background: url(partner_logos.png) no-repeat 0 64px; } .github-fork-ribbon-wrapper { diff --git a/app/views/layouts/_lightboxes.html.erb b/app/views/layouts/_lightboxes.html.erb index 81461c06..0aa38302 100644 --- a/app/views/layouts/_lightboxes.html.erb +++ b/app/views/layouts/_lightboxes.html.erb @@ -19,7 +19,7 @@

PRIVATE BETA

2.6

-

Aug 31, 2014

+

Nov 29, 2014

diff --git a/app/views/layouts/_templates.html.erb b/app/views/layouts/_templates.html.erb index 372740e7..348babde 100644 --- a/app/views/layouts/_templates.html.erb +++ b/app/views/layouts/_templates.html.erb @@ -50,14 +50,14 @@
- + {{name}}
{{{screenshot}}}