mirror of
https://github.com/sudoxnym/habitica-self-host.git
synced 2026-07-16 11:11:43 +00:00
classes & grunt-spritesmith: NPCs habitrpg-shared#85164c9
This commit is contained in:
Tyler Renelle
parent
8803df46c0
commit
88c64a6f80
9 changed files with 52 additions and 55 deletions
|
|
@ -1,36 +1,27 @@
|
|||
.NPC-Alex, .NPC-Bailey, .NPC-Bailey-Head, .NPC-Daniel, .NPC-Justin, .NPC-Justin-Head, .NPC-Matt {background: url("/bower_components/habitrpg-shared/img/npcs/NPC-SpriteSheet.png") no-repeat}
|
||||
.npc_alex_container
|
||||
margin-bottom: 20px
|
||||
|
||||
.NPC-Alex {background-position: 0 0; width: 162px; height: 138px;}
|
||||
.NPC-Alex-container{margin-bottom: 20px;}
|
||||
.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: 100%; padding-left: 208px; padding-bottom: 20px;}
|
||||
.npc_matt
|
||||
margin-bottom: 20px
|
||||
|
||||
// Bailey
|
||||
.NPC-Bailey
|
||||
background-position: -162px -42px
|
||||
width: 60px
|
||||
height: 72px
|
||||
float:left
|
||||
.NPC-Bailey-Head
|
||||
background-position: -162px -42px
|
||||
width: 60px
|
||||
height: 30px
|
||||
position: absolute
|
||||
top: 117px // 147 (header-height) - 30 (bailey height)
|
||||
right: 50px
|
||||
cursor: pointer
|
||||
|
||||
|
||||
.static-popover
|
||||
z-index 0
|
||||
display block
|
||||
position:relative
|
||||
.npc_bailey
|
||||
float:left
|
||||
.npc_bailey_head
|
||||
height: 30px !important
|
||||
position: absolute
|
||||
top: 117px // 147 (header-height) - 30 (bailey height)
|
||||
right: 50px
|
||||
cursor: pointer
|
||||
|
||||
// Tour (Justin)
|
||||
.NPC-Justin.float-left
|
||||
.npc_justin.float-left
|
||||
float: left
|
||||
margin-right: 5px
|
||||
margin-bottom: 5px
|
||||
|
||||
.static-popover
|
||||
z-index 0
|
||||
display block
|
||||
position:relative
|
||||
|
||||
.popover-navigation {clear:both;}
|
||||
|
|
@ -52,7 +52,7 @@ angular.module('guideServices', []).
|
|||
}
|
||||
];
|
||||
_.each(tourSteps, function(step){
|
||||
step.content = "<div><div class='NPC-Justin float-left'></div>" + step.content + "</div>"; // add Justin NPC img
|
||||
step.content = "<div><div class='npc_justin float-left'></div>" + step.content + "</div>"; // add Justin NPC img
|
||||
});
|
||||
$('.main-herobox').popover('destroy');
|
||||
var tour = new Tour({
|
||||
|
|
@ -75,7 +75,7 @@ angular.module('guideServices', []).
|
|||
if (!placement) placement = 'bottom';
|
||||
$(selector).popover('destroy');
|
||||
var button = "<button class='btn btn-sm btn-default' onClick=\"$('" + selector + "').popover('hide');return false;\">Close</button>";
|
||||
html = "<div><div class='NPC-Justin float-left'></div>" + html + '<br/>' + button + '</div>';
|
||||
html = "<div><div class='npc_justin float-left'></div>" + html + '<br/>' + button + '</div>';
|
||||
$(selector).popover({
|
||||
title: title,
|
||||
placement: placement,
|
||||
|
|
|
|||
|
|
@ -38,10 +38,10 @@ script(type='text/ng-template', id='partials/options.inventory.inventory.html')
|
|||
.span6
|
||||
h2 Market
|
||||
.row-fluid
|
||||
table.NPC-Alex-container
|
||||
table.npc_alex_container
|
||||
tr
|
||||
td
|
||||
.NPC-Alex.pull-left
|
||||
.npc_alex.pull-left
|
||||
td
|
||||
.popover.static-popover.fade.right.in
|
||||
.arrow
|
||||
|
|
|
|||
|
|
@ -14,15 +14,18 @@ script(type='text/ng-template', id='partials/options.inventory.stable.html')
|
|||
|
||||
script(type='text/ng-template', id='partials/options.inventory.stable.mounts.html')
|
||||
.stable
|
||||
.NPC-Matt
|
||||
.popover.static-popover.fade.right.in(style='max-width: 550px; margin-left: 10px;')
|
||||
.arrow
|
||||
h3.popover-title
|
||||
a(target='_blank', href='http://www.kickstarter.com/profile/mattboch') Matt Boch
|
||||
.popover-content
|
||||
p.
|
||||
Shall I bring you your steed, {{user.profile.name}}? Click a mount to saddle up.
|
||||
h4 {{mountCount}} / {{totalPets}} Mounts Tamed
|
||||
table(style='width:100%')
|
||||
tr
|
||||
td.npc_matt
|
||||
td
|
||||
.popover.static-popover.fade.right.in(style='max-width: 550px; margin-left: 10px;')
|
||||
.arrow
|
||||
h3.popover-title
|
||||
a(target='_blank', href='http://www.kickstarter.com/profile/mattboch') Matt Boch
|
||||
.popover-content
|
||||
p.
|
||||
Shall I bring you your steed, {{user.profile.name}}? Click a mount to saddle up.
|
||||
h4 {{mountCount}} / {{totalPets}} Mounts Tamed
|
||||
menu.pets(type='list')
|
||||
li.customize-menu(ng-repeat='egg in Items.eggs')
|
||||
menu
|
||||
|
|
@ -42,15 +45,18 @@ script(type='text/ng-template', id='partials/options.inventory.stable.mounts.htm
|
|||
|
||||
script(type='text/ng-template', id='partials/options.inventory.stable.pets.html')
|
||||
.stable
|
||||
.NPC-Matt
|
||||
.popover.static-popover.fade.right.in(style='max-width: 550px; margin-left: 10px;')
|
||||
.arrow
|
||||
h3.popover-title
|
||||
a(target='_blank', href='http://www.kickstarter.com/profile/mattboch') Matt Boch
|
||||
.popover-content
|
||||
p.
|
||||
Welcome to the Stable! I'm Matt, the beast master. Choose a pet here to venture at your side. <a target='_blank' href='https://f.cloud.github.com/assets/2374703/164631/3ed5fa6c-78cd-11e2-8743-f65ac477b55e.png'>Have a look-see</a> at all the pets you can collect.
|
||||
h4 {{petCount}} / {{totalPets}} Pets Found
|
||||
table(style='width:100%')
|
||||
tr
|
||||
td.npc_matt
|
||||
td
|
||||
.popover.static-popover.fade.right.in(style='max-width: 550px; margin-left: 10px;')
|
||||
.arrow
|
||||
h3.popover-title
|
||||
a(target='_blank', href='http://www.kickstarter.com/profile/mattboch') Matt Boch
|
||||
.popover-content
|
||||
p.
|
||||
Welcome to the Stable! I'm Matt, the beast master. Choose a pet here to venture at your side. <a target='_blank' href='https://f.cloud.github.com/assets/2374703/164631/3ed5fa6c-78cd-11e2-8743-f65ac477b55e.png'>Have a look-see</a> at all the pets you can collect.
|
||||
h4 {{petCount}} / {{totalPets}} Pets Found
|
||||
|
||||
menu.pets(type='list')
|
||||
li.customize-menu(ng-repeat='egg in Items.eggs')
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
table
|
||||
tr
|
||||
td
|
||||
.NPC-Daniel
|
||||
.npc_daniel
|
||||
td
|
||||
.popover.static-popover.fade.right.in
|
||||
.arrow
|
||||
|
|
|
|||
|
|
@ -35,5 +35,5 @@
|
|||
.herobox-wrap(ng-repeat='profile in partyMinusSelf')
|
||||
include avatar
|
||||
|
||||
.NPC-Bailey-Head(ng-show='user.flags.newStuff', tooltip='Psst', tooltip-placement='top', ng-click='modals.newStuff=true')
|
||||
.npc_bailey.npc_bailey_head(ng-show='user.flags.newStuff', tooltip='Psst', tooltip-placement='top', ng-click='modals.newStuff=true')
|
||||
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ div(modal='user.flags.contributor')
|
|||
.modal-header
|
||||
h3 Contributor Achievement!
|
||||
.modal-body
|
||||
.NPC-Justin.float-left
|
||||
.npc_justin.float-left
|
||||
p.
|
||||
{{user.profile.name}}, you awesome person! You're now a level {{user.contributor.level}} contributor for helping HabitRPG. See <a href='http://habitrpg.wikia.com/wiki/Contributor_Rewards' target='_blank'>what prizes you've earned for your contribution!</a>
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ div(modal='modals.buyGems')
|
|||
table
|
||||
tr
|
||||
td
|
||||
.NPC-Justin
|
||||
.npc_justin
|
||||
td
|
||||
.popover.static-popover.fade.right.in.wide-popover
|
||||
.arrow
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ div(modal='modals.newStuff')
|
|||
table
|
||||
tr
|
||||
td
|
||||
.NPC-Bailey
|
||||
.npc_bailey
|
||||
td
|
||||
.popover.static-popover.fade.right.in.wide-popover
|
||||
.arrow
|
||||
|
|
|
|||
Loading…
Reference in a new issue