Merge pull request 'develop' (#522) from develop into master

Reviewed-on: https://gitnet.fr/deblan/side_menu/pulls/522

CHANGELOG.md

@@ -1,5 +1,26 @@
 ## [Unreleased]
 
+## 6.2.0
+
+### Added
+
+- feat(app): add compatibility with Nextcloud 35
+
+### Fixed
+
+- fix #510 #417: [Bug] Styling of the icon labels and overflow icon is not correct
+
+## 6.1.0
+
+### Added
+
+- feat: add search toggle option (fix #509)
+
+### Fixed
+
+- fix #510: [Bug] Styling of the icon labels and overflow icon is not correct
+- fix #462: [Bug] Burger menu in settings is hidden with "Always displayed" on mobile device
+
 ## 6.0.1
 
 ### Added

appinfo/info.xml

@@ -30,7 +30,7 @@ Notice
 Because I believe in a free and decentralized Internet, [Gitnet](https://gitnet.fr) is **self-hosted at home**.
 In case of downtime, you can download **Custom Menu** from [here](https://kim.deblan.fr/~side_menu/).
 ]]></description>
-    <version>6.0.1</version>
+    <version>6.2.0</version>
     <licence>agpl</licence>
     <author mail="contact@deblan.fr" homepage="https://www.deblan.fr/">Simon Vieille</author>
     <namespace>SideMenu</namespace>
@@ -53,7 +53,7 @@ In case of downtime, you can download **Custom Menu** from [here](https://kim.de
     <screenshot><![CDATA[https://gitnet.fr/deblan/side_menu/raw/branch/master/screenshots/nc25_default_menu.png]]></screenshot>
     <dependencies>
         <php min-version="8.1" max-version="8.5" />
-        <nextcloud min-version="34" max-version="34"/>
+        <nextcloud min-version="34" max-version="35"/>
     </dependencies>
     <settings>
         <admin>OCA\SideMenu\Settings\Admin</admin>

src/menus/SimpleSideMenu.vue

@@ -30,7 +30,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
         :avatar="settings.avatar"
       />
       <AppSearch
-        v-if="showSearchForm"
+        v-if="showSearchForm && open"
         v-model="search"
       />
       <OpenerButton

src/pages/AdminSettings.vue

@@ -29,6 +29,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
       />
     </NcAppNavigation>
     <NcAppContent class="cm-settings cm-settings--nav">
+      <button @click="toggleNav" class="cm-settings-nav-toggle">{{ trans('Toggle menu') }}</button>
+
       <SettingsSection :hidden="section !== 'panel'">
         <SectionTitle label="Panel" />
 
@@ -628,6 +630,10 @@ const filterConfig = (value) => {
   return result
 }
 
+const toggleNav = () => {
+  document.querySelector('.cm-settings-nav .app-navigation-toggle-wrapper > button').click()
+}
+
 onMounted(async () => {
   config.value = await configStore.getAppConfig()
 

src/scss/admin.scss

@@ -15,14 +15,25 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-.cm-settings {
-  &--nav {
-    padding-top: 30px;
-  }
+.cm-settings-nav {
+    padding-top: 30px !important;
+}
 
+.cm-settings-nav-toggle {
+  margin-top: 40px !important;
+  margin-left: 15px !important;
+}
+
+.cm-settings-nav .app-navigation-toggle-wrapper > button {
+  display: none;
+}
+
+.cm-settings {
   &-nav {
+    max-width: 50vw !important;
+
     .app-navigation__content {
-      padding: 20px;
+      padding: 20px 10px 20px 10px;
     }
 
     .app-navigation-entry-icon {

src/scss/menu.scss

@@ -287,14 +287,6 @@
   }
 }
 
-.cm-standardmenu {
-  visibility: hidden;
-
-  &.show {
-    visibility: visible;
-  }
-}
-
 .cm-always-displayed {
   body {
     width: calc(100% - 50px) !important;
@@ -426,11 +418,25 @@
 $header-icon-size: 20px;
 
 .cm-standardmenu {
+  visibility: hidden;
   width: 100%;
   display: flex;
   flex-shrink: 1;
   flex-wrap: wrap;
 
+  &.show {
+    visibility: visible;
+  }
+
+  svg {
+    color: var(--color-background-plain-text) !important;
+  }
+
+  .app-menu-entry--label {
+    color: var(--color-background-plain-text) !important;
+    filter: var(--background-image-invert-if-bright, var(--primary-invert-if-bright)) !important;
+  }
+
   .app-menu-main {
     display: flex;
     flex-wrap: nowrap;
@@ -490,7 +496,7 @@ $header-icon-size: 20px;
         color: var(--color-primary-text);
         text-align: center;
         left: 50%;
-        top: 45%;
+        top: 55%;
         display: block;
         min-width: 100%;
         transform: translateX(-50%);
@@ -562,23 +568,27 @@ $header-icon-size: 20px;
     }
   }
 
-  .app-menu-more .button-vue--vue-tertiary {
-    opacity: 0.7;
-    margin: 8px 3px 3px 3px;
-    filter: var(--background-image-invert-if-bright, var(--primary-invert-if-bright));
+  &-app-menu-more {
+    padding-top: 9px !important;
 
-    &:not([aria-expanded='true']) {
-      color: var(--color-main-text);
+    .button-vue--vue-tertiary {
+      opacity: 0.7;
+      margin: 8px 3px 3px 3px;
+      filter: var(--background-image-invert-if-bright, var(--primary-invert-if-bright));
 
-      &:hover {
-        opacity: 1;
-        background-color: transparent !important;
+      &:not([aria-expanded='true']) {
+        color: var(--color-main-text);
+
+        &:hover {
+          opacity: 1;
+          background-color: transparent !important;
+        }
       }
-    }
 
-    &:focus-visible {
-      opacity: 1;
-      outline: none !important;
+      &:focus-visible {
+        opacity: 1;
+        outline: none !important;
+      }
     }
   }