diff --git a/common/locales/en/front.json b/common/locales/en/front.json index a97ac395e7..ed76f36244 100644 --- a/common/locales/en/front.json +++ b/common/locales/en/front.json @@ -180,9 +180,10 @@ "merchandiseInquiries": "Merchandise Inquiries", "marketingInquiries": "Marketing/Social Media Inquiries", "tweet": "Tweet", - "imagine1": "Imagine if improving your life was as fun as playing a game.", + "imagine1": "Imagine if improving your life were as fun as playing a game.", "landingCopy1": "Advance in the game by completing your real-life tasks.", "landingCopy2": "Battle monsters with friends to stay accountable to your goals.", "landingCopy3": "Join over 850,000 people having fun as they improve their lives.", - "alreadyHaveAccount": "I already have an account!" + "alreadyHaveAccount": "I already have an account!", + "getStartedNow": "Get Started Now!" } diff --git a/common/locales/en/settings.json b/common/locales/en/settings.json index 934ed81408..714ccb0c30 100644 --- a/common/locales/en/settings.json +++ b/common/locales/en/settings.json @@ -86,7 +86,6 @@ "emailChange1": "To change your email address, please send an email to", "emailChange2": "admin@habitica.com", "emailChange3": " including both your old and new email address as well as your User ID.", - "username": "Login Name", "usernameOrEmail": "Login Name or Email", "email": "Email", "registeredWithFb": "Registered with Facebook", diff --git a/website/views/social/hatch-pet.jade b/website/views/social/hatch-pet.jade index 211314c0b3..4847ff76e8 100644 --- a/website/views/social/hatch-pet.jade +++ b/website/views/social/hatch-pet.jade @@ -3,7 +3,7 @@ extends ./layout block extraHead - var socialPage = 'hatch-pet' - var socialTitle = 'New Pet!' - - var socialDescription = 'In Habitica, you earn cute companions as you accomplish real-world tasks. I\'ve worked hard and gotten myself a new pet!' + - var socialDescription = 'I\'ve worked hard and gotten myself a new pet! In Habitica, you earn cute companions as you accomplish real-world tasks.' block content include ./landing-page diff --git a/website/views/social/landing-page.jade b/website/views/social/landing-page.jade index 958120769a..356e0618c2 100644 --- a/website/views/social/landing-page.jade +++ b/website/views/social/landing-page.jade @@ -1,7 +1,7 @@ .text-center - #intro + #intro(style='padding-bottom:3rem') h1=env.t('imagine1') - ul + ul.lead li=env.t('landingCopy1') li=env.t('landingCopy2') li=env.t('landingCopy3') @@ -10,8 +10,7 @@ .col-md-6 img.img-rendering-auto.center-block.img-responsive(src='https://d2afqr2xdmyzvu.cloudfront.net/front/images/intro.png') .col-md-6 - .row - +registrationForm + +registrationForm .row a(ng-click='playButtonClick()')=env.t('alreadyHaveAccount') .row diff --git a/website/views/social/level-up.jade b/website/views/social/level-up.jade index 2bb5aba74d..c67c9137e9 100644 --- a/website/views/social/level-up.jade +++ b/website/views/social/level-up.jade @@ -3,7 +3,7 @@ extends ./layout block extraHead - var socialPage = 'level-up' - var socialTitle = 'Level Up!' - - var socialDescription = 'In Habitica, your avatar grows in strength as you improve your real-life habits. I\'ve attained a new level with what I\'ve accomplished!' + - var socialDescription = 'I\'ve attained a new level with what I\'ve accomplished! In Habitica, your avatar grows in strength as you improve your real-life habits.' block content include ./landing-page diff --git a/website/views/social/raise-pet.jade b/website/views/social/raise-pet.jade index 6116802cf0..a7cbabcad3 100644 --- a/website/views/social/raise-pet.jade +++ b/website/views/social/raise-pet.jade @@ -3,7 +3,7 @@ extends ./layout block extraHead - var socialPage = 'raise-pet' - var socialTitle = 'Raised a Pet into a Mount!' - - var socialDescription = 'In Habitica, collectible pets grow along with you as you advance you real-life goals. My progress has turned a pet into a trusty mount!' + - var socialDescription = 'My progress has turned a pet into a trusty mount! In Habitica, collectible pets grow along with you as you advance your real-life goals.' block content include ./landing-page diff --git a/website/views/social/unlock-quest.jade b/website/views/social/unlock-quest.jade index 7067ad023d..88ba16ba47 100644 --- a/website/views/social/unlock-quest.jade +++ b/website/views/social/unlock-quest.jade @@ -3,7 +3,7 @@ extends ./layout block extraHead - var socialPage = 'unlock-quest' - var socialTitle = 'Unlocked a Quest!' - - var socialDescription = 'In Habitica, you can defeat fearsome monsters and devious villains with real-life productivity. I\'ve earned just such a Quest with my progress!' + - var socialDescription = 'I\'ve discovered a new Quest! In Habitica, you can battle fearsome monsters and devious villains using your real-life productivity.' block content include ./landing-page diff --git a/website/views/social/won-challenge.jade b/website/views/social/won-challenge.jade index 617a679b3b..08e11f4b22 100644 --- a/website/views/social/won-challenge.jade +++ b/website/views/social/won-challenge.jade @@ -3,7 +3,7 @@ extends ./layout block extraHead - var socialPage = 'won-challenge' - var socialTitle = 'Won a Challenge!' - - var socialDescription = 'In Habitica, users can challenge one another to accomplish goals in all areas of life. I\'ve won just such a Challenge!' + - var socialDescription = 'I\'ve stood out from the pack and won a Challenge! In Habitica, users can challenge one another to accomplish goals in all areas of life.' block content include ./landing-page diff --git a/website/views/static/login-modal.jade b/website/views/static/login-modal.jade index b8dbb2bff4..766bfc11f4 100644 --- a/website/views/static/login-modal.jade +++ b/website/views/static/login-modal.jade @@ -19,7 +19,7 @@ mixin registrationForm a(href='/static/privacy' target='_blank')=env.t('privacy') | . .form-group - input.btn.btn-block.btn-lg.btn-primary(type='submit', ng-disabled='registrationForm.$invalid || registrationInProgress', value=env.t('register')) + input.btn.btn-block.btn-lg.btn-success(type='submit', ng-disabled='registrationForm.$invalid || registrationInProgress', value=env.t('getStartedNow')) script(id='modals/login.html', type='text/ng-template') .modal-header