diff --git a/CHANGELOG.md b/CHANGELOG.md index 97ad64b..3605c3a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ## [Unreleased] +### Fixed + +- fix(ui): only apply always-displayed display css rules when the menu is displayed + ## 6.0.0 ### Added diff --git a/src/scss/menu.scss b/src/scss/menu.scss index 097c002..29685d2 100644 --- a/src/scss/menu.scss +++ b/src/scss/menu.scss @@ -363,6 +363,16 @@ right: 0 !important; margin-left: 0 !important; } + + #content { + left: 53px; + width: calc(100% - (var(--body-container-margin) * 2) - 62px); + } + + #content-vue { + width: calc(100% - (var(--body-container-margin) * 2) - 60px); + margin-left: 11px; + } } @media screen and (max-width: 1024px) { diff --git a/templates/css/stylesheet.php b/templates/css/stylesheet.php index 5bdc08b..b670f53 100644 --- a/templates/css/stylesheet.php +++ b/templates/css/stylesheet.php @@ -117,15 +117,3 @@ body[data-theme-light], body[data-theme-light-highcontrast] { font-size: 16px; } - - - #content { - left: 53px; - width: calc(100% - (var(--body-container-margin) * 2) - 62px); - } - - #content-vue { - width: calc(100% - (var(--body-container-margin) * 2) - 60px); - margin-left: 11px; - } - diff --git a/webpack.config.js b/webpack.config.js index 0c16d61..5cfd868 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -7,6 +7,7 @@ const NodePolyfillPlugin = require('node-polyfill-webpack-plugin') const TerserPlugin = require('terser-webpack-plugin') const appName = 'side_menu' +const appVersion = '6.x' const buildMode = process.env.NODE_ENV const isDev = buildMode === 'development' @@ -80,6 +81,7 @@ module.exports = { new webpack.DefinePlugin({ appName: JSON.stringify(appName), + appVersion: JSON.stringify(appVersion), }), ],