Skip to content

Commit

Permalink
Merge pull requests #64 and #81.
Browse files Browse the repository at this point in the history
Merge @koppor bootstrap3 #64 koppor/bootstrap3.
Merge @jugautam fontawesome #81 jugautam/master.
This should also resolve PRs #78 #76 and makes reference to open issues #82 #72 #62 #60 and if all parties can agree.
  • Loading branch information
nickl- committed Jan 8, 2014
1 parent ae0219d commit 7d5f0ac
Showing 1 changed file with 22 additions and 0 deletions.
22 changes: 22 additions & 0 deletions jquery.pnotify.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,28 @@
hi_btn: "btn btn-default",
hi_btnhov: "",
hi_hnd: "glyphicon glyphicon-chevron-down"
},
/*
* uses icons from http://fontawesome.io/
* version 4.0.3
*/
font_awesome: {
container: "alert",
notice: "",
notice_icon: "fa fa-exclamation-circle",
info: "alert-info",
info_icon: "fa fa-info",
success: "alert-success",
success_icon: "fa fa-check",
error: "alert-error",
error_icon: "fa fa-warning",
closer: "fa fa-times",
pin_up: "fa fa-pause",
pin_down: "fa fa-play",
hi_menu: "well",
hi_btn: "btn",
hi_btnhov: "",
hi_hnd: "fa fa-chevron-down"
}
};
// Set global variables.
Expand Down

0 comments on commit 7d5f0ac

Please sign in to comment.