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

Merge branch 'master' of https://github.com/codecombat/codecombat

Browse source
This commit is contained in:
Nick Winter 2014-12-10 09:45:34 -08:00
commit 2b0231e95f
7 changed files with 23 additions and 3 deletions

BIN
app/assets/images/level/loading_left_wing.png
View file

Binary file not shown.
Side by side

Before

(image error) Size: 168 KiB

BIN
app/assets/images/level/loading_right_wing.png
View file

Binary file not shown.
Side by side

Before

(image error) Size: 156 KiB

BIN
app/assets/images/pages/play/map_dungeon.jpg
View file

Binary file not shown.
Side by side

Before

(image error) Size: 856 KiB

BIN
app/assets/images/pages/play/map_forest.jpg
View file

Binary file not shown.
Side by side

Before

(image error) Size: 1.1 MiB

8
app/styles/play/level/loading.sass
View file

@ -118,11 +118,15 @@
position: absolute position: absolute
.left-wing .left-wing
@include wing-background('/images/level/loading_left_wing.png', right) @include wing-background('/images/level/loading_left_wing_1920.jpg', right)
@media screen and ( max-width: 1366px )
@include wing-background('/images/level/loading_left_wing_1366.jpg', right)
left: -50% left: -50%
@include transition(all $UNVEIL_TIME ease) @include transition(all $UNVEIL_TIME ease)
.right-wing .right-wing
@include wing-background('/images/level/loading_right_wing.png', left) @include wing-background('/images/level/loading_right_wing_1920.jpg', left)
@media screen and ( max-width: 1366px )
@include wing-background('/images/level/loading_right_wing_1366.jpg', left)
right: -50% right: -50%
@include transition(all $UNVEIL_TIME ease) @include transition(all $UNVEIL_TIME ease)

16
app/styles/play/world-map-view.sass
View file

@ -96,7 +96,23 @@ $gameControlMargin: 30px
.map-background .map-background
width: 100% width: 100%
height: 100% height: 100%
background-size: 100%
@include user-select(none) @include user-select(none)
&.map-dungeon
background-image: url('/images/pages/play/map_dungeon_1920.jpg')
@media screen and ( max-width: 1366px )
background-image: url('/images/pages/play/map_dungeon_1366.jpg')
&.map-forest
background-image: url('/images/pages/play/map_forest_1920.jpg')
@media screen and ( max-width: 1366px )
background-image: url('/images/pages/play/map_forest_1366.jpg')
&.map-desert
background-image: url('/images/pages/play/map_desert_1920.jpg')
@media screen and ( max-width: 1366px )
background-image: url('/images/pages/play/map_desert_1366.jpg')
.level, .level-shadow .level, .level-shadow
position: absolute position: absolute

2
app/templates/play/world-map-view.jade
View file

@ -3,7 +3,7 @@
.gradient.vertical-gradient.right-gradient .gradient.vertical-gradient.right-gradient
.gradient.horizontal-gradient.bottom-gradient .gradient.horizontal-gradient.bottom-gradient
.gradient.vertical-gradient.left-gradient .gradient.vertical-gradient.left-gradient
img.map-background(src="/images/pages/play/map_" + mapType + ".jpg", alt="", draggable="false") .map-background(class="map-"+mapType alt="", draggable="false")
- var seenNext = nextLevel; - var seenNext = nextLevel;
each level in campaign.levels each level in campaign.levels