diff --git a/build/js/BoxWidget.js b/build/js/BoxWidget.js
index 17f5550cdecaf5ce3f6a66aa5283804b61427b58..f2594530f3117714feff4a63b9a1c1f1e872e181 100644
--- a/build/js/BoxWidget.js
+++ b/build/js/BoxWidget.js
@@ -23,6 +23,7 @@
var Selector = {
data : '.box',
collapsed: '.collapsed-box',
+ header : '.box-header',
body : '.box-body',
footer : '.box-footer',
tools : '.box-tools'
@@ -65,12 +66,13 @@
$(this.element).removeClass(ClassName.collapsed)
$(this.element)
- .find(Selector.tools)
+ .children(Selector.header + ', ' + Selector.body + ', ' + Selector.footer)
+ .children(Selector.tools)
.find('.' + expandIcon)
.removeClass(expandIcon)
.addClass(collapseIcon)
- $(this.element).find(Selector.body + ', ' + Selector.footer)
+ $(this.element).children(Selector.body + ', ' + Selector.footer)
.slideDown(this.options.animationSpeed, function () {
$(this.element).trigger(expandedEvent)
}.bind(this))
@@ -82,12 +84,13 @@
var expandIcon = this.options.expandIcon
$(this.element)
- .find(Selector.tools)
+ .children(Selector.header + ', ' + Selector.body + ', ' + Selector.footer)
+ .children(Selector.tools)
.find('.' + collapseIcon)
.removeClass(collapseIcon)
.addClass(expandIcon)
- $(this.element).find(Selector.body + ', ' + Selector.footer)
+ $(this.element).children(Selector.body + ', ' + Selector.footer)
.slideUp(this.options.animationSpeed, function () {
$(this.element).addClass(ClassName.collapsed)
$(this.element).trigger(collapsedEvent)
@@ -110,12 +113,14 @@
$(this.element).on('click', this.options.collapseTrigger, function (event) {
if (event) event.preventDefault()
- that.toggle()
+ that.toggle($(this))
+ return false
})
$(this.element).on('click', this.options.removeTrigger, function (event) {
if (event) event.preventDefault()
- that.remove()
+ that.remove($(this))
+ return false
})
}
diff --git a/build/js/Layout.js b/build/js/Layout.js
index d519cff3b5928de71fdc7b96d9f6e911166ce010..c5c3b8fc82caf60340df82b8128b3cc7754072e4 100644
--- a/build/js/Layout.js
+++ b/build/js/Layout.js
@@ -130,9 +130,7 @@
// Add slimscroll
$(Selector.sidebar).slimScroll({
- height: ($(window).height() - $(Selector.mainHeader).height()) + 'px',
- color : 'rgba(0,0,0,0.2)',
- size : '3px'
+ height: ($(window).height() - $(Selector.mainHeader).height()) + 'px'
})
}
}
diff --git a/composer.json b/composer.json
index e6f0334824cd2c1bd7a6337eed965c8a80654de6..79bf0f54aec3110d5ddca6daebe19568d5f6527f 100644
--- a/composer.json
+++ b/composer.json
@@ -2,6 +2,7 @@
"name": "almasaeed2010/adminlte",
"description": "AdminLTE - admin control panel and dashboard that's based on Bootstrap 3",
"homepage": "https://adminlte.io/",
+ "type": "template",
"keywords": [
"css",
"js",
@@ -22,5 +23,8 @@
"license": "MIT",
"support": {
"issues": "https://github.com/almasaeed2010/AdminLTE/issues"
+ },
+ "require": {
+ "composer/installers": "1.*"
}
}
diff --git a/pages/charts/chartjs.html b/pages/charts/chartjs.html
index 77c01afd42b486e1089642ddd1d729feeb595f44..ade25b8feb0fd14002e6786ed80c8d720530faa8 100644
--- a/pages/charts/chartjs.html
+++ b/pages/charts/chartjs.html
@@ -704,7 +704,7 @@
-
+
diff --git a/pages/examples/login.html b/pages/examples/login.html
index c304e0e4d0bcd84e46ca7f8aa1cc94aa76190db0..1e47e84aaaae09fe8160ca1ec1c6b6f99dd8d29a 100644
--- a/pages/examples/login.html
+++ b/pages/examples/login.html
@@ -89,7 +89,7 @@
$('input').iCheck({
checkboxClass: 'icheckbox_square-blue',
radioClass: 'iradio_square-blue',
- increaseArea: '20%' // optional
+ increaseArea: '20%' /* optional */
});
});
diff --git a/pages/examples/register.html b/pages/examples/register.html
index a314757ae43ad0b3c63d75b64c017d9cd28cac74..29d8ccf356fa1425c536535a322fefba56a48183 100644
--- a/pages/examples/register.html
+++ b/pages/examples/register.html
@@ -94,7 +94,7 @@
$('input').iCheck({
checkboxClass: 'icheckbox_square-blue',
radioClass: 'iradio_square-blue',
- increaseArea: '20%' // optional
+ increaseArea: '20%' /* optional */
});
});