Merge branch 'develop'
This commit is contained in:
commit
457c1ff53e
18
.drone.yml
18
.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
|
||||
|
|
|
@ -1,7 +0,0 @@
|
|||
version: '1'
|
||||
image: deblan/devenv
|
||||
jobs:
|
||||
build:
|
||||
script:
|
||||
- npm install
|
||||
- make npm-build
|
10
CHANGELOG.md
10
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
|
||||
|
|
|
@ -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
|
||||
------------
|
||||
|
||||
|
|
|
@ -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)
|
||||
]]></description>
|
||||
<version>2.3.2</version>
|
||||
<version>2.3.4</version>
|
||||
<licence>agpl</licence>
|
||||
<author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
|
||||
<namespace>SideMenu</namespace>
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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')
|
||||
;
|
||||
|
||||
|
|
|
@ -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",
|
||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 195 KiB After Width: | Height: | Size: 254 KiB |
Binary file not shown.
Before Width: | Height: | Size: 57 KiB After Width: | Height: | Size: 57 KiB |
|
@ -71,7 +71,6 @@ const updateTopMenu = function() {
|
|||
if (targetBlankApps.indexOf(dataId) !== -1) {
|
||||
querySelector('a', app).setAttribute('target', '_blank')
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
navigationApps.innerHTML = navigationAppsHtml
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue