krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 15:48:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

[#1397 #1543 #1540]use justin in popovers instead of indicator icons (may want to revisit)

Browse Source
This commit is contained in:
Tyler Renelle
2013-09-17 14:15:57 -04:00
parent 36b3a77877
commit 5ab3ea7311
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
public/css/npcs.styl
View File

@@ -29,7 +29,8 @@
position:relative position:relative
// Tour (Justin) // Tour (Justin)
.tour-tour .NPC-Justin .NPC-Justin.float-left
float: left float: left
margin-right: 5px margin-right: 5px
margin-bottom: 5px
.popover-navigation {clear:both;} .popover-navigation {clear:both;}

4
public/js/services/guideServices.js
View File

@@ -51,7 +51,7 @@ angular.module('guideServices', []).
} }
]; ];
_.each(tourSteps, function(step){ _.each(tourSteps, function(step){
step.content = "<div><div class='NPC-Justin'></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'); $('.main-herobox').popover('destroy');
var tour = new Tour({ var tour = new Tour({
@@ -73,7 +73,7 @@ angular.module('guideServices', []).
var showPopover = function(selector, title, html, placement) { var showPopover = function(selector, title, html, placement) {
if (!placement) placement = 'bottom'; if (!placement) placement = 'bottom';
$(selector).popover('destroy'); $(selector).popover('destroy');
html = "<div><div class='NPC-Justin'></div>" + html + "<a class='btn btn-default' href='#' onClick=\"$('" + selector + "').popover('hide');return false;\">[Close]</a></div>"; html = "<div><div class='NPC-Justin float-left'></div>" + html + "<br/><a class='btn btn-sm btn-default' href='#' onClick=\"$('" + selector + "').popover('hide');return false;\">Close</a></div>";
$(selector).popover({ $(selector).popover({
title: title, title: title,
placement: placement, placement: placement,