feat(tutorial): Splash screen overhaul complete

test/spec/services/notificationServicesSpec.js

@@ -94,7 +94,7 @@ describe('notificationServices', function() {
 
     expect($.pnotify).to.have.been.calledThrice;
     expect(arg.type).to.eql('xp');
-    expect(arg.text).to.eql('+ 50 XP');
+    expect(arg.text).to.eql('+ 50 Experience');
     expect(arg.icon).to.eql('glyphicon glyphicon-star');
   });
 
@@ -104,7 +104,7 @@ describe('notificationServices', function() {
 
     expect($.pnotify).to.have.been.calledOnce;
     expect(arg.type).to.eql('xp');
-    expect(arg.text).to.eql('+ 50.2 XP');
+    expect(arg.text).to.eql('+ 50.2 Experience');
     expect(arg.icon).to.eql('glyphicon glyphicon-star');
   });
 
@@ -134,7 +134,7 @@ describe('notificationServices', function() {
 
     expect($.pnotify).to.have.been.calledOnce;
     expect(arg.type).to.eql('hp');
-    expect(arg.text).to.eql('+ 10 HP');
+    expect(arg.text).to.eql('+ 10 Health');
     expect(arg.icon).to.eql('glyphicon glyphicon-heart');
   });
 
@@ -170,7 +170,7 @@ describe('notificationServices', function() {
 
     expect($.pnotify).to.have.been.calledOnce;
     expect(arg.type).to.eql('mp');
-    expect(arg.text).to.eql('+ 10 MP');
+    expect(arg.text).to.eql('+ 10 Mana');
     expect(arg.icon).to.eql('glyphicon glyphicon-fire');
   });
 

website/public/js/services/guideServices.js

@@ -44,16 +44,16 @@ function($rootScope, User, $timeout, $state, Analytics) {
           state: 'tasks',
           element: ".task-column.habits",
           content: window.env.t('tourHabitsBrief'),
-          placement: "right",
+          placement: "top",
           proceed: window.env.t('tourHabitsProceed'),
           gold: 4,
           experience: 29
         },
         {
           state: 'tasks',
-          element: ".task-column.rewards",
+          element: "h2.task-column_title.reward-title",
           content: window.env.t('tourRewardsBrief'),
-          placement: "top",
+          placement: "left",
           proceed: window.env.t('tourRewardsProceed'),
           gold: 4,
           experience: 29,

website/views/shared/modals/welcome.jade

@@ -1,5 +1,3 @@
-// Created by sabrecat on 5/18/15.
-
 script(type='text/ng-template', id='modals/welcome.html')
   .modal-header.text-center
     h1=env.t('welcomeToHabit')
@@ -10,23 +8,23 @@ script(type='text/ng-template', id='modals/welcome.html')
           h1
             | ①
           h3(style='margin:auto auto auto .5em')=env.t('welcome1')
-        .welcome_basic_avatars
+        .welcome_basic_avatars(style='margin: 1.5em auto 1.5em')
         h4=env.t('welcome1notes')
       .col-sm-4.col-centered
         span(style='display:flex')
           h1
             | ②
-          h3(style='margin:.3em auto 1em .5em')=env.t('welcome2')
-        .welcome_sample_tasks
+          h3(style='margin:.3em auto auto .5em')=env.t('welcome2')
+        .welcome_sample_tasks(style='margin: 2.5em auto 1.5em')
         h4=env.t('welcome2notes')
       .col-sm-4.col-centered
         span(style='display:flex')
           h1
             | ③
-          h3(style='margin:auto auto 1em .5em')=env.t('welcome3')
-        .welcome_promo_party
+          h3(style='margin:auto auto auto .5em')=env.t('welcome3')
+        .welcome_promo_party(style='margin: 1em auto 1em')
         h4=env.t('welcome3notes')
-  .modal-footer.text-center
+  .modal-footer.text-center(style='margin-top:0')
     .col-sm-3
     .col-sm-6
       a.btn.btn-primary.btn-lg.flex-column(ng-click='$close(); Guide.goto("intro",0)')=env.t('imReady')

website/views/shared/tasks/index.jade

@@ -11,7 +11,7 @@ script(id='templates/habitrpg-tasks.html', type="text/ng-template")
 
           include ./task_view/graph
 
-          h2.task-column_title {{::list.header}}
+          h2.task-column_title(class='{{::list.type}}-title') {{::list.header}}
 
           include ./task_view/help