Skip to content

Commit

Permalink
see #284
Browse files Browse the repository at this point in the history
  • Loading branch information
@jmjpro
jmjpro committed Aug 24, 2013
1 parent 8bac046 commit 1e4b63b
Show file tree
Hide file tree
Showing 2 changed files with 57 additions and 38 deletions.
93 changes: 56 additions & 37 deletions css/global.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,8 @@ div.nav-button {
}

#dialog-quit {
/*background: url('../res/img/background/dialog-regular.png') no-repeat left top;*/
background-repeat: no-repeat;
background-position: top left;
background-size: 100%;
width: 717px;
height: 590px;
Expand Down Expand Up @@ -197,7 +198,8 @@ div.dialog-title {
}

#dialog-game-menu {
background: no-repeat left top;
background-repeat: no-repeat;
background-position: top left;
background-size: 100%;
width: 717px;
height: 690px;
Expand All @@ -214,7 +216,8 @@ div.dialog-title {
}

#dialog-level-won {
background: no-repeat left top;
background-repeat: no-repeat;
background-position: top left;
background-size: 100%;
width: 717px;
height: 626px;
Expand Down Expand Up @@ -250,7 +253,8 @@ div.dialog-title {


.button-huge {
background: no-repeat left top;
background-repeat: no-repeat;
background-position: top left;
background-size: 100%;
width: 388px;
height: 94px;
Expand All @@ -259,39 +263,36 @@ div.dialog-title {
font-size: 27px;
}

.button-huge-hilight {
/*background-image: url('../res/img/dialog/button-huge-highlight.png');*/
}

.button-big {
background: url('../res/img/dialog/button-big-regular.png') no-repeat left top;
background-repeat: no-repeat;
background-position: top left;
background-size: 100%;
width: 388px;
height: 90px;
vertical-align: middle;
line-height: 90px;
}

.button-big-hilight {
background-image: url('../res/img/dialog/button-big-highlight.png');
}

.button-medium {
background: no-repeat left top;
background-repeat: no-repeat;
background-position: top left;
background-size: 100%;
width: 190px;
height: 81px;
width: 164px;
height: 55px;
line-height: 55px;
vertical-align: middle;
line-height: 81px;
font-size: 22px;
}

.button-medium-hilight {
/*background-image: url('../res/img/dialog/button-medium-highlight.png');*/
width: 164px;
height: 55px;
line-height: 55px;
}

.button-small {
background: url('../res/img/dialog/button-small-regular.png') no-repeat left top;
background-repeat: no-repeat;
background-position: top left;
background-size: 100%;
width: 140px;
height: 102px;
Expand All @@ -300,7 +301,8 @@ div.dialog-title {
}

.button-regular {
background: url('../res/img/dialog/button-gameMenu-regular.png') no-repeat left top;
background-repeat: no-repeat;
background-position: top left;
background-size: 100%;
width: 184px;
height: 108px;
Expand All @@ -315,12 +317,14 @@ div.dialog-title {
}

.button-regular-hilight {
background: url('../res/img/dialog/button-gameMenu-hilight.png') no-repeat left top;
background-repeat: no-repeat;
background-position: top left;
background-size: 100%;
}

.button-small-hilight {
background-image: url('../res/img/dialog/button-small-highlight.png');
background-repeat: no-repeat;
background-position: top left;
background-size: 100%;
}

Expand All @@ -336,7 +340,8 @@ ul.vertical-button-nav > li {
}

#dialog-game-over {
/*background: url('../res/img/background/dialog-small.png') no-repeat left top;*/
background-repeat: no-repeat;
background-position: top left;
background-size: 100%;
width: 717px;
height: 247px;
Expand All @@ -345,7 +350,8 @@ ul.vertical-button-nav > li {
}

#dialog-leaderboards {
background: url('../res/img/background/dialog-large.png') no-repeat left top;
background-repeat: no-repeat;
background-position: top left;
background-size: 100%;
width: 1081px;
height: 625px;
Expand All @@ -359,7 +365,8 @@ ul.vertical-button-nav > li {

#dialog-leaderboards div.dialog-content table {
display: inline-block;
background: url('../res/img/dialog/drop-down-menu.png') no-repeat left top;
background-repeat: no-repeat;
background-position: top left;
background-size: 100% 100%; /* for some reason a value of cover here was chopping off the right side of the background */
font-size: 24px;
color: rgb(13,97,132);
Expand All @@ -382,7 +389,8 @@ ul.vertical-button-nav > li {
}

#dialog-time-out {
background: no-repeat left top;
background-repeat: no-repeat;
background-position: top left;
background-size: 100%;
width: 717px;
height: 626px;
Expand All @@ -395,7 +403,8 @@ ul.vertical-button-nav > li {
}

#dialog-you-won {
background: url('../res/img/background/dialog-regular-no-title.png') no-repeat left top;
background-repeat: no-repeat;
background-position: top left;
background-size: 100%;
width: 717px;
height: 626px;
Expand All @@ -416,7 +425,8 @@ span#final-score {
}

#dialog-loading {
background: url('../res/img/background/dialog-small-no-title.png') no-repeat left top;
background-repeat: no-repeat;
background-position: top left;
background-size: 100%;
width: 543px;
height: 268px;
Expand All @@ -426,7 +436,8 @@ span#final-score {
}

#dialog-new-game {
background: no-repeat left top;
background-repeat: no-repeat;
background-position: top left;
background-size: 100%;
width: 717px;
height: 590px;
Expand All @@ -436,7 +447,8 @@ span#final-score {
}

#dialog-game-options {
background: url('../res/img/background/dialog-regular-no-title.png') no-repeat left top;
background-repeat: no-repeat;
background-position: top left;
background-size: 100%;
width: 717px;
height: 626px;
Expand All @@ -445,7 +457,8 @@ span#final-score {
}

#dialog-profile-delete {
background: url('../res/img/background/dialog-regular.png') no-repeat left top;
background-repeat: no-repeat;
background-position: top left;
background-size: 100%;
width: 717px;
height: 590px;
Expand All @@ -459,7 +472,8 @@ span#final-score {
}

