sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-19 10:14:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2291 from HabitRPG/sabe/tweak2

Browse source 
Beef up critical hit notification with its own style and icon
This commit is contained in:
Tyler Renelle 2014-01-07 10:34:07 -08:00
commit bef4f0685e
3 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
public/css/alerts.styl
View file

@ -30,6 +30,8 @@ deathColor = #4E4E4E
deathText = #ABABAB
mpColor = #c7d3e9
mpText = #003aa1
critColor = #ffe3bf
critText = #dc5000
borderDarken = 20%
// alert styles
@ -64,6 +66,11 @@ borderDarken = 20%
border-color: darken(mpColor,borderDarken)
color: mpText
.alert-crit
background-color: critColor
border-color: darken(critColor,borderDarken)
color: critText
// alert icons
.icon-gold

2
public/js/controllers/notificationCtrl.js
View file

@ -43,7 +43,7 @@ habitrpg.controller('NotificationCtrl',
var amount = User.user._tmp.crit * 100 - 100;
// reset the crit counter
User.user._tmp.crit = undefined;
Notification.text("Critical Hit! Bonus: " + amount + "%");
Notification.crit(amount);
});
$rootScope.$watch('user._tmp.drop', function(after, before){

5
public/js/services/notificationServices.js
View file

@ -6,7 +6,7 @@ angular.module("notificationServices", [])
function growl(html, type) {
$.bootstrapGrowl(html, {
ele: '#notification-area',
type: type, //(null, 'text', 'error', 'success', 'gp', 'xp', 'hp', 'lvl', 'death', 'mp')
type: type, //(null, 'text', 'error', 'success', 'gp', 'xp', 'hp', 'lvl', 'death', 'mp', 'crit')
top_offset: 20,
align: 'right', //('left', 'right', or 'center')
width: 250, //(integer, or 'auto')
@ -68,6 +68,9 @@ angular.module("notificationServices", [])
},
mp: function(val) {
growl("<i class='icon-fire'></i> " + sign(val) + " " + round(val) + " MP", 'mp');
},
crit: function(val) {
growl("<i class='icon-certificate'></i> Critical Hit! Bonus: " + val + "%", 'crit');
}
};
}