Squashed commit of the following:

commit 97ad988c6489c000e428a08123d690ab98bd9c2d Author: Dante <[email protected]> Date: Mon Mar 3 09:39:52 2014 +0800 Update bootstrap to v3.1.1 commit 9645fcae47228562939f7fa285b5d7c46b65551d Author: Dante <[email protected]> Date: Mon Mar 3 09:13:20 2014 +0800 #19 Change label of Close button from special character to html entities
nakupanda · Mar 3, 2014 · e483f86 · e483f86
1 parent 56ea02c
commit e483f86
Show file tree

Hide file tree

Showing 16 changed files with 1,888 additions and 3,330 deletions.
diff --git a/examples/assets/bootstrap-dialog/js/bootstrap-dialog.js b/examples/assets/bootstrap-dialog/js/bootstrap-dialog.js
@@ -367,7 +367,7 @@
         createCloseButton: function() {
             var $container = $('<div></div>');
             $container.addClass(this.getNamespace('close-button'));
-            var $icon = $('<button class="close">×</button>');
+            var $icon = $('<button class="close">&times;</button>');
             $container.append($icon);
             $container.on('click', {dialog: this}, function(event) {
                 event.data.dialog.close();

diff --git a/examples/assets/bootstrap-dialog/js/bootstrap-dialog.min.js b/examples/assets/bootstrap-dialog/js/bootstrap-dialog.min.js
diff --git a/examples/assets/bootstrap/css/bootstrap-theme.css b/examples/assets/bootstrap/css/bootstrap-theme.css
diff --git a/examples/assets/bootstrap/css/bootstrap-theme.css.map b/examples/assets/bootstrap/css/bootstrap-theme.css.map
diff --git a/examples/assets/bootstrap/css/bootstrap-theme.min.css b/examples/assets/bootstrap/css/bootstrap-theme.min.css