From cc939f38873833b7cc0260525a2ecd536f27bfa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thea=20Sch=C3=B6bl?= Date: Thu, 6 Apr 2023 17:12:30 +0000 Subject: [PATCH] feat: transition to full sidebar at xl instead of lg --- cypress/integration/app.spec.ts | 6 +++--- src/app/modules/menu/navigation/navigation.html | 2 +- src/app/modules/menu/navigation/navigation.scss | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cypress/integration/app.spec.ts b/cypress/integration/app.spec.ts index cb92312c..fce4eaf2 100644 --- a/cypress/integration/app.spec.ts +++ b/cypress/integration/app.spec.ts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 StApps + * Copyright (C) 2023 StApps * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free * Software Foundation, version 3. @@ -22,7 +22,7 @@ describe('App', () => { it('should have a proper working navigation', () => { cy.visit('/'); - cy.contains('Einstellungen').click(); - cy.get('ion-title').contains('Einstellungen'); + cy.contains('ion-tab-button', 'Mensa').click(); + cy.get('ion-title').contains('Mensa'); }); }); diff --git a/src/app/modules/menu/navigation/navigation.html b/src/app/modules/menu/navigation/navigation.html index 59c503b6..b6326dd9 100644 --- a/src/app/modules/menu/navigation/navigation.html +++ b/src/app/modules/menu/navigation/navigation.html @@ -14,7 +14,7 @@ --> - + diff --git a/src/app/modules/menu/navigation/navigation.scss b/src/app/modules/menu/navigation/navigation.scss index 674b5db2..2b62e80a 100644 --- a/src/app/modules/menu/navigation/navigation.scss +++ b/src/app/modules/menu/navigation/navigation.scss @@ -16,7 +16,7 @@ @import '../../../../theme/util/mixins'; stapps-navigation-tabs { - @include ion-lg-up { + @include ion-xl-up { display: none; } } @@ -41,7 +41,7 @@ stapps-offline-notice.is-offline ~ ion-split-pane { margin-left: var(--navigation-rail-width); } - @include ion-lg-up { + @include ion-xl-up { margin-left: 0; } }