diff --git a/public/img/npcs/alex.png b/public/img/npcs/alex.png deleted file mode 100644 index c4d307fa81..0000000000 Binary files a/public/img/npcs/alex.png and /dev/null differ diff --git a/public/img/npcs/bailey-face.png b/public/img/npcs/bailey-face.png deleted file mode 100644 index ab9b667a3f..0000000000 Binary files a/public/img/npcs/bailey-face.png and /dev/null differ diff --git a/public/img/npcs/bailey.png b/public/img/npcs/bailey.png deleted file mode 100644 index 22274e70da..0000000000 Binary files a/public/img/npcs/bailey.png and /dev/null differ diff --git a/public/img/npcs/daniel.png b/public/img/npcs/daniel.png deleted file mode 100644 index 5aed8f3156..0000000000 Binary files a/public/img/npcs/daniel.png and /dev/null differ diff --git a/public/img/npcs/matt.png b/public/img/npcs/matt.png deleted file mode 100644 index 6710808983..0000000000 Binary files a/public/img/npcs/matt.png and /dev/null differ diff --git a/styles/app/alerts.styl b/styles/app/alerts.styl index da23d0feaa..b459948fc3 100644 --- a/styles/app/alerts.styl +++ b/styles/app/alerts.styl @@ -83,18 +83,4 @@ borderDarken = 20% z-index: 3000 position:absolute left:5px - top:5px - -// Bailey - -.rewards-module - z-index:2000 - -.hiding-bailey - cursor: pointer - position:absolute - right: 50px - top: 117px //FIXME this isn't a good method, but i suck at css - tyler - -.new-stuff-word-bubble-container - height: 90px \ No newline at end of file + top:5px \ No newline at end of file diff --git a/styles/app/header.styl b/styles/app/header.styl index ee5f71b9fb..9d081490de 100644 --- a/styles/app/header.styl +++ b/styles/app/header.styl @@ -8,6 +8,7 @@ border-bottom: 1px solid rgba(0,0,0,0.2) // margin-top: -1px overflow: hidden + position relative /* login/menu buttons --------------------- */ diff --git a/styles/app/index.styl b/styles/app/index.styl index 25a7493ff0..c9128a3dc7 100644 --- a/styles/app/index.styl +++ b/styles/app/index.styl @@ -25,6 +25,7 @@ @import "./achievements.styl"; @import "./game-pane.styl"; @import "./backer.styl"; +@import "./npcs.styl"; // fix exploding to very wide for some reason .datepicker @@ -151,10 +152,6 @@ hr .modal-body margin: 10px -.static-popover - z-index 0 - display block - // TODO this is supposed to go in avatar.styl, but stylus is breaking if I even touch that file .profile-modal-header diff --git a/public/img/npcs/NPC_Sprites.css b/styles/app/npcs.styl similarity index 52% rename from public/img/npcs/NPC_Sprites.css rename to styles/app/npcs.styl index 91953126ff..60b14b00e7 100644 --- a/public/img/npcs/NPC_Sprites.css +++ b/styles/app/npcs.styl @@ -1,9 +1,27 @@ .NPC-Alex, .NPC-Bailey, .NPC-Bailey-Head, .NPC-Daniel, .NPC-Justin, .NPC-Justin-Head, .NPC-Matt {background: url("/img/npcs/NPC-SpriteSheet.png") no-repeat} -.NPC-Alex {background-position: 0 0; width: 162px; 138: 99px} -.NPC-Bailey {background-position: -162px 0; width: 60px; height: 72px} -.NPC-Bailey-Head {background-position: -168px -42; width: 54px; height: 30px} +.NPC-Alex {background-position: 0 0; width: 162px; height: 138px} .NPC-Daniel {background-position: -222px 0; width: 135px; height: 123px} .NPC-Justin {background-position: -357px 0; width: 84px; height: 119px} .NPC-Justin-Head {background-position: -396px 0; width: 36px; height: 96px} .NPC-Matt {background-position: -441px 0; width: 198px; height: 144px} + +// Bailey +.NPC-Bailey + background-position: -162px -41px + width: 60px + height: 73px + float:left +.NPC-Bailey-Head + background-position: -168px -42px + width: 54px + height: 30px + position: absolute + bottom: 0px + right: 50px + cursor: pointer + +.static-popover + z-index 0 + display block + position:relative \ No newline at end of file diff --git a/views/app/alerts.html b/views/app/alerts.html index 0a0df13d0d..ea389b8785 100644 --- a/views/app/alerts.html +++ b/views/app/alerts.html @@ -1,14 +1,15 @@ -

- - -

-
-

Bailey

-
Bailey the Crier here! Announcing new stuff!
-
-

+ + + +
+
+
+

Bailey

+
Bailey the Crier here! Announcing new stuff!
+
+
@@ -85,10 +86,10 @@ {#if equal(_user.flags.newStuff,'show')} - + > {/} diff --git a/views/app/game-pane.html b/views/app/game-pane.html index 117f7896c7..0e9728d943 100644 --- a/views/app/game-pane.html +++ b/views/app/game-pane.html @@ -77,15 +77,19 @@
- -
-
-

Daniel Johansson

-
- Welcome to the Tavern! I'm Daniel, the bar keep. If you want to rest a while (going on vacation? sudden illness?), I'll set you up at the inn - dailies won't hurt you while you're resting. Stay a while & meet the locals. -
-
-
+ + + +
+
+
+

Daniel Johansson

+
+ Welcome to the Tavern! I'm Daniel, the bar keep. If you want to rest a while (going on vacation? sudden illness?), I'll set you up at the inn - dailies won't hurt you while you're resting. Stay a while & meet the locals. +
+
+
+
Whilst resting your dailies are saved and aren't effected by day turn-over. Whether you check out tomorrow or in a weeks time you'll continue in the same state as when you checked in.
@@ -120,17 +124,21 @@ -
- -
-
-

Alexander Augustin

-
Welcome to the Market! I'm the merchant, Alexander. Dying to get that particular pet you're after, but don't want to wait for it to drop? Buy it here!
-
+
+ + + +
+
+
+

Alexander Augustin

+
Welcome to the Market! I'm the merchant, Alexander. Dying to get that particular pet you're after, but don't want to wait for it to drop? Buy it here!
+
+

Eggs

{#with _items.pets as :egg} - +
{#with :egg[0]}{/} {#with :egg[1]}{/} diff --git a/views/app/header.html b/views/app/header.html index 43c9834b3e..66f95880a6 100644 --- a/views/app/header.html +++ b/views/app/header.html @@ -39,5 +39,7 @@ {{/}} + + {/} \ No newline at end of file diff --git a/views/app/index.html b/views/app/index.html index 3e1c2b834f..1640980ed7 100644 --- a/views/app/index.html +++ b/views/app/index.html @@ -30,7 +30,6 @@ - diff --git a/views/app/pets.html b/views/app/pets.html index 8d934855a2..59bef36f0a 100644 --- a/views/app/pets.html +++ b/views/app/pets.html @@ -97,12 +97,12 @@
- - +
+

Matt Boch

- Welcome to the Stable! I'm Matt, the beast master. Choose a pet here to adventure at your side - they aren't much help yet, but I forsee a time when they're able to grow into powerful steeds! Until that day, have a look-see at all the pets you can collect. +

Welcome to the Stable! I'm Matt, the beast master. Choose a pet here to adventure at your side - they aren't much help yet, but I forsee a time when they're able to grow into powerful steeds! Until that day, have a look-see at all the pets you can collect.

{count(_user.items.pets)} / 90 Pets Found