codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-05-03 17:33:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request from rmarren1/master

Browse source 
Clarified level indicator for 
Fixes
This commit is contained in:
Matt Lott 2015-02-21 11:41:35 -08:00
commit ecd9abc3b6
2 changed files with 9 additions and 3 deletions
app
styles/play
campaign-view.sass
templates/play
campaign-view.jade

10
app/styles/play/campaign-view.sass
View file

@ -376,7 +376,7 @@ $gameControlMargin: 30px
height: 32px height: 32px
color: white color: white
.gem, .player-level-icon, .player-hero-icon .gem, .level-indicator .player-level-icon, .player-hero-icon
position: absolute position: absolute
top: 1px top: 1px
@ -384,7 +384,7 @@ $gameControlMargin: 30px
margin-left: 40px margin-left: 40px
.player-level .player-level
margin-left: 34px margin-left: 5px
.player-name .player-name
margin-left: 45px margin-left: 45px
@ -400,6 +400,12 @@ $gameControlMargin: 30px
height: 30px height: 30px
margin: 0px 2px margin: 0px 2px
.level-indicator
margin-left: 15px
color: #E5C100
display: inline-block
margin: 0p 2px
.player-hero-icon .player-hero-icon
margin-left: 10px margin-left: 10px
background-position: (-4 * $spriteSheetSize) 0 background-position: (-4 * $spriteSheetSize) 0

2
app/templates/play/campaign-view.jade
View file

@ -93,7 +93,7 @@ else
.user-status-line .user-status-line
span.gem.gem-30 span.gem.gem-30
span#gems-count.spr= me.gems() span#gems-count.spr= me.gems()
span.player-level-icon span.level-indicator(data-i18n="general.player_level")
span.player-level.spr= me.level() span.player-level.spr= me.level()
span.player-hero-icon span.player-hero-icon
if me.get('anonymous') if me.get('anonymous')