Skip to content

Commit d66bcee

Browse files
LightLight
authored andcommitted
fix: 修复某些情况下调整窗口宽度时侧边栏不会响应式变化的问题
若初始窗口宽度介于 768px 和 996px 之间时会触发
1 parent 380e552 commit d66bcee

2 files changed

Lines changed: 19 additions & 14 deletions

File tree

src/css/xenon-core.css

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1921,17 +1921,6 @@ body {
19211921
position: relative;
19221922
}
19231923

1924-
@media screen and (min-width: 768px) {
1925-
.sidebar-menu .main-menu ul li.is-hidden {
1926-
left: -20px;
1927-
zoom: 1;
1928-
filter: alpha(opacity=0);
1929-
-webkit-opacity: 0;
1930-
-moz-opacity: 0;
1931-
opacity: 0;
1932-
}
1933-
}
1934-
19351924
.sidebar-menu .main-menu ul li.is-shown {
19361925
left: 0;
19371926
zoom: 1;
@@ -2148,6 +2137,15 @@ body {
21482137
position: relative;
21492138
}
21502139

2140+
.sidebar-menu .main-menu ul li.is-hidden {
2141+
left: -20px;
2142+
zoom: 1;
2143+
filter: alpha(opacity=0);
2144+
-webkit-opacity: 0;
2145+
-moz-opacity: 0;
2146+
opacity: 0;
2147+
}
2148+
21512149
.sidebar-menu.collapsed .main-menu > li.active,
21522150
.sidebar-menu.collapsed .main-menu > li li.active {
21532151
background-color: #252627;

src/js/xenon-custom.js

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -897,17 +897,24 @@ function setup_sidebar_menu() {
897897
$items_with_subs.filter('.active').addClass('expanded');
898898

899899
// On larger screens collapse sidebar when the window is tablet screen
900-
if (is('largescreen') && public_vars.$sidebarMenu.hasClass('collapsed') == false) {
901-
$(window).on('resize', function () {
900+
if (public_vars.$sidebarMenu.hasClass('collapsed') == false) {
902901
if (is('tabletscreen')) {
903902
public_vars.$sidebarMenu.addClass('collapsed');
904903
ps_destroy();
905904
} else if (is('largescreen')) {
906905
public_vars.$sidebarMenu.removeClass('collapsed');
907906
ps_init();
908907
}
909-
});
910908
}
909+
$(window).on('resize', function () {
910+
if (is('tabletscreen')) {
911+
public_vars.$sidebarMenu.addClass('collapsed');
912+
ps_destroy();
913+
} else if (is('largescreen')) {
914+
public_vars.$sidebarMenu.removeClass('collapsed');
915+
ps_init();
916+
}
917+
});
911918

912919
$items_with_subs.each(function (i, el) {
913920
var $li = jQuery(el),

0 commit comments

Comments
 (0)