Deukhoofd/BattleSim
1
0
Fork 0
mirror of https://gitlab.com/Deukhoofd/BattleSim.git synced 2025-10-27 18:00:03 +00:00
Code Issues Releases Wiki Activity

Merged master into 1.0.1

Browse Source
This commit is contained in:
deukhoofd
2016-02-27 01:03:19 +01:00
parent 35623093b3 d243354cc2
commit edad424acc
19 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
client/app/css/battle.styl
View File

@@ -133,6 +133,7 @@ $side-width = ($battle-width - $screen-width) / 2
&.sand
background linear-gradient(top, rgba(128, 64, 0, .3), rgba(64, 32, 48, .5))
&.sun
opacity 0.6!important
background rgba(255, 196, 64, .3)
.battle_pane

2
client/app/js/models/battles/pokemon.coffee
View File

@@ -268,7 +268,7 @@ class @Pokemon extends Backbone.Model
slugSpecies = slugify(@get('species'))
slugForme = slugify(@get('forme'))
"//pokebattle.com/dex/pokemon/#{slugSpecies}/#{slugForme}"
"//wiki.p-insurgence.com/#{slugSpecies}"
getIllu: ->
@get('illu')