diff --git a/.drone.yml b/.drone.yml
index 6a19e9d..90f1007 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -15,8 +15,14 @@ steps:
- make npm-build
when:
branch:
- - develop
- - feature/*
+ exclude:
+ - master
+ include:
+ - develop
+ - feature/*
+ event:
+ - push
+ - pull_request
- name: release
image: deblan/devenv
@@ -34,7 +40,13 @@ steps:
- make release
when:
branch:
- - master
+ exclude:
+ - develop
+ - feature/*
+ include:
+ - master
+ event:
+ - push
volumes:
- name: artifacts
diff --git a/.metroline.yml b/.metroline.yml
deleted file mode 100644
index 7917ee0..0000000
--- a/.metroline.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-version: '1'
-image: deblan/devenv
-jobs:
- build:
- script:
- - npm install
- - make npm-build
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 51ed6f3..25ed1b1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
## [Unreleased]
+## 2.3.4
+### Fixed
+* fix blank line when settings are open (#96)
+
+## 2.3.3
+### Added
+* hide the scrollbar when mouse is out (menu always displayed)
+### Fixed
+* fix SQL Exception InvalidFieldNameException (#93)
+
## 2.3.2
### Fixed
- fix hidden menu
diff --git a/README.md b/README.md
index 62f0ad9..dce32bb 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,8 @@ You can customize colors depending of the theme (Dark theme and Breeze Dark). Co
You like this app and you want to support me? ☕ [Buy me a coffee](https://www.buymeacoffee.com/deblan) or [Donate with liberapay](https://liberapay.com/deblan)
+[![Build Status](https://ci2.gitnet.fr/api/badges/deblan/side_menu/status.svg)](https://ci2.gitnet.fr/deblan/side_menu)
+
Requirements
------------
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 881366c..4d57236 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -26,7 +26,7 @@ If you like this application and if you want to support the development:
* [Donate with liberapay](https://liberapay.com/deblan)
* [Leave a comment](https://apps.nextcloud.com/apps/side_menu#comments)
]]>
- 2.3.2
+ 2.3.4
agpl
Simon Vieille
SideMenu
diff --git a/css/sideMenu.css b/css/sideMenu.css
index db83941..b548687 100644
--- a/css/sideMenu.css
+++ b/css/sideMenu.css
@@ -79,7 +79,7 @@
}
.side-menu-opener:active {
- background-color: var(--color-background-dark) !important;
+ background-color: var(--side-menu-current-app-background-color, #444) !important;
}
.side-menu-closer {
@@ -247,6 +247,11 @@
.side-menu-always-displayed .side-menu-apps-list {
height: calc(100vh - 49px);
top: 49px;
+ overflow: hidden;
+}
+
+.side-menu-always-displayed .side-menu-apps-list:hover {
+ overflow: auto;
}
.side-menu-always-displayed #side-menu,
@@ -293,6 +298,10 @@
padding: 10px 0;
}
+.side-menu-always-displayed #body-settings, #body-settings.body-settings-side-menu {
+ overflow-x: visible;
+}
+
@media screen and (max-width: 1024px) {
#side-menu.side-menu-big {
max-width: 290px;
diff --git a/lib/Service/LangRepository.php b/lib/Service/LangRepository.php
index c998a7e..3c379f0 100644
--- a/lib/Service/LangRepository.php
+++ b/lib/Service/LangRepository.php
@@ -26,7 +26,12 @@ class LangRepository
$qb = $this->db->getQueryBuilder();
$qb->select($qb->createFunction('DISTINCT configvalue'))
- ->where('configkey="lang" and appid="core" and configvalue<>"en"')
+ ->where('configkey=:configkey and appid=:appid and configvalue<>:configvalue')
+ ->setParameters([
+ 'configkey' => 'lang',
+ 'appid' => 'core',
+ 'configvalue' => 'en',
+ ])
->from('preferences')
;
diff --git a/package.json b/package.json
index f38078f..cf982d8 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
"extends @nextcloud/browserslist-config"
],
"engines": {
- "node": ">=10.0.0"
+ "node": ">=16.0.0"
},
"devDependencies": {
"@babel/core": "^7.9.0",
@@ -43,9 +43,9 @@
"eslint-plugin-standard": "^4.0.1",
"eslint-plugin-vue": "^5.2.3",
"file-loader": "^6.0.0",
- "node-sass": "^4.13.1",
"sass-loader": "^8.0.2",
"stylelint": "^8.4.0",
+ "sass": "^1.49.9",
"stylelint-config-recommended-scss": "^3.3.0",
"stylelint-scss": "^3.16.0",
"stylelint-webpack-plugin": "^0.10.5",
diff --git a/screenshots/admin_settings.png b/screenshots/admin_settings.png
index 23d69d9..31d225c 100644
Binary files a/screenshots/admin_settings.png and b/screenshots/admin_settings.png differ
diff --git a/screenshots/personal_settings.png b/screenshots/personal_settings.png
index 6790db7..ba62403 100644
Binary files a/screenshots/personal_settings.png and b/screenshots/personal_settings.png differ
diff --git a/templates/js/_topMenuApps.js b/templates/js/_topMenuApps.js
index 1cee506..2a2954b 100644
--- a/templates/js/_topMenuApps.js
+++ b/templates/js/_topMenuApps.js
@@ -71,7 +71,6 @@ const updateTopMenu = function() {
if (targetBlankApps.indexOf(dataId) !== -1) {
querySelector('a', app).setAttribute('target', '_blank')
}
-
}
navigationApps.innerHTML = navigationAppsHtml
diff --git a/templates/js/script.php b/templates/js/script.php
index e133d10..5e31fec 100644
--- a/templates/js/script.php
+++ b/templates/js/script.php
@@ -171,6 +171,21 @@ if ($_['always-displayed']) {
sideMenuFocus()
}
})
+
+ const sideMenuObserver = new MutationObserver((e) => {
+ if (body.getAttribute('id') !== 'body-settings') {
+ return
+ }
+
+ body.classList.toggle('body-settings-side-menu', sideMenu.classList.contains('open'))
+ })
+
+ sideMenuObserver.observe(sideMenu, {
+ attributes: true,
+ attributeFilter: ['class'],
+ childList: false,
+ characterData: false
+ })
})
body.appendChild(sideMenuContainer)