From 91c9e5627f0f01948065d77fd3702fabcd990586 Mon Sep 17 00:00:00 2001 From: Shane Lister Date: Thu, 26 Sep 2013 23:23:30 -0700 Subject: [PATCH 1/2] Update profile.jade Reorder and add new skin choices. --- views/options/profile.jade | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/views/options/profile.jade b/views/options/profile.jade index 8a280da0d1..895e9f172c 100644 --- a/views/options/profile.jade +++ b/views/options/profile.jade @@ -21,11 +21,14 @@ // skin li.customize-menu menu(label='Skin') + button.customize-option(class='{{user.preferences.gender}}_skin_asian', type='button', ng-click='set("preferences.skin","asian")') + button.customize-option(class='{{user.preferences.gender}}_skin_white', type='button', ng-click='set("preferences.skin","white")') + button.customize-option(class='{{user.preferences.gender}}_skin_ea8349', type='button', ng-click='set("preferences.skin","ea8349")') + button.customize-option(class='{{user.preferences.gender}}_skin_c06534', type='button', ng-click='set("preferences.skin","c06534")') + button.customize-option(class='{{user.preferences.gender}}_skin_98461a', type='button', ng-click='set("preferences.skin","98461a")') + button.customize-option(class='{{user.preferences.gender}}_skin_black', type='button', ng-click='set("preferences.skin","black")') button.customize-option(class='{{user.preferences.gender}}_skin_dead', type='button', ng-click='set("preferences.skin","dead")') button.customize-option(class='{{user.preferences.gender}}_skin_orc', type='button', ng-click='set("preferences.skin","orc")') - button.customize-option(class='{{user.preferences.gender}}_skin_asian', type='button', ng-click='set("preferences.skin","asian")') - button.customize-option(class='{{user.preferences.gender}}_skin_black', type='button', ng-click='set("preferences.skin","black")') - button.customize-option(class='{{user.preferences.gender}}_skin_white', type='button', ng-click='set("preferences.skin","white")') menu(ng-show='user.preferences.gender=="f"', type='list') li.customize-menu menu(label='Clothing') From ab9d6a53fea65089aacc2ce0506c711276743fe3 Mon Sep 17 00:00:00 2001 From: Shane Lister Date: Thu, 26 Sep 2013 23:25:50 -0700 Subject: [PATCH 2/2] Update customizer.styl Add new skin types to customizer style. Add shirts to cropped images for customizer to fit with other customization options. --- public/css/customizer.styl | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/public/css/customizer.styl b/public/css/customizer.styl index 27c04f60ed..95e35a6540 100644 --- a/public/css/customizer.styl +++ b/public/css/customizer.styl @@ -56,9 +56,10 @@ menu .customize-menu .m_hair_blond,.m_hair_black,.m_hair_brown,.m_hair_white, .f_hair_blond,.f_hair_black,.f_hair_brown,.f_hair_white, - .m_skin_dead,.m_skin_orc,.m_skin_asian,.m_skin_black,.m_skin_white, - .f_skin_dead,.f_skin_orc,.f_skin_asian,.f_skin_black,.f_skin_white, - .m_head_0,.f_head_0 + .m_skin_dead,.m_skin_orc,.m_skin_asian,.m_skin_black,.m_skin_white,.m_skin_ea8349,.m_skin_c06534,.m_skin_98461a, + .f_skin_dead,.f_skin_orc,.f_skin_asian,.f_skin_black,.f_skin_white,.f_skin_ea8349,.f_skin_c06534,.f_skin_98461a, + .m_head_0,.f_head_0, + .f_armor_0_v1,.f_armor_0_v2 width: 60px height: 60px @@ -87,6 +88,12 @@ menu background-position: -2817px -20px; .m_skin_white background-position: -2907px -20px; + .m_skin_ea8349 + background-position: -2997px -20px; + .m_skin_c06534 + background-position: -3087px -20px; + .m_skin_98461a + background-position: -3177px -20px; // head .f_head_0 @@ -113,9 +120,15 @@ menu background-position: -3267px -20px; .f_skin_white background-position: -3357px -20px; + .f_skin_ea8349 + background-position: -3447px -20px; + .f_skin_c06534 + background-position: -3537px -20px; + .f_skin_98461a + background-position: -3627px -20px; // starting armor .f_armor_0_v2 background-position: -2819px -38px; .f_armor_0_v1 - background-position: -2909px -38px; \ No newline at end of file + background-position: -2909px -38px;