Skip to content

Commit

Permalink
feat(theming): Update value of body container radius
Browse files Browse the repository at this point in the history
Co-authored-by: Ferdinand Thiessen <opensource@fthiessen.de>
Signed-off-by: Marco Ambrosini <marcoambrosini@proton.me>
  • Loading branch information
marcoambrosini and susnux committed Aug 1, 2024
1 parent 92e27a2 commit e10f0dc
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion apps/theming/css/default.css
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
8 changes: 4 additions & 4 deletions apps/theming/lib/Themes/DefaultTheme.php
Original file line number Diff line number Diff line change
Expand Up @@ -176,14 +176,14 @@ public function getCSSVariables(): array {
// 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',
Expand All @@ -199,7 +199,7 @@ public function getCSSVariables(): array {
'--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
Expand Down
2 changes: 2 additions & 0 deletions apps/theming/tests/Themes/DefaultThemeTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,8 @@ public function testThemindDisabledFallbackCss() {
$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);
}
Expand Down

0 comments on commit e10f0dc

Please sign in to comment.