diff options
| -rw-r--r-- | apps/theming/css/default.css | 1 | ||||
| -rw-r--r-- | apps/theming/lib/Themes/DefaultTheme.php | 1 | ||||
| -rw-r--r-- | core/css/apps.scss | 6 | ||||
| -rw-r--r-- | core/css/guest.scss | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/apps/theming/css/default.css b/apps/theming/css/default.css index ac7c67c8408..e97e4e98216 100644 --- a/apps/theming/css/default.css +++ b/apps/theming/css/default.css @@ -42,6 +42,7 @@ --animation-slow: 300ms; --border-radius: 3px; --border-radius-large: 10px; + --border-radius-rounded: 28px; --border-radius-pill: 100px; --default-clickable-area: 44px; --default-line-height: 24px; diff --git a/apps/theming/lib/Themes/DefaultTheme.php b/apps/theming/lib/Themes/DefaultTheme.php index 0a4ac44afb6..3fcaa7cf58f 100644 --- a/apps/theming/lib/Themes/DefaultTheme.php +++ b/apps/theming/lib/Themes/DefaultTheme.php @@ -172,6 +172,7 @@ class DefaultTheme implements ITheme { // Default variables -------------------------------------------- '--border-radius' => '3px', '--border-radius-large' => '10px', + '--border-radius-rounded' => '28px', // pill-style button, value is large so big buttons also have correct roundness '--border-radius-pill' => '100px', diff --git a/core/css/apps.scss b/core/css/apps.scss index 3716a9d3154..083569eafee 100644 --- a/core/css/apps.scss +++ b/core/css/apps.scss @@ -21,9 +21,11 @@ :root { - --body-container-margin: calc(var(--default-grid-baseline) * 2); /* - 2px is required for making it look nice */ - --body-container-radius: calc(var(--default-clickable-area) / 2 + var(--default-grid-baseline) * 2 - 2px); + --border-radius-rounded: calc(var(--default-clickable-area) / 2 + var(--default-grid-baseline) * 2 - 2px); + + --body-container-radius: var(--border-radius-rounded); + --body-container-margin: calc(var(--default-grid-baseline) * 2); --body-height: calc(100% - env(safe-area-inset-bottom) - 50px - var(--body-container-margin)); } diff --git a/core/css/guest.scss b/core/css/guest.scss index f8435d1e911..2b288b78738 100644 --- a/core/css/guest.scss +++ b/core/css/guest.scss @@ -797,7 +797,7 @@ a.legal { color: var(--color-main-text); background-color: var(--color-main-background); padding: $guest-container-padding; - border-radius: var(--body-container-radius); + border-radius: var(--border-radius-rounded); box-shadow: 0 0 10px var(--color-box-shadow); display: inline-block; } |