Merge pull request 'bugfix/always-displays-no-apps' (#505) from bugfix/always-displays-no-apps into develop
Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/505
This commit is contained in:
@@ -1,5 +1,9 @@
|
|||||||
## [Unreleased]
|
## [Unreleased]
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- fix(ui): only apply always-displayed display css rules when the menu is displayed
|
||||||
|
|
||||||
## 6.0.0
|
## 6.0.0
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|||||||
@@ -363,6 +363,16 @@
|
|||||||
right: 0 !important;
|
right: 0 !important;
|
||||||
margin-left: 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) {
|
@media screen and (max-width: 1024px) {
|
||||||
|
|||||||
@@ -117,15 +117,3 @@ body[data-theme-light], body[data-theme-light-highcontrast] {
|
|||||||
font-size: 16px;
|
font-size: 16px;
|
||||||
}
|
}
|
||||||
<?php } ?>
|
<?php } ?>
|
||||||
|
|
||||||
<?php if ($_['always-displayed']) { ?>
|
|
||||||
#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;
|
|
||||||
}
|
|
||||||
<?php } ?>
|
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ const NodePolyfillPlugin = require('node-polyfill-webpack-plugin')
|
|||||||
const TerserPlugin = require('terser-webpack-plugin')
|
const TerserPlugin = require('terser-webpack-plugin')
|
||||||
|
|
||||||
const appName = 'side_menu'
|
const appName = 'side_menu'
|
||||||
|
const appVersion = '6.x'
|
||||||
const buildMode = process.env.NODE_ENV
|
const buildMode = process.env.NODE_ENV
|
||||||
const isDev = buildMode === 'development'
|
const isDev = buildMode === 'development'
|
||||||
|
|
||||||
@@ -80,6 +81,7 @@ module.exports = {
|
|||||||
|
|
||||||
new webpack.DefinePlugin({
|
new webpack.DefinePlugin({
|
||||||
appName: JSON.stringify(appName),
|
appName: JSON.stringify(appName),
|
||||||
|
appVersion: JSON.stringify(appVersion),
|
||||||
}),
|
}),
|
||||||
],
|
],
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user