github
/
AdminLTE
mirror of https://github.com/ColorlibHQ/AdminLTE
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #2789 from XhmikosR/patch-13 

Use an object when setting multiple CSS properties
pull/2790/head
REJack 2020-06-04 17:23:01 +02:00 committed by GitHub
parent c1f87dfbde 5ac5edf929
commit c4bc2c676c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.bundlewatch.config.json
View File

@ -50,7 +50,7 @@
}, },
{ {
"path": "./dist/js/adminlte.js", "path": "./dist/js/adminlte.js",
"maxSize": "9 kB" "maxSize": "10 kB"
}, },
{ {
"path": "./dist/js/adminlte.min.js", "path": "./dist/js/adminlte.min.js",

6
build/js/ControlSidebar.js
View File

@ -176,8 +176,10 @@ class ControlSidebar {
} }
if (positions.top === 0 && positions.bottom === 0) { if (positions.top === 0 && positions.bottom === 0) {
$(Selector.CONTROL_SIDEBAR).css('bottom', heights.footer) $(Selector.CONTROL_SIDEBAR).css({
$(Selector.CONTROL_SIDEBAR).css('top', heights.header) bottom: heights.footer,
top: heights.header
})
$(Selector.CONTROL_SIDEBAR + ', ' + Selector.CONTROL_SIDEBAR + ' ' + Selector.CONTROL_SIDEBAR_CONTENT).css('height', heights.window - (heights.header + heights.footer)) $(Selector.CONTROL_SIDEBAR + ', ' + Selector.CONTROL_SIDEBAR + ' ' + Selector.CONTROL_SIDEBAR_CONTENT).css('height', heights.window - (heights.header + heights.footer))
} else if (positions.bottom <= heights.footer) { } else if (positions.bottom <= heights.footer) {
if (footerFixed === false) { if (footerFixed === false) {

24
build/js/Dropdown.js
View File

@ -63,11 +63,15 @@ class Dropdown {
} }
if ($element.hasClass(ClassName.DROPDOWN_RIGHT)) { if ($element.hasClass(ClassName.DROPDOWN_RIGHT)) {
$element.css('left', 'inherit') $element.css({
$element.css('right', 0) left: 'inherit',
right: 0
})
} else { } else {
$element.css('left', 0) $element.css({
$element.css('right', 'inherit') left: 0,
right: 'inherit'
})
} }
const offset = $element.offset() const offset = $element.offset()
@ -75,11 +79,15 @@ class Dropdown {
const visiblePart = $(window).width() - offset.left const visiblePart = $(window).width() - offset.left
if (offset.left < 0) { if (offset.left < 0) {
$element.css('left', 'inherit') $element.css({
$element.css('right', (offset.left - 5)) left: 'inherit',
right: offset.left - 5
})
} else if (visiblePart < width) { } else if (visiblePart < width) {
$element.css('left', 'inherit') $element.css({
$element.css('right', 0) left: 'inherit',
right: 0
})
} }
} }