diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php index 79b85eb..7ad8556 100644 --- a/lib/Controller/PageController.php +++ b/lib/Controller/PageController.php @@ -199,8 +199,6 @@ private function getCustomClientURL(): array { 'apps.ios.url' => $this->config->getSystemValue('ionos_customclient_ios'), 'apps.windows.url' => $this->config->getSystemValue('ionos_customclient_windows'), 'apps.macos.url' => $this->config->getSystemValue('ionos_customclient_macos'), - 'apps.linux.url' => $this->config->getSystemValue('ionos_customclient_linux'), - 'apps.nautilus.url' => $this->config->getSystemValue('ionos_customclient_nautilus'), 'apps.ios.id' => $this->config->getSystemValue('ionos_customclient_ios_appid'), ]; } diff --git a/src/components/help/Software.vue b/src/components/help/Software.vue index ec50b4a..dc65223 100644 --- a/src/components/help/Software.vue +++ b/src/components/help/Software.vue @@ -79,20 +79,6 @@ along with this program. If not, see . {{ t('simplesettings', 'Install desktop app for Windows') }}  ❯  - - {{ t('simplesettings', 'Linux App Image') }} -  ❯  - - - {{ t('simplesettings', 'Nautilus Integration') }} -  ❯  - @@ -121,16 +107,12 @@ export default defineComponent({ const iosUrl = appLinks['apps.ios.url'] const macosUrl = appLinks['apps.macos.url'] const windowsUrl = appLinks['apps.windows.url'] - const linuxUrl = appLinks['apps.linux.url'] - const nautilusUrl = appLinks['apps.nautilus.url'] return { androidUrl, iosUrl, macosUrl, windowsUrl, - linuxUrl, - nautilusUrl, androidSVG, iosSVG, } @@ -146,7 +128,7 @@ export default defineComponent({ #software { --software-content-width: 40em; - --software-gap: 1em; + --software-gap: 10px; --software-qr-code-intrinsic-padding: 5px; /* padding within the image around the code (measured) */ } @@ -163,7 +145,6 @@ export default defineComponent({ justify-content: space-between; padding-bottom: 2em; max-width: var(--software-content-width); - gap: var(--software-gap); .ios, .android { display: flex; @@ -178,8 +159,10 @@ export default defineComponent({ .desktop-apps { display: flex; - flex-wrap: wrap; - flex: 0 0 auto; + max-width: var(--software-content-width); +} + +.mobile-apps, .desktop-apps { gap: var(--software-gap); } @@ -188,6 +171,12 @@ export default defineComponent({ vertical-align: middle; } +@media screen and (min-width: calc(variables.$breakpoint-mobile / 2)) { + .desktop-app { + max-width: calc(var(--software-content-width) / 2); + } +} + @media screen and (max-width: calc(variables.$breakpoint-mobile / 2)) { .mobile-apps { flex-flow: column wrap; @@ -201,6 +190,7 @@ export default defineComponent({ .desktop-apps { flex-direction: column; + gap: 1em; } } diff --git a/tests/Controller/PageControllerTest.php b/tests/Controller/PageControllerTest.php index 3843fe7..e03e53d 100644 --- a/tests/Controller/PageControllerTest.php +++ b/tests/Controller/PageControllerTest.php @@ -170,8 +170,6 @@ protected function setUp(): void { 'ionos_customclient_ios_appid' => 'mocked-ios-appid', 'ionos_customclient_windows' => 'mocked-windows-url', 'ionos_customclient_macos' => 'mocked-macos-url', - 'ionos_customclient_linux' => 'mocked-linux-url', - 'ionos_customclient_nautilus' => 'mocked-nautilus-url', ]; $mockUser = $this->createMock(IUser::class); @@ -185,7 +183,7 @@ protected function setUp(): void { ->with($this->equalTo($this->uid)) ->willReturn($mockUser); - $this->config->expects($this->atMost(8)) + $this->config->expects($this->atMost(6)) ->method('getSystemValue') ->with( $this->logicalOr( @@ -195,8 +193,6 @@ protected function setUp(): void { $this->equalTo('ionos_customclient_ios_appid'), $this->equalTo('ionos_customclient_windows'), $this->equalTo('ionos_customclient_macos'), - $this->equalTo('ionos_customclient_linux'), - $this->equalTo('ionos_customclient_nautilus'), ), $this->anything() // This catches any default value passed ) @@ -227,8 +223,6 @@ protected function tearDown(): void { * Reset Util script and style state for clean test isolation */ private function resetUtilState(): void { - \OC_Util::$styles = []; - self::invokePrivate(\OCP\Util::class, 'scriptsInit', [[]]); self::invokePrivate(\OCP\Util::class, 'scripts', [[]]); self::invokePrivate(\OCP\Util::class, 'scriptDeps', [[]]); } @@ -404,8 +398,6 @@ public function testIndexProvidesInitialStateWithCustomClientURLs() { 'apps.ios.id' => 'mocked-ios-appid', 'apps.windows.url' => 'mocked-windows-url', 'apps.macos.url' => 'mocked-macos-url', - 'apps.linux.url' => 'mocked-linux-url', - 'apps.nautilus.url' => 'mocked-nautilus-url', ]; $this->initialState->expects($this->exactly(4)) diff --git a/webpack.js b/webpack.js index cdb05cc..82a3796 100644 --- a/webpack.js +++ b/webpack.js @@ -49,8 +49,6 @@ webpackConfig.module.rules.push({ type: 'asset/source', }) -webpackConfig.devtool = false - webpackConfig.plugins.push(new webpack.SourceMapDevToolPlugin({ filename: '[file].map', }))