diff --git a/views/options/profile.jade b/views/options/profile.jade
index c2250f06b8..1ab07efe1b 100644
--- a/views/options/profile.jade
+++ b/views/options/profile.jade
@@ -55,10 +55,10 @@ mixin customizeProfile(mobile)
// Color
li.customize-menu
menu(label=env.t('color'))
- each v,k in {'c8c8c8':'white','903a00':'brown','cfb853':'blond','ec720f':'red','2e2e2e':'black'}
- button(type='button', class='customize-option hair', style='background-color:##{k};', ng-click='set({"preferences.hair.color": "#{v}"})')
+ each color in ['white','brown','blond','red','black']
+ button(type='button', class='#{path=="skin" ? "skin_"+color : "customize-option hair hair_bangs_1_"+color}', ng-click='set({"preferences.hair.color": "#{color}"})')
each color in ['candycane','frost','winternight','holly']
- button(type='button', ng-if='user.purchased.hair.color.#{color}', class='customize-option hair hair_bangs_1_#{color}', style='width: 40px; height: 40px;', ng-click='unlock("hair.color.#{color}")')
+ button(type='button', ng-if='user.purchased.hair.color.#{color}', class='customize-option hair hair_bangs_1_#{color}', ng-click='unlock("hair.color.#{color}")')
each color in ['pblue','pgreen','porange','ppink','ppurple','pyellow']
button(type='button', ng-if='user.purchased.hair.color.#{color}', class='customize-option hair hair_bangs_1_#{color}', ng-click='unlock("hair.color.#{color}")')
+buyPref('hair.color', ['rainbow','yellow','green','purple','blue','TRUred'], 'rainbowColors')
@@ -82,12 +82,20 @@ mixin customizeProfile(mobile)
// Purchasable hairstyles
menu(label=env.t('hairSet1'))
- - var colors = [2,4,5,6,7,8]
- span(ng-hide='#{showPath("user.purchased.hair.base", colors, "&&")}')
+ - var styles = [2,4,5,6,7,8]
+ span(ng-hide='#{showPath("user.purchased.hair.base", styles, "&&")}')
+gemCost(2)
- button.btn.btn-xs(ng-click='#{unlockPath("hair.base",colors)}')!= env.t('unlockSet',{cost:5}) + ' '
- each num in colors
+ button.btn.btn-xs(ng-click='#{unlockPath("hair.base",styles)}')!= env.t('unlockSet',{cost:5}) + ' '
+ each num in styles
button(class='hair_base_#{num}_{{user.preferences.hair.color}} customize-option', type='button', ng-class='{locked: !user.purchased.hair.base["#{num}"]}', ng-click='unlock("hair.base.#{num}")')
+ menu(label=env.t('hairSet2'))
+ - var styles = [9,10,11,12,13,14]
+ span(ng-hide='#{showPath("user.purchased.hair.base", styles, "&&")}')
+ +gemCost(2)
+ button.btn.btn-xs(ng-click='#{unlockPath("hair.base", styles)}')!= env.t('unlockSet', {cost: 5}) + ' '
+ each num in styles
+ button(class='hair_base_#{num}_{{user.preferences.hair.color}} customize-option', type='button', ng-class='{locked: !user.purchased.hair.base["#{num}"]}', ng-click='unlock("hair.base.#{num}")')
+
// Flower
li.customize-menu
diff --git a/views/shared/new-stuff.jade b/views/shared/new-stuff.jade
index a88b871f6e..05200138bc 100644
--- a/views/shared/new-stuff.jade
+++ b/views/shared/new-stuff.jade
@@ -1,21 +1,33 @@
-h5 2/8/2015 - EMAIL NOTIFICATIONS AND LOGIN TYPE SWITCHING!
+h5 2/12/2015 - VALENTINE'S DAY AND NEW HAIRSTYLES!
hr
tr
td
- h5 Email Notifications
- p We've implemented email notifications for a variety of events, including receiving a Private Message, being invited to a Party, Guild, or Quest, and receiving a gift of Gems or a Subscription! We've got some more coming up, too, including the much-requested check-in reminders.
- p Don't want to receive a certain type of notification? No problem! Just go to Notification Settings to tell us exactly which ones you do and do not want to receive. Our messenger dragons will be happy to comply!
- p.small.muted by paglias and Lemoness
+ h5 Happy Valentine's Day!
+ p Help motivate all of the lovely people in your life by sending them a caring valentine. Valentines can be purchased for 10 gold from the Item Store. For spreading love and joy throughout the community, both the giver AND the receiver get a coveted "adoring friends" badge. Hooray!
+ p.small.muted by Lemoness and SabreCat
tr
td
- h5 Login Type Switching
- p Want to change your email address, or switch from Facebook login to email login (or vice versa)? Good news! Now you can switch it yourself, under Settings!
- p.small.muted by Lefnire
+ h5 New Hairstyles!
+ .promo_updos.pull-right
+ p There are a new set of updo hairstyles available in the Avatar Customization page! Have fun customizing your characters.
+ p.small.muted by Crystalphoenix, Mariahm, Painter de Cluster, Leephon, Beffymaroo, Sungabraverday, Lemoness, and Bailey
hr
a(href='/static/old-news', target='_blank') Read older news
mixin oldNews
+ h5 2/8/2015
+ tr
+ td
+ h5 Email Notifications
+ p We've implemented email notifications for a variety of events, including receiving a Private Message, being invited to a Party, Guild, or Quest, and receiving a gift of Gems or a Subscription! We've got some more coming up, too, including the much-requested check-in reminders.
+ p Don't want to receive a certain type of notification? No problem! Just go to Notification Settings to tell us exactly which ones you do and do not want to receive. Our messenger dragons will be happy to comply!
+ p.small.muted by paglias and Lemoness
+ tr
+ td
+ h5 Login Type Switching
+ p Want to change your email address, or switch from Facebook login to email login (or vice versa)? Good news! Now you can switch it yourself, under Settings!
+ p.small.muted by Lefnire
h5 2/3/2015
tr
td