From a7dadc34aa3606fd3d93033c29aa0a491d4c9b1f Mon Sep 17 00:00:00 2001
From: Ryan Marren <rmarren1@jhu.edu>
Date: Fri, 20 Feb 2015 23:50:42 -0500
Subject: [PATCH 1/2] Added level indicator
---
app/styles/play/campaign-view.sass | 10 ++++++++--
app/templates/play/campaign-view.jade | 2 +-
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/app/styles/play/campaign-view.sass b/app/styles/play/campaign-view.sass
index 9fbf37a2a..a3530fc35 100644
--- a/app/styles/play/campaign-view.sass
+++ b/app/styles/play/campaign-view.sass
@@ -376,7 +376,7 @@ $gameControlMargin: 30px
height: 32px
color: white
- .gem, .player-level-icon, .player-hero-icon
+ .gem, .level-indicator .player-level-icon, .player-hero-icon
position: absolute
top: 1px
@@ -384,7 +384,7 @@ $gameControlMargin: 30px
margin-left: 40px
.player-level
- margin-left: 34px
+ margin-left: 5px
.player-name
margin-left: 45px
@@ -400,6 +400,12 @@ $gameControlMargin: 30px
height: 30px
margin: 0px 2px
+ .level-indicator
+ margin-left: 15px
+ color: #E5C100
+ display: inline-block
+ margin: 0p 2px
+
.player-hero-icon
margin-left: 10px
background-position: (-4 * $spriteSheetSize) 0
diff --git a/app/templates/play/campaign-view.jade b/app/templates/play/campaign-view.jade
index 5245fe112..ce162eb7d 100644
--- a/app/templates/play/campaign-view.jade
+++ b/app/templates/play/campaign-view.jade
@@ -93,7 +93,7 @@ else
.user-status-line
span.gem.gem-30
span#gems-count.spr= me.gems()
- span.player-level-icon
+ span.level-indicator Level
span.player-level.spr= me.level()
span.player-hero-icon
if me.get('anonymous')
From f850409dbe3cf2263e37e6ef68491f4f29d9b178 Mon Sep 17 00:00:00 2001
From: Ryan Marren <rmarren1@jhu.edu>
Date: Sat, 21 Feb 2015 14:29:40 -0500
Subject: [PATCH 2/2] made "level" display in other languages
---
app/templates/play/campaign-view.jade | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/templates/play/campaign-view.jade b/app/templates/play/campaign-view.jade
index ce162eb7d..90ed2be79 100644
--- a/app/templates/play/campaign-view.jade
+++ b/app/templates/play/campaign-view.jade
@@ -93,7 +93,7 @@ else
.user-status-line
span.gem.gem-30
span#gems-count.spr= me.gems()
- span.level-indicator Level
+ span.level-indicator(data-i18n="general.player_level")
span.player-level.spr= me.level()
span.player-hero-icon
if me.get('anonymous')