Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6476 from Sighne/sighne/upgrade-amount-users

Browse Source 
#6460: upgrade amount of users
This commit is contained in:
Sabe Jones
2016-01-19 13:41:03 -06:00
parent 2848f5d709 4d1daf1c41
commit c4acd262eb
5 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
website/public/front/images/presslogos/discover_logo.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.6 KiB

website/public/front/staticstyle.css
+1 -1
View File
@@ -96,7 +96,7 @@ p.sectioninfo {
max-height:30px;
max-width:120px;
vertical-align: middle;
margin:20px 30px;
margin:20px 20px;
filter: url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#grayscale"); /* Firefox 10+, Firefox on Android */
filter: grayscale(100%);
-moz-filter: grayscale(100%);
website/src/routes/pages.js
+6 -2
View File
@@ -5,6 +5,8 @@ var _ = require('lodash');
var locals = require('../middlewares/locals');
var i18n = require('../libs/i18n');
const TOTAL_USER_COUNT = '1,000,000';
// -------- App --------
router.get('/', i18n.getUserLanguage, locals, function(req, res) {
if (!req.headers['x-api-user'] && !req.headers['x-api-key'] && !(req.session && req.session.userId))
@@ -24,7 +26,8 @@ _.each(pages, function(name){
router.get('/static/' + name, i18n.getUserLanguage, locals, function(req, res) {
res.render( 'static/' + name, {
env: res.locals.habitrpg,
marked: require('marked')
marked: require('marked'),
userCount: TOTAL_USER_COUNT
});
});
});
@@ -37,7 +40,8 @@ _.each(shareables, function(name){
router.get('/social/' + name, i18n.getUserLanguage, locals, function(req, res) {
res.render( 'social/' + name, {
env: res.locals.habitrpg,
marked: require('marked')
marked: require('marked'),
userCount: TOTAL_USER_COUNT
});
});
});
website/views/social/landing-page.jade
+2 -1
View File
@@ -4,7 +4,7 @@
ul.lead
li=env.t('landingCopy1')
li=env.t('landingCopy2')
li=env.t('landingCopy3', {userCount:'900,000'})
li=env.t('landingCopy3', {userCount:userCount})
.mobile-container
.row
.col-md-6
@@ -27,3 +27,4 @@
img(src='https://d2afqr2xdmyzvu.cloudfront.net/front/images/presslogos/Cnetlogo.png')
img(src='https://d2afqr2xdmyzvu.cloudfront.net/front/images/presslogos/Fast-Company-logo.png')
img(src='https://d2afqr2xdmyzvu.cloudfront.net/front/images/presslogos/kickstarter-logo.png')
img(src='https://d2afqr2xdmyzvu.cloudfront.net/front/images/presslogos/discover-logo.png')
website/views/static/front.jade
+3 -2
View File
@@ -81,7 +81,7 @@ html(ng-app='habitrpg', ng-controller='RootCtrl')
img.img-rendering-auto.center-block.img-responsive(src='https://d2afqr2xdmyzvu.cloudfront.net/front/images/intro.png')
// insert intro images
.introcall.bg-success
h4= env.t('joinOthers', {userCount:'900,000'})
h4= env.t('joinOthers', {userCount:userCount})
small
button#play-btn.btn.btn-primary.btn-lg.gamifybutton(ng-click='playButtonClick()')= env.t('free')
.presslogos.text-center.img-rendering-auto
@@ -94,6 +94,7 @@ html(ng-app='habitrpg', ng-controller='RootCtrl')
img(src='https://d2afqr2xdmyzvu.cloudfront.net/front/images/presslogos/Cnetlogo.png')
img(src='https://d2afqr2xdmyzvu.cloudfront.net/front/images/presslogos/Fast-Company-logo.png')
img(src='https://d2afqr2xdmyzvu.cloudfront.net/front/images/presslogos/kickstarter-logo.png')
img(src='https://d2afqr2xdmyzvu.cloudfront.net/front/images/presslogos/discover-logo.png')
#intro-text
.container-fluid
.row
@@ -579,7 +580,7 @@ html(ng-app='habitrpg', ng-controller='RootCtrl')
#footercall
.container-fluid
.row
h3= env.t('joinOthers', {userCount:'900,000'})
h3= env.t('joinOthers', {userCount:userCount})
.row
.col-md-4.col-md-offset-4
button.btn.btn-primary.btn-lg.btn-block(ng-click='playButtonClick()')= env.t('free')