diff options
| author | Marco Ambrosini <marcoambrosini@proton.me> | 2024-08-01 15:43:36 +0200 |
|---|---|---|
| committer | Ferdinand Thiessen <opensource@fthiessen.de> | 2024-08-01 21:41:21 +0200 |
| commit | e10f0dc38b4539db1f8e222d69962a6040fd0e4d (patch) | |
| tree | 45d97e95df09e1cddc2a01aff0905a045c14059c /apps/theming | |
| parent | 92e27a24f82f8d6794609c1e2120189c8e67f6ad (diff) | |
| download | nextcloud-server-e10f0dc38b4539db1f8e222d69962a6040fd0e4d.tar.gz nextcloud-server-e10f0dc38b4539db1f8e222d69962a6040fd0e4d.zip | |
feat(theming): Update value of body container radius
Co-authored-by: Ferdinand Thiessen <opensource@fthiessen.de>
Signed-off-by: Marco Ambrosini <marcoambrosini@proton.me>
Diffstat (limited to 'apps/theming')
| -rw-r--r-- | apps/theming/css/default.css | 2 | ||||
| -rw-r--r-- | apps/theming/lib/Themes/DefaultTheme.php | 8 | ||||
| -rw-r--r-- | apps/theming/tests/Themes/DefaultThemeTest.php | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/apps/theming/css/default.css b/apps/theming/css/default.css index c47c25b7f46..11041c5c4c7 100644 --- a/apps/theming/css/default.css +++ b/apps/theming/css/default.css @@ -80,7 +80,7 @@ --sidebar-min-width: 300px; --sidebar-max-width: 500px; /* Border radius of the body container */ - --body-container-radius: calc(var(--default-grid-baseline) * 3); + --body-container-radius: var(--border-radius-container-large); /* Margin of the body container */ --body-container-margin: calc(var(--default-grid-baseline) * 2); /* Height of the body container to fully fill the view port */ diff --git a/apps/theming/lib/Themes/DefaultTheme.php b/apps/theming/lib/Themes/DefaultTheme.php index 3481dc9681c..47a54eb0e1a 100644 --- a/apps/theming/lib/Themes/DefaultTheme.php +++ b/apps/theming/lib/Themes/DefaultTheme.php @@ -176,14 +176,14 @@ class DefaultTheme implements ITheme { // Border radii (new values) '--border-radius-small' => '4px', // For smaller elements '--border-radius-element' => '8px', // For interactive elements such as buttons, input, navigation and list items - '--border-radius-container' => '12px', // For smaller containers like action menus - '--border-radius-container-large' => '16px', // For bigger containers like body or modals + '--border-radius-container' => '12px', // For smaller containers like action menus + '--border-radius-container-large' => '16px', // For bigger containers like body or modals // Border radii (deprecated) '--border-radius' => 'var(--border-radius-small)', '--border-radius-large' => 'var(--border-radius-element)', '--border-radius-rounded' => '28px', - '--border-radius-pill' => '100px', + '--border-radius-pill' => '100px', '--default-clickable-area' => '34px', '--clickable-area-large' => '48px', @@ -199,7 +199,7 @@ class DefaultTheme implements ITheme { '--sidebar-max-width' => '500px', // Border radius of the body container - '--body-container-radius' => 'calc(var(--default-grid-baseline) * 3)', + '--body-container-radius' => 'var(--border-radius-container-large)', // Margin of the body container '--body-container-margin' => 'calc(var(--default-grid-baseline) * 2)', // Height of the body container to fully fill the view port diff --git a/apps/theming/tests/Themes/DefaultThemeTest.php b/apps/theming/tests/Themes/DefaultThemeTest.php index 91b7d8887d7..d11237e774c 100644 --- a/apps/theming/tests/Themes/DefaultThemeTest.php +++ b/apps/theming/tests/Themes/DefaultThemeTest.php @@ -152,6 +152,8 @@ class DefaultThemeTest extends AccessibleThemeTestCase { $fallbackCss = file_get_contents(__DIR__ . '/../../css/default.css'); // Remove comments $fallbackCss = preg_replace('/\s*\/\*[\s\S]*?\*\//m', '', $fallbackCss); + // Remove blank lines + $fallbackCss = preg_replace('/\s*\n\n/', "\n", $fallbackCss); $this->assertEquals($css, $fallbackCss); } |