#dialog-profile-create {
background: url('../res/img/background/dialog-regular-no-title.png') no-repeat left top;
background-repeat: no-repeat;
background-position: top left;
background-size: 100%;
width: 717px;
height: 626px;
Expand Down Expand Up @@ -496,7 +510,8 @@ span#final-score {
ul.galapago-drop-down {
list-style-type: none;
text-align: left;
background: url('../res/img/dialog/drop-down-menu.png') no-repeat left top;
background-repeat: no-repeat;
background-position: top left;
background-size: 100%;
width: 326px;
height: 177px;
Expand All @@ -511,7 +526,8 @@ ul.galapago-drop-down {

#dialog-profile-create-init
{
background: url('../res/img/background/dialog-large.png') no-repeat left top;
background-repeat: no-repeat;
background-position: top left;
background-size: 100%;
width: 1081px;
height: 625px;
Expand All @@ -520,7 +536,8 @@ ul.galapago-drop-down {
}

#dialog-profile-list {
background: url('../res/img/background/dialog-regular-no-title.png') no-repeat left top;
background-repeat: no-repeat;
background-position: top left;
background-size: 100%;
width: 717px;
height: 626px;
Expand All @@ -538,7 +555,8 @@ ul.galapago-drop-down {
}

#dialog-reset-game {
/*background: url('../res/img/background/dialog-regular-no-title.png') no-repeat left top;*/
background-repeat: no-repeat;
background-position: top left;
background-size: 100%;
width: 717px;
height: 626px;
Expand All @@ -551,7 +569,8 @@ ul.galapago-drop-down {
}

#dialog-help {
/*background: url('../res/img/background/dialog-regular-no-title.png') no-repeat left top;*/
background-repeat: no-repeat;
background-position: top left;
background-size: 100%;
width: 717px;
height: 626px;
Expand Down
2 changes: 1 addition & 1 deletion js/levelAnimation.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -690,7 +690,7 @@ LevelAnimation.prototype.animateGameStartArrow = function(layer){
var levelAnimation = this;
function animateGameStartArrow(){
var coordinates, image, gameStartArrowImageSpriteSheet;
image = LoadingScreen.gal.get(MapScreen.GAL_PREFIX + 'strip_game_start_arrow.png');
image = LoadingScreen.gal.get(MapScreen.GAL_PREFIX + 'strip-game-start-arrow.png');
gameStartArrowImageSpriteSheet = new SpriteSheet(image, LevelAnimation.GAME_START_ARROW_SPRITE_MATRIX);
coordinates = [200 , 265 ];
if(levelAnimation.gameStartArrowAnimation){
Expand Down

0 comments on commit 1e4b63b

Please sign in to comment